You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2012/06/22 22:33:30 UTC
[3/3] CS-15173: Additional Cluster is allowed to add with the same
VSM IPaddress as the previous cluster
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/361ca964/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
index 4437519..cfbdc56 100755
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
@@ -194,6 +194,7 @@ public class HypervisorHostHelper {
netconfClient.disconnect();
s_logger.debug("Disconnected Nexus 1000v session.");
}
+ throw new CloudRuntimeException(msg);
}
List<Pair<OperationType, String>> params = new ArrayList<Pair<OperationType, String>>();
@@ -212,6 +213,7 @@ public class HypervisorHostHelper {
netconfClient.disconnect();
s_logger.debug("Disconnected Nexus 1000v session.");
}
+ throw new CloudRuntimeException(msg);
}
}
@@ -230,6 +232,7 @@ public class HypervisorHostHelper {
netconfClient.disconnect();
s_logger.debug("Disconnected Nexus 1000v session.");
}
+ throw new CloudRuntimeException(msg);
}
try {
@@ -241,7 +244,8 @@ public class HypervisorHostHelper {
catch(CloudRuntimeException e) {
msg = "Failed to associate policy map " + policyName + " with port profile " + networkName
+ ". Exception: " + e.toString();
- s_logger.error(msg);
+ s_logger.error(msg);
+ throw new CloudRuntimeException(msg);
} finally {
if (netconfClient != null) {
netconfClient.disconnect();
@@ -301,6 +305,7 @@ public class HypervisorHostHelper {
netconfClient.disconnect();
s_logger.debug("Disconnected Nexus 1000v session.");
}
+ throw new CloudRuntimeException(msg);
}
try {
@@ -315,6 +320,7 @@ public class HypervisorHostHelper {
netconfClient.disconnect();
s_logger.debug("Disconnected Nexus 1000v session.");
}
+ throw new CloudRuntimeException(msg);
}
}
}
@@ -352,6 +358,7 @@ public class HypervisorHostHelper {
netconfClient.disconnect();
s_logger.debug("Disconnected Nexus 1000v session.");
}
+ throw new CloudRuntimeException(msg);
}
try {
@@ -364,6 +371,7 @@ public class HypervisorHostHelper {
netconfClient.disconnect();
s_logger.debug("Disconnected Nexus 1000v session.");
}
+ throw new CloudRuntimeException(msg);
}
}