You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/04/12 20:10:24 UTC
git commit: updated refs/heads/master to 72b2422
Repository: cloudstack
Updated Branches:
refs/heads/master 332da26cb -> 72b242262
findbugs: removed identical override for CitrixResourceBase method
transferManagementNetwork
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/72b24226
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/72b24226
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/72b24226
Branch: refs/heads/master
Commit: 72b24226236b586d6056a461b660b3bcd9a84ae3
Parents: 332da26
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Sun Apr 12 20:10:20 2015 +0200
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Sun Apr 12 20:10:20 2015 +0200
----------------------------------------------------------------------
.../xenserver/resource/XenServer56Resource.java | 44 +++-----------------
1 file changed, 6 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/72b24226/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56Resource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56Resource.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56Resource.java
index 12e4fc5..b164963 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56Resource.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56Resource.java
@@ -23,21 +23,20 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
-import org.apache.xmlrpc.XmlRpcException;
-import com.cloud.agent.api.StartupCommand;
-import com.cloud.resource.ServerResource;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.utils.script.Script;
-import com.cloud.utils.ssh.SSHCmdHelper;
import com.xensource.xenapi.Connection;
import com.xensource.xenapi.Host;
import com.xensource.xenapi.Network;
import com.xensource.xenapi.PIF;
-import com.xensource.xenapi.Types.IpConfigurationMode;
import com.xensource.xenapi.Types.XenAPIException;
import com.xensource.xenapi.VLAN;
+import com.cloud.agent.api.StartupCommand;
+import com.cloud.resource.ServerResource;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+import com.cloud.utils.ssh.SSHCmdHelper;
+
@Local(value = ServerResource.class)
public class XenServer56Resource extends CitrixResourceBase {
private final static Logger s_logger = Logger.getLogger(XenServer56Resource.class);
@@ -143,37 +142,6 @@ public class XenServer56Resource extends CitrixResourceBase {
}
@Override
- public boolean transferManagementNetwork(final Connection conn, final Host host, final PIF src, final PIF.Record spr, final PIF dest) throws XmlRpcException, XenAPIException {
- dest.reconfigureIp(conn, spr.ipConfigurationMode, spr.IP, spr.netmask, spr.gateway, spr.DNS);
- Host.managementReconfigure(conn, dest);
- String hostUuid = null;
- final int count = 0;
- while (count < 10) {
- try {
- Thread.sleep(10000);
- hostUuid = host.getUuid(conn);
- if (hostUuid != null) {
- break;
- }
- } catch (final XmlRpcException e) {
- s_logger.debug("Waiting for host to come back: " + e.getMessage());
- } catch (final XenAPIException e) {
- s_logger.debug("Waiting for host to come back: " + e.getMessage());
- } catch (final InterruptedException e) {
- s_logger.debug("Gotta run");
- return false;
- }
- }
- if (hostUuid == null) {
- s_logger.warn("Unable to transfer the management network from " + spr.uuid);
- return false;
- }
-
- src.reconfigureIp(conn, IpConfigurationMode.NONE, null, null, null, null);
- return true;
- }
-
- @Override
public StartupCommand[] initialize() {
pingXAPI();
final StartupCommand[] cmds = super.initialize();