From fd014cf1f06d6ece4fdd624f17952b2dff55880e Mon Sep 17 00:00:00 2001 From: davidplunkett Date: Wed, 6 Mar 2019 03:18:05 +0000 Subject: [PATCH] correct spelling issues Change-Id: I9ea1d9a9205c8caa3448b150e2bea8ba7d160be4 Signed-off-by: davidplunkett --- .../delegate/AirshipRemoteScriptExecutorTaskDelegate.java | 10 +++++----- .../ApacheRemoteDeploymentVerificationDelegate.java | 10 +++++----- .../delegate/ApacheRemoteScriptExecutorTaskDelegate.java | 10 +++++----- .../DeployPostVerficationRemoteScriptExecutor.java | 2 +- .../DeployRemoteDeploymentVerificationDelegate.java | 2 +- .../delegate/DeployRemoteScriptExecutorTaskDelegate.java | 10 +++++----- .../com/akraino/bpm/delegate/FileTransferDelegator.java | 8 ++++---- .../MultiNodeDeployRemoteScript1ExecutorTaskDelegate.java | 10 +++++----- .../MultiNodeDeployRemoteScript2ExecutorTaskDelegate.java | 10 +++++----- .../bpm/delegate/RemoteDeploymentVerificationDelegate.java | 10 +++++----- .../bpm/delegate/RemoteScriptExecutorTaskDelegate.java | 10 +++++----- .../TempestRemoteDeploymentVerificationDelegate.java | 10 +++++----- .../delegate/TempestRemoteScriptExecutorTaskDelegate.java | 10 +++++----- akraino/src/main/java/com/akraino/bpm/model/Airship.java | 12 ++++++------ akraino/src/main/java/com/akraino/bpm/model/Deploy.java | 14 +++++++------- .../main/java/com/akraino/bpm/model/MultiNodeDeploy.java | 14 +++++++------- .../bpm/service/impl/AsyncProcessExecutorServiceImpl.java | 12 ++++++------ 17 files changed, 82 insertions(+), 82 deletions(-) diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/AirshipRemoteScriptExecutorTaskDelegate.java b/akraino/src/main/java/com/akraino/bpm/delegate/AirshipRemoteScriptExecutorTaskDelegate.java index 05113ac..c658839 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/AirshipRemoteScriptExecutorTaskDelegate.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/AirshipRemoteScriptExecutorTaskDelegate.java @@ -37,8 +37,8 @@ public class AirshipRemoteScriptExecutorTaskDelegate implements JavaDelegate { RemoteScriptExecutionService remoteScriptExecutionService; public void execute(DelegateExecution ctx) throws Exception { - String remotserver=(String)ctx.getVariable("remotserver"); - int portnumner=(Integer)ctx.getVariable("port"); + String remoteserver=(String)ctx.getVariable("remoteserver"); + int portnumber=(Integer)ctx.getVariable("port"); String username=(String)ctx.getVariable("username"); String password=(String)ctx.getVariable("password"); String filename=(String)ctx.getVariable("remotefilename"); @@ -46,11 +46,11 @@ public class AirshipRemoteScriptExecutorTaskDelegate implements JavaDelegate { String srcdir=(String)ctx.getVariable("srcdir"); String destdir=(String)ctx.getVariable("destdir"); - logger.debug("task execution started remotserver {} , portnumner {},username {}, password {},filename : {} ,fileparams={},src dir={},dest dir={}", - remotserver,portnumner,username,password,filename,fileparams,srcdir,destdir); + logger.debug("task execution started remoteserver {} , portnumber {},username {}, password {},filename : {} ,fileparams={},src dir={},dest dir={}", + remoteserver,portnumber,username,password,filename,fileparams,srcdir,destdir); String command="cd "+destdir+ ";" +" ./"+filename+" "+ (fileparams!=null?fileparams:" ") ; logger.debug("Execution command {}",command); - remoteScriptExecutionService.executeRemoteScript(remotserver,username,password,portnumner,filename,fileparams,srcdir,destdir,command); + remoteScriptExecutionService.executeRemoteScript(remoteserver,username,password,portnumber,filename,fileparams,srcdir,destdir,command); } } diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/ApacheRemoteDeploymentVerificationDelegate.java b/akraino/src/main/java/com/akraino/bpm/delegate/ApacheRemoteDeploymentVerificationDelegate.java index 7c1c5a0..0b16ca0 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/ApacheRemoteDeploymentVerificationDelegate.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/ApacheRemoteDeploymentVerificationDelegate.java @@ -44,20 +44,20 @@ public class ApacheRemoteDeploymentVerificationDelegate implements JavaDelegate String verifierFilename=(String)ctx.getVariable("verifier"); int waittime=(Integer)ctx.getVariable("waittime"); int iterations=(Integer)ctx.getVariable("iterations"); - String remotserver=(String)ctx.getVariable("remotserver"); - int portnumner=(Integer)ctx.getVariable("port"); + String remoteserver=(String)ctx.getVariable("remoteserver"); + int portnumber=(Integer)ctx.getVariable("port"); String username=(String)ctx.getVariable("username"); String password=(String)ctx.getVariable("password"); String srcdir=(String)ctx.getVariable("srcdir"); String destdir=(String)ctx.getVariable("destdir"); String filepparams=(String)ctx.getVariable("verifierfileparams"); - logger.debug("task execution started remotserver {} , portnumner {},username {}, password {},filename : {} , waittime : {},No of iterations :{}", - remotserver,portnumner,username,password,verifierFilename,srcdir,destdir,waittime,iterations); + logger.debug("task execution started remoteserver {} , portnumber {},username {}, password {},filename : {} , waittime : {},No of iterations :{}", + remoteserver,portnumber,username,password,verifierFilename,srcdir,destdir,waittime,iterations); String command= "cd "+destdir+ ";" + (filepparams!=null?filepparams:" ") + " ./"+verifierFilename; logger.debug("Execution command {}",command); - remotedeploymentVerificationService.executeScript(remotserver,username,password,portnumner,verifierFilename,filepparams,srcdir,destdir,waittime,iterations,command); + remotedeploymentVerificationService.executeScript(remoteserver,username,password,portnumber,verifierFilename,filepparams,srcdir,destdir,waittime,iterations,command); }catch(TaskExecutorException ex) { throw ex; } diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/ApacheRemoteScriptExecutorTaskDelegate.java b/akraino/src/main/java/com/akraino/bpm/delegate/ApacheRemoteScriptExecutorTaskDelegate.java index 85bcf97..8d39e8e 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/ApacheRemoteScriptExecutorTaskDelegate.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/ApacheRemoteScriptExecutorTaskDelegate.java @@ -38,8 +38,8 @@ public class ApacheRemoteScriptExecutorTaskDelegate implements JavaDelegate { RemoteScriptExecutionService remoteScriptExecutionService; public void execute(DelegateExecution ctx) throws Exception { - String remotserver=(String)ctx.getVariable("remotserver"); - int portnumner=(Integer)ctx.getVariable("port"); + String remoteserver=(String)ctx.getVariable("remoteserver"); + int portnumber=(Integer)ctx.getVariable("port"); String username=(String)ctx.getVariable("username"); String password=(String)ctx.getVariable("password"); String filename=(String)ctx.getVariable("filename"); @@ -48,11 +48,11 @@ public class ApacheRemoteScriptExecutorTaskDelegate implements JavaDelegate { String destdir=(String)ctx.getVariable("destdir"); - logger.debug("task execution started remotserver {} , portnumner {},username {}, password {},filename : {} ,fileparams={},src dir={},dest dir={}", - remotserver,portnumner,username,password,filename,fileparams,srcdir,destdir); + logger.debug("task execution started remoteserver {} , portnumber {},username {}, password {},filename : {} ,fileparams={},src dir={},dest dir={}", + remoteserver,portnumber,username,password,filename,fileparams,srcdir,destdir); String command= "cd "+destdir+ ";" + (fileparams!=null?fileparams:" ") + " ./"+filename; logger.debug("Execution command {}",command); - remoteScriptExecutionService.executeRemoteScript(remotserver,username,password,portnumner,filename,fileparams,srcdir,destdir,command); + remoteScriptExecutionService.executeRemoteScript(remoteserver,username,password,portnumber,filename,fileparams,srcdir,destdir,command); } } diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/DeployPostVerficationRemoteScriptExecutor.java b/akraino/src/main/java/com/akraino/bpm/delegate/DeployPostVerficationRemoteScriptExecutor.java index ca90550..6a25fd3 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/DeployPostVerficationRemoteScriptExecutor.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/DeployPostVerficationRemoteScriptExecutor.java @@ -42,7 +42,7 @@ public class DeployPostVerficationRemoteScriptExecutor implements JavaDelegate { public void execute(DelegateExecution ctx) throws Exception { try { - String remoteserver =(String) ctx.getVariable("remotserver"); + String remoteserver =(String) ctx.getVariable("remoteserver"); int portnumber =(Integer)ctx.getVariable("port"); String username =(String) ctx.getVariable("username"); String password =(String) ctx.getVariable("password"); diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/DeployRemoteDeploymentVerificationDelegate.java b/akraino/src/main/java/com/akraino/bpm/delegate/DeployRemoteDeploymentVerificationDelegate.java index 98f5b38..e1e2e93 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/DeployRemoteDeploymentVerificationDelegate.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/DeployRemoteDeploymentVerificationDelegate.java @@ -42,7 +42,7 @@ public class DeployRemoteDeploymentVerificationDelegate implements JavaDelegate public void execute(DelegateExecution ctx) throws Exception { try { - String remoteserver =(String) ctx.getVariable("remotserver"); + String remoteserver =(String) ctx.getVariable("remoteserver"); int portnumber =(Integer)ctx.getVariable("port"); String username =(String) ctx.getVariable("username"); String password =(String) ctx.getVariable("password"); diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/DeployRemoteScriptExecutorTaskDelegate.java b/akraino/src/main/java/com/akraino/bpm/delegate/DeployRemoteScriptExecutorTaskDelegate.java index abb0b88..d2a5eb7 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/DeployRemoteScriptExecutorTaskDelegate.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/DeployRemoteScriptExecutorTaskDelegate.java @@ -39,8 +39,8 @@ public class DeployRemoteScriptExecutorTaskDelegate implements JavaDelegate { DeployResponseSenderService deployResponseSenderService; public void execute(DelegateExecution ctx) throws Exception { - String remotserver=(String)ctx.getVariable("remotserver"); - int portnumner=(Integer)ctx.getVariable("port"); + String remoteserver=(String)ctx.getVariable("remoteserver"); + int portnumber=(Integer)ctx.getVariable("port"); String username=(String)ctx.getVariable("username"); String password=(String)ctx.getVariable("password"); String filename=(String)ctx.getVariable("filename"); @@ -50,11 +50,11 @@ public class DeployRemoteScriptExecutorTaskDelegate implements JavaDelegate { String sitename=(String)ctx.getVariable("sitename"); deployResponseSenderService.sendResponse(new BuildResponse(null, null, null, null, "in progress...", sitename, null, null, null)); - logger.debug("task execution started remotserver {} , portnumner {},username {}, password {},filename : {} ,fileparams={},src dir={},dest dir={}", - remotserver,portnumner,username,password,filename,fileparams,srcdir,destdir); + logger.debug("task execution started remoteserver {} , portnumber {},username {}, password {},filename : {} ,fileparams={},src dir={},dest dir={}", + remoteserver,portnumber,username,password,filename,fileparams,srcdir,destdir); String command = String.format("/bin/bash %s/%s %s", destdir, filename, (fileparams!=null?fileparams.replaceAll(",", " "):"")); logger.debug("Execution command {}",command); - remoteScriptExecutionService.executeRemoteScript(remotserver,username,password,portnumner,filename,fileparams,srcdir,destdir,command); + remoteScriptExecutionService.executeRemoteScript(remoteserver,username,password,portnumber,filename,fileparams,srcdir,destdir,command); } } diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/FileTransferDelegator.java b/akraino/src/main/java/com/akraino/bpm/delegate/FileTransferDelegator.java index 20cb0ab..c748ab0 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/FileTransferDelegator.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/FileTransferDelegator.java @@ -43,16 +43,16 @@ public class FileTransferDelegator implements JavaDelegate { try { - String remotserver=(String)ctx.getVariable("remotserver"); + String remoteserver=(String)ctx.getVariable("remoteserver"); int port=(Integer)ctx.getVariable("port"); String username=(String)ctx.getVariable("username"); String password=(String)ctx.getVariable("password"); String srcdir=(String)ctx.getVariable("srcdir"); String destdir=(String)ctx.getVariable("destdir"); - logger.debug("File transfer started remotserver {} , portnumner {},username {}, password {},src ={}, dest={}", - remotserver,port,username,password,srcdir,destdir); - fileTransferService.transferFile(srcdir, destdir,remotserver, username, password, port); + logger.debug("File transfer started remoteserver {} , portnumber {},username {}, password {},src ={}, dest={}", + remoteserver,port,username,password,srcdir,destdir); + fileTransferService.transferFile(srcdir, destdir,remoteserver, username, password, port); }catch(TaskExecutorException ex) { throw ex; } diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/MultiNodeDeployRemoteScript1ExecutorTaskDelegate.java b/akraino/src/main/java/com/akraino/bpm/delegate/MultiNodeDeployRemoteScript1ExecutorTaskDelegate.java index 554a592..f331085 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/MultiNodeDeployRemoteScript1ExecutorTaskDelegate.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/MultiNodeDeployRemoteScript1ExecutorTaskDelegate.java @@ -44,19 +44,19 @@ public class MultiNodeDeployRemoteScript1ExecutorTaskDelegate implements JavaDel public void execute(DelegateExecution ctx) throws Exception { - String remotserver=(String)ctx.getVariable("remotserver"); - int portnumner=(Integer)ctx.getVariable("port"); + String remoteserver=(String)ctx.getVariable("remoteserver"); + int portnumber=(Integer)ctx.getVariable("port"); String username=(String)ctx.getVariable("username"); String password=(String)ctx.getVariable("password"); String filename=(String)ctx.getVariable("remotefile1"); String fileparams=(String)ctx.getVariable("remotefile1params"); String destdir=(String)ctx.getVariable("destdir1"); - logger.debug("task execution started remotserver {} , portnumner {},username {}, password {},filename : {} ,fileparams={},dest dir={}", - remotserver,portnumner,username,password,filename,fileparams,destdir); + logger.debug("task execution started remoteserver {} , portnumber {},username {}, password {},filename : {} ,fileparams={},dest dir={}", + remoteserver,portnumber,username,password,filename,fileparams,destdir); String command="cd "+destdir+ ";" +" bash "+filename+" "+ (fileparams!=null?fileparams:" ") ; logger.debug("Execution command {}",command); - remoteScriptExecutionService.executeRemoteScript(remotserver,username,password,portnumner,filename,fileparams,null,destdir,command); + remoteScriptExecutionService.executeRemoteScript(remoteserver,username,password,portnumber,filename,fileparams,null,destdir,command); } } diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/MultiNodeDeployRemoteScript2ExecutorTaskDelegate.java b/akraino/src/main/java/com/akraino/bpm/delegate/MultiNodeDeployRemoteScript2ExecutorTaskDelegate.java index 02ded79..2261208 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/MultiNodeDeployRemoteScript2ExecutorTaskDelegate.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/MultiNodeDeployRemoteScript2ExecutorTaskDelegate.java @@ -43,8 +43,8 @@ public class MultiNodeDeployRemoteScript2ExecutorTaskDelegate implements JavaDel public void execute(DelegateExecution ctx) throws Exception { - String remotserver=(String)ctx.getVariable("remotserver"); - int portnumner=(Integer)ctx.getVariable("port"); + String remoteserver=(String)ctx.getVariable("remoteserver"); + int portnumber=(Integer)ctx.getVariable("port"); String username=(String)ctx.getVariable("username"); String password=(String)ctx.getVariable("password"); String filename=(String)ctx.getVariable("remotefile2"); @@ -54,12 +54,12 @@ public class MultiNodeDeployRemoteScript2ExecutorTaskDelegate implements JavaDel deployResponseSenderService.sendResponse(new BuildResponse("completed", "completed", "completed", "inprogress","not started",sitename,null,null,null)); - logger.debug("task execution started remotserver {} , portnumner {},username {}, password {},filename : {} ,fileparams={},dest dir={}", - remotserver,portnumner,username,password,filename,fileparams,destdir); + logger.debug("task execution started remoteserver {} , portnumber {},username {}, password {},filename : {} ,fileparams={},dest dir={}", + remoteserver,portnumber,username,password,filename,fileparams,destdir); String command="cd "+destdir+ ";" +" bash "+filename+" "+ (fileparams!=null?fileparams:" ") ; logger.debug("Execution command {}",command); - remoteScriptExecutionService.executeRemoteScript(remotserver,username,password,portnumner,filename,fileparams,null,destdir,command); + remoteScriptExecutionService.executeRemoteScript(remoteserver,username,password,portnumber,filename,fileparams,null,destdir,command); deployResponseSenderService.sendResponse(new BuildResponse("completed", "completed", "completed", "completed","completed",sitename,null,null,null)); } diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/RemoteDeploymentVerificationDelegate.java b/akraino/src/main/java/com/akraino/bpm/delegate/RemoteDeploymentVerificationDelegate.java index 80d4670..dc10c68 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/RemoteDeploymentVerificationDelegate.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/RemoteDeploymentVerificationDelegate.java @@ -44,21 +44,21 @@ public class RemoteDeploymentVerificationDelegate implements JavaDelegate { String verifierFilename=(String)ctx.getVariable("verifier"); int waittime=(Integer)ctx.getVariable("waittime"); int iterations=(Integer)ctx.getVariable("iterations"); - String remotserver=(String)ctx.getVariable("remotserver"); - int portnumner=(Integer)ctx.getVariable("port"); + String remoteserver=(String)ctx.getVariable("remoteserver"); + int portnumber=(Integer)ctx.getVariable("port"); String username=(String)ctx.getVariable("username"); String password=(String)ctx.getVariable("password"); String srcdir=(String)ctx.getVariable("srcdir"); String destdir=(String)ctx.getVariable("destdir"); String filepparams=(String)ctx.getVariable("verifierfileparams"); - logger.debug("task execution started remotserver {} , portnumner {},username {}, password {},filename : {} , waittime : {},No of iterations :{}", - remotserver,portnumner,username,password,verifierFilename,srcdir,destdir,waittime,iterations); + logger.debug("task execution started remoteserver {} , portnumber {},username {}, password {},filename : {} , waittime : {},No of iterations :{}", + remoteserver,portnumber,username,password,verifierFilename,srcdir,destdir,waittime,iterations); // This looks wrong! String command = "/bin/bash " +destdir+"/"+(verifierFilename!=null?verifierFilename:" ")+" "+(filepparams!=null?filepparams.replaceAll(",", " "):" "); logger.debug("Execution command {}",command); - remotedeploymentVerificationService.executeScript(remotserver,username,password,portnumner,verifierFilename,filepparams,srcdir,destdir,waittime,iterations,command); + remotedeploymentVerificationService.executeScript(remoteserver,username,password,portnumber,verifierFilename,filepparams,srcdir,destdir,waittime,iterations,command); } catch(TaskExecutorException ex) { throw ex; } diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/RemoteScriptExecutorTaskDelegate.java b/akraino/src/main/java/com/akraino/bpm/delegate/RemoteScriptExecutorTaskDelegate.java index 5008925..74dd3f7 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/RemoteScriptExecutorTaskDelegate.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/RemoteScriptExecutorTaskDelegate.java @@ -34,8 +34,8 @@ public class RemoteScriptExecutorTaskDelegate implements JavaDelegate { RemoteScriptExecutionService remoteScriptExecutionService; public void execute(DelegateExecution ctx) throws Exception { - String remotserver=(String)ctx.getVariable("remotserver"); - int portnumner=(Integer)ctx.getVariable("port"); + String remoteserver=(String)ctx.getVariable("remoteserver"); + int portnumber=(Integer)ctx.getVariable("port"); String username=(String)ctx.getVariable("username"); String password=(String)ctx.getVariable("password"); String filename=(String)ctx.getVariable("filename"); @@ -43,10 +43,10 @@ public class RemoteScriptExecutorTaskDelegate implements JavaDelegate { String srcdir=(String)ctx.getVariable("srcdir"); String destdir=(String)ctx.getVariable("destdir"); - logger.debug("task execution started remotserver {} , portnumner {},username {}, password {},filename : {} ,fileparams={},src dir={},dest dir={}", - remotserver,portnumner,username,password,filename,fileparams,srcdir,destdir); + logger.debug("task execution started remoteserver {} , portnumber {},username {}, password {},filename : {} ,fileparams={},src dir={},dest dir={}", + remoteserver,portnumber,username,password,filename,fileparams,srcdir,destdir); String command = String.format("cd %s; /bin/bash %s %s", destdir, filename, (fileparams!=null?fileparams.replaceAll(",", " "):"")); logger.debug("Execution command {}",command); - remoteScriptExecutionService.executeRemoteScript(remotserver,username,password,portnumner,filename,fileparams,srcdir,destdir,command); + remoteScriptExecutionService.executeRemoteScript(remoteserver,username,password,portnumber,filename,fileparams,srcdir,destdir,command); } } diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/TempestRemoteDeploymentVerificationDelegate.java b/akraino/src/main/java/com/akraino/bpm/delegate/TempestRemoteDeploymentVerificationDelegate.java index 6824d4c..878e24a 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/TempestRemoteDeploymentVerificationDelegate.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/TempestRemoteDeploymentVerificationDelegate.java @@ -44,20 +44,20 @@ public class TempestRemoteDeploymentVerificationDelegate implements JavaDelegate String verifierFilename=(String)ctx.getVariable("verifier"); int waittime=(Integer)ctx.getVariable("waittime"); int iterations=(Integer)ctx.getVariable("iterations"); - String remotserver=(String)ctx.getVariable("remotserver"); - int portnumner=(Integer)ctx.getVariable("port"); + String remoteserver=(String)ctx.getVariable("remoteserver"); + int portnumber=(Integer)ctx.getVariable("port"); String username=(String)ctx.getVariable("username"); String password=(String)ctx.getVariable("password"); String srcdir=(String)ctx.getVariable("srcdir"); String destdir=(String)ctx.getVariable("destdir"); String filepparams=(String)ctx.getVariable("verifierfileparams"); - logger.debug("task execution started remotserver {} , portnumner {},username {}, password {},filename : {} , waittime : {},No of iterations :{}", - remotserver,portnumner,username,password,verifierFilename,srcdir,destdir,waittime,iterations); + logger.debug("task execution started remoteserver {} , portnumber {},username {}, password {},filename : {} , waittime : {},No of iterations :{}", + remoteserver,portnumber,username,password,verifierFilename,srcdir,destdir,waittime,iterations); String command= "cd "+destdir+ ";" + (filepparams!=null?filepparams:" ")+ " ./"+verifierFilename; logger.debug("Execution command {}",command); - remotedeploymentVerificationService.executeScript(remotserver,username,password,portnumner,verifierFilename,filepparams,srcdir,destdir,waittime,iterations,command); + remotedeploymentVerificationService.executeScript(remoteserver,username,password,portnumber,verifierFilename,filepparams,srcdir,destdir,waittime,iterations,command); }catch(TaskExecutorException ex) { throw ex; } diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/TempestRemoteScriptExecutorTaskDelegate.java b/akraino/src/main/java/com/akraino/bpm/delegate/TempestRemoteScriptExecutorTaskDelegate.java index c992918..348ee4e 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/TempestRemoteScriptExecutorTaskDelegate.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/TempestRemoteScriptExecutorTaskDelegate.java @@ -38,8 +38,8 @@ public class TempestRemoteScriptExecutorTaskDelegate implements JavaDelegate { RemoteScriptExecutionService remoteScriptExecutionService; public void execute(DelegateExecution ctx) throws Exception { - String remotserver=(String)ctx.getVariable("remotserver"); - int portnumner=(Integer)ctx.getVariable("port"); + String remoteserver=(String)ctx.getVariable("remoteserver"); + int portnumber=(Integer)ctx.getVariable("port"); String username=(String)ctx.getVariable("username"); String password=(String)ctx.getVariable("password"); String filename=(String)ctx.getVariable("filename"); @@ -48,12 +48,12 @@ public class TempestRemoteScriptExecutorTaskDelegate implements JavaDelegate { String destdir=(String)ctx.getVariable("destdir"); - logger.debug("task execution started remotserver {} , portnumner {},username {}, password {},filename : {} ,fileparams={},src dir={},dest dir={}", - remotserver,portnumner,username,password,filename,fileparams,srcdir,destdir); + logger.debug("task execution started remoteserver {} , portnumber {},username {}, password {},filename : {} ,fileparams={},src dir={},dest dir={}", + remoteserver,portnumber,username,password,filename,fileparams,srcdir,destdir); String command= "cd "+destdir+ ";" + (fileparams!=null?fileparams:" ") + " ./"+filename; logger.debug("Execution command {}",command); - remoteScriptExecutionService.executeRemoteScript(remotserver,username,password,portnumner,filename,fileparams,srcdir,destdir,command); + remoteScriptExecutionService.executeRemoteScript(remoteserver,username,password,portnumber,filename,fileparams,srcdir,destdir,command); } } diff --git a/akraino/src/main/java/com/akraino/bpm/model/Airship.java b/akraino/src/main/java/com/akraino/bpm/model/Airship.java index 6f35a1b..1c9227d 100644 --- a/akraino/src/main/java/com/akraino/bpm/model/Airship.java +++ b/akraino/src/main/java/com/akraino/bpm/model/Airship.java @@ -24,7 +24,7 @@ public class Airship { private String winscpdir; private String winscpfilepath; private String winscpfileparams; - private String remotserver; + private String remoteserver; private int port; private String username; private String password; @@ -64,11 +64,11 @@ public class Airship { this.destdir = destdir; } - public String getRemotserver() { - return remotserver; + public String getRemoteserver() { + return remoteserver; } - public void setRemotserver(String remotserver) { - this.remotserver = remotserver; + public void setRemoteserver(String remoteserver) { + this.remoteserver = remoteserver; } public int getPort() { return port; @@ -116,7 +116,7 @@ public class Airship { public String toString() { return "Airship [sitename=" + sitename + ", filepath=" + filepath + ", fileparams=" + fileparams + ", winscpdir=" + winscpdir + ", winscpfilepath=" + winscpfilepath + ", winscpfileparams=" - + winscpfileparams + ", remotserver=" + remotserver + ", port=" + port + ", username=" + username + + winscpfileparams + ", remoteserver=" + remoteserver + ", port=" + port + ", username=" + username + ", password=" + password + ", destdir=" + destdir + ", remotefilename=" + remotefilename + ", remotefileparams=" + remotefileparams + "]"; } diff --git a/akraino/src/main/java/com/akraino/bpm/model/Deploy.java b/akraino/src/main/java/com/akraino/bpm/model/Deploy.java index e26f13e..211b265 100644 --- a/akraino/src/main/java/com/akraino/bpm/model/Deploy.java +++ b/akraino/src/main/java/com/akraino/bpm/model/Deploy.java @@ -24,7 +24,7 @@ public class Deploy { private String fileparams; private String winscpfilepath; private String winscpfileparams; - private String remotserver; + private String remoteserver; private int port; private String username; private String password; @@ -81,11 +81,11 @@ public class Deploy { public void setDestdir(String destdir) { this.destdir = destdir; } - public String getRemotserver() { - return remotserver; + public String getRemoteserver() { + return remoteserver; } - public void setRemotserver(String remotserver) { - this.remotserver = remotserver; + public void setRemoteserver(String remoteserver) { + this.remoteserver = remoteserver; } public int getPort() { return port; @@ -163,8 +163,8 @@ public class Deploy { @Override public String toString() { return "Deploy [sitename=" + sitename + ", blueprint=" + blueprint + ", filepath=" + filepath + ", fileparams=" + fileparams - + ", winscpfilepath=" + winscpfilepath + ", winscpfileparams=" + winscpfileparams + ", remotserver=" - + remotserver + ", port=" + port + ", username=" + username + ", password=" + password + ", destdir=" + + ", winscpfilepath=" + winscpfilepath + ", winscpfileparams=" + winscpfileparams + ", remoteserver=" + + remoteserver + ", port=" + port + ", username=" + username + ", password=" + password + ", destdir=" + destdir + ", remotefilename=" + remotefilename + ", remotefileparams=" + remotefileparams + ", deploymentverifier=" + deploymentverifier + ", deploymentverifierfileparams=" + deploymentverifierfileparams + ", noofiterations=" + noofiterations + ", waittime=" + waittime diff --git a/akraino/src/main/java/com/akraino/bpm/model/MultiNodeDeploy.java b/akraino/src/main/java/com/akraino/bpm/model/MultiNodeDeploy.java index ab656fa..4a5d33e 100644 --- a/akraino/src/main/java/com/akraino/bpm/model/MultiNodeDeploy.java +++ b/akraino/src/main/java/com/akraino/bpm/model/MultiNodeDeploy.java @@ -23,7 +23,7 @@ public class MultiNodeDeploy { private String file1params; private String winscpfilepath; private String winscpfileparams; - private String remotserver; + private String remoteserver; private int port; private String username; private String password; @@ -63,11 +63,11 @@ public class MultiNodeDeploy { public void setWinscpfileparams(String winscpfileparams) { this.winscpfileparams = winscpfileparams; } - public String getRemotserver() { - return remotserver; + public String getRemoteserver() { + return remoteserver; } - public void setRemotserver(String remotserver) { - this.remotserver = remotserver; + public void setRemoteserver(String remoteserver) { + this.remoteserver = remoteserver; } public int getPort() { return port; @@ -129,8 +129,8 @@ public class MultiNodeDeploy { @Override public String toString() { return "MultiNodeDeploy [sitename=" + sitename + ", file1=" + file1 + ", file1params=" + file1params - + ", winscpfilepath=" + winscpfilepath + ", winscpfileparams=" + winscpfileparams + ", remotserver=" - + remotserver + ", port=" + port + ", username=" + username + ", password=" + password + ", destdir1=" + + ", winscpfilepath=" + winscpfilepath + ", winscpfileparams=" + winscpfileparams + ", remoteserver=" + + remoteserver + ", port=" + port + ", username=" + username + ", password=" + password + ", destdir1=" + destdir1 + ", remotefile1=" + remotefile1 + ", remotefile1params=" + remotefile1params + ", destdir2=" + destdir2 + ", remotefile2=" + remotefile2 + ", remotefile2params=" + remotefile2params + "]"; } diff --git a/akraino/src/main/java/com/akraino/bpm/service/impl/AsyncProcessExecutorServiceImpl.java b/akraino/src/main/java/com/akraino/bpm/service/impl/AsyncProcessExecutorServiceImpl.java index c339775..f41ca16 100644 --- a/akraino/src/main/java/com/akraino/bpm/service/impl/AsyncProcessExecutorServiceImpl.java +++ b/akraino/src/main/java/com/akraino/bpm/service/impl/AsyncProcessExecutorServiceImpl.java @@ -70,7 +70,7 @@ public class AsyncProcessExecutorServiceImpl implements AsyncProcessExecutorServ Variables.putValue("filepath", filepath1) .putValue("scpdir", airship.getWinscpdir()) .putValue("ScpScriptFilepath", filepath2) - .putValue("remotserver", airship.getRemotserver()) + .putValue("remoteserver", airship.getRemoteserver()) .putValue("username", airship.getUsername()) .putValue("password", airship.getPassword()) .putValue("port", airship.getPort()) @@ -130,7 +130,7 @@ public class AsyncProcessExecutorServiceImpl implements AsyncProcessExecutorServ Variables.putValue("filepath", filepath1) .putValue("scpsrcdir", scpSrcDir) .putValue("ScpScriptFilepath", transferfile) - .putValue("remotserver", deploy.getRemotserver()) + .putValue("remoteserver", deploy.getRemoteserver()) .putValue("username", deploy.getUsername()) .putValue("password", deploy.getPassword()) .putValue("port", deploy.getPort()) @@ -177,7 +177,7 @@ public class AsyncProcessExecutorServiceImpl implements AsyncProcessExecutorServ .putValue("verifierfileparams", onap.getVerifierparams()) .putValue("waittime", onap.getWaittime()) .putValue("iterations", onap.getNoofiterations()) - .putValue("remotserver", onap.getRemoteserver()) + .putValue("remoteserver", onap.getRemoteserver()) .putValue("username", onap.getUsername()) .putValue("password", onap.getPassword()) .putValue("port", onap.getPortnumber()) @@ -215,7 +215,7 @@ public class AsyncProcessExecutorServiceImpl implements AsyncProcessExecutorServ .putValue("verifierfileparams", tempest.getVerifierparams()) .putValue("waittime", tempest.getWaittime()) .putValue("iterations", tempest.getNoofiterations()) - .putValue("remotserver", tempest.getRemoteserver()) + .putValue("remoteserver", tempest.getRemoteserver()) .putValue("username", tempest.getUsername()) .putValue("password", tempest.getPassword()) .putValue("port", tempest.getPortnumber()) @@ -253,7 +253,7 @@ public class AsyncProcessExecutorServiceImpl implements AsyncProcessExecutorServ .putValue("verifierfileparams", apache.getVerifierparams()) .putValue("waittime", apache.getWaittime()) .putValue("iterations", apache.getNoofiterations()) - .putValue("remotserver", apache.getRemoteserver()) + .putValue("remoteserver", apache.getRemoteserver()) .putValue("username", apache.getUsername()) .putValue("password", apache.getPassword()) .putValue("port", apache.getPortnumber()) @@ -288,7 +288,7 @@ public class AsyncProcessExecutorServiceImpl implements AsyncProcessExecutorServ .putValue("file1params", multiNodeDeploy.getFile1params()) .putValue("winscpdir", scpSrcDir) .putValue("scpfilename", transferfile) - .putValue("remotserver", multiNodeDeploy.getRemotserver()) + .putValue("remoteserver", multiNodeDeploy.getRemoteserver()) .putValue("username", multiNodeDeploy.getUsername()) .putValue("password", multiNodeDeploy.getPassword()) .putValue("port", multiNodeDeploy.getPort()) -- 2.16.6