cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [3/5] git commit: updated refs/heads/4.5 to 1f97f94
Date Wed, 04 Mar 2015 11:30:10 GMT
CLOUDSTACK-8296 VMs cannot be migrated with XenMotion as network is not available.

(cherry picked from commit 736c7d7668796af96f223a2c6cd82aac6789a2ee)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8069b172
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8069b172
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8069b172

Branch: refs/heads/4.5
Commit: 8069b172504ff2e66d092cfaf02cdd29dd03e849
Parents: c8e6fbb
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Mon Mar 2 11:22:49 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Mar 4 16:59:12 2015 +0530

----------------------------------------------------------------------
 .../hypervisor/xenserver/resource/XenServer610Resource.java    | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8069b172/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
index 5e3f95c..2283477 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
@@ -132,6 +132,12 @@ public class XenServer610Resource extends XenServer600Resource {
 
         try {
             prepareISO(connection, vmSpec.getName());
+
+            // Get the list of networks and recreate VLAN, if required.
+            for (NicTO nicTo : vmSpec.getNics()) {
+                getNetwork(connection, nicTo);
+            }
+
             Map<String, String> other = new HashMap<String, String>();
             other.put("live", "true");
             Network networkForSm = getNativeNetworkForTraffic(connection, TrafficType.Storage,
null).getNetwork();


Mime
View raw message