You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2013/07/02 08:29:33 UTC
git commit: updated refs/heads/master-6-17-stable to 1ef5343
Updated Branches:
refs/heads/master-6-17-stable bbc4e1212 -> 1ef5343e1
Cloudstack-3299 incorrect arguments sent to the script createIpalias in case of vmware, Cloudstack-3240 corrected a mistake in the script name.
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1ef5343e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1ef5343e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1ef5343e
Branch: refs/heads/master-6-17-stable
Commit: 1ef5343e1f0bdc04021d832ea8ca7f007f3cd9dc
Parents: bbc4e12
Author: Bharat Kumar <bh...@citrix.com>
Authored: Mon Jul 1 18:08:00 2013 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Tue Jul 2 11:58:13 2013 +0530
----------------------------------------------------------------------
.../vmware/resource/VmwareResource.java | 30 ++++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ef5343e/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 3325171..46e5cf9 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1994,36 +1994,36 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
protected Answer execute(final CreateIpAliasCommand cmd) {
if (s_logger.isInfoEnabled()) {
- s_logger.info("Executing createipAlias command: " + _gson.toJson(cmd));
+ s_logger.info("Executing createIpAlias command: " + _gson.toJson(cmd));
}
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
List<IpAliasTO> ipAliasTOs = cmd.getIpAliasList();
- String args=routerIp+" ";
+ String args="";
for (IpAliasTO ipaliasto : ipAliasTOs) {
args = args + ipaliasto.getAlias_count()+":"+ipaliasto.getRouterip()+":"+ipaliasto.getNetmask()+"-";
}
if (s_logger.isDebugEnabled()) {
- s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/createipAlias " + args);
+ s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/createIpAlias " + args);
}
try {
VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
String controlIp = getRouterSshControlIp(cmd);
Pair<Boolean, String> result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null,
- "/root/createipAlias.sh " + args);
+ "/root/createIpAlias.sh " + args);
if (!result.first()) {
- s_logger.error("ipAlias command on domr " + controlIp + " failed, message: " + result.second());
+ s_logger.error("CreateIpAlias command on domr " + controlIp + " failed, message: " + result.second());
return new Answer(cmd, false, "createipAlias failed due to " + result.second());
}
if (s_logger.isInfoEnabled()) {
- s_logger.info("createipAlias command on domain router " + controlIp + " completed");
+ s_logger.info("createIpAlias command on domain router " + controlIp + " completed");
}
} catch (Throwable e) {
- String msg = "createipAlias failed due to " + VmwareHelper.getExceptionMessage(e);
+ String msg = "createIpAlias failed due to " + VmwareHelper.getExceptionMessage(e);
s_logger.error(msg, e);
return new Answer(cmd, false, msg);
}
@@ -2036,9 +2036,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
List<IpAliasTO> revokedIpAliasTOs = cmd.getDeleteIpAliasTos();
List<IpAliasTO> activeIpAliasTOs = cmd.getCreateIpAliasTos();
if (s_logger.isInfoEnabled()) {
- s_logger.info("Executing deleteipAlias command: " + _gson.toJson(cmd));
+ s_logger.info("Executing deleteIpAlias command: " + _gson.toJson(cmd));
}
- String args=routerIp+" ";
+ String args="";
for (IpAliasTO ipAliasTO : revokedIpAliasTOs) {
args = args + ipAliasTO.getAlias_count()+":"+ipAliasTO.getRouterip()+":"+ipAliasTO.getNetmask()+"-";
}
@@ -2047,27 +2047,27 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
args = args + ipAliasTO.getAlias_count()+":"+ipAliasTO.getRouterip()+":"+ipAliasTO.getNetmask()+"-";
}
if (s_logger.isDebugEnabled()) {
- s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/deleteipAlias " + args);
+ s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/deleteIpAlias " + args);
}
try {
VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
String controlIp = getRouterSshControlIp(cmd);
Pair<Boolean, String> result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null,
- "/root/deleteipAlias.sh " + args);
+ "/root/deleteIpAlias.sh " + args);
if (!result.first()) {
- s_logger.error("ipAlias command on domr " + controlIp + " failed, message: " + result.second());
+ s_logger.error("deleteIpAlias command on domr " + controlIp + " failed, message: " + result.second());
- return new Answer(cmd, false, "deleteipAlias failed due to " + result.second());
+ return new Answer(cmd, false, "deleteIpAlias failed due to " + result.second());
}
if (s_logger.isInfoEnabled()) {
- s_logger.info("deleteipAlias command on domain router " + controlIp + " completed");
+ s_logger.info("deleteIpAlias command on domain router " + controlIp + " completed");
}
} catch (Throwable e) {
- String msg = "deleteipAlias failed due to " + VmwareHelper.getExceptionMessage(e);
+ String msg = "deleteIpAlias failed due to " + VmwareHelper.getExceptionMessage(e);
s_logger.error(msg, e);
return new Answer(cmd, false, msg);
}