Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7FDA410989 for ; Wed, 4 Mar 2015 10:15:23 +0000 (UTC) Received: (qmail 91420 invoked by uid 500); 4 Mar 2015 10:05:47 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 91371 invoked by uid 500); 4 Mar 2015 10:05:47 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 89978 invoked by uid 99); 4 Mar 2015 10:05:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Mar 2015 10:05:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5642FE1095; Wed, 4 Mar 2015 10:05:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Wed, 04 Mar 2015 10:06:28 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [44/50] [abbrv] git commit: updated refs/heads/reporter to 178a938 CLOUDSTACK-8296 VMs cannot be migrated with XenMotion as network is not available. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/736c7d76 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/736c7d76 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/736c7d76 Branch: refs/heads/reporter Commit: 736c7d7668796af96f223a2c6cd82aac6789a2ee Parents: 58c5850 Author: Sanjay Tripathi Authored: Mon Mar 2 11:22:49 2015 +0530 Committer: Sanjay Tripathi Committed: Tue Mar 3 13:14:04 2015 +0530 ---------------------------------------------------------------------- .../hypervisor/xenserver/resource/XenServer610Resource.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/736c7d76/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 other = new HashMap(); other.put("live", "true"); Network networkForSm = getNativeNetworkForTraffic(connection, TrafficType.Storage, null).getNetwork();