Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 37AEDD4EB for ; Mon, 15 Oct 2012 20:29:57 +0000 (UTC) Received: (qmail 54670 invoked by uid 500); 15 Oct 2012 20:29:49 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 54595 invoked by uid 500); 15 Oct 2012 20:29:49 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 53663 invoked by uid 99); 15 Oct 2012 20:29:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Oct 2012 20:29:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C55FB472E0; Mon, 15 Oct 2012 20:29:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chipchilders@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [28/50] [abbrv] git commit: CLOUDSTACK-316: if public network is not specified, set to guest network Message-Id: <20121015202947.C55FB472E0@tyr.zones.apache.org> Date: Mon, 15 Oct 2012 20:29:47 +0000 (UTC) CLOUDSTACK-316: if public network is not specified, set to guest network Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c6bc77c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c6bc77c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c6bc77c2 Branch: refs/heads/junit-tests Commit: c6bc77c297d08d2b084b8fdfe77b956ffca07005 Parents: e905f61 Author: Edison Su Authored: Thu Oct 11 16:19:53 2012 -0700 Committer: Chip Childers Committed: Mon Oct 15 16:19:18 2012 -0400 ---------------------------------------------------------------------- .../kvm/discoverer/KvmServerDiscoverer.java | 36 +++++++++----- 1 files changed, 23 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c6bc77c2/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java index 03746e7..9d6e5b6 100644 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java @@ -176,9 +176,9 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer, } List netInfos = _networkMgr.getPhysicalNetworkInfo(dcId, HypervisorType.KVM); - String kvmPrivateNic = _kvmPrivateNic; - String kvmPublicNic = _kvmPublicNic; - String kvmGuestNic = _kvmGuestNic; + String kvmPrivateNic = null; + String kvmPublicNic = null; + String kvmGuestNic = null; for (PhysicalNetworkSetupInfo info : netInfos) { if (info.getPrivateNetworkName() != null) { @@ -191,21 +191,31 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer, kvmGuestNic = info.getGuestNetworkName(); } } - - String parameters = " -m " + _hostIp + " -z " + dcId + " -p " + podId + " -c " + clusterId + " -g " + guid + " -a"; - if (kvmPublicNic != null) { - parameters += " --pubNic=" + kvmPublicNic; - } + if (kvmPrivateNic == null && kvmPublicNic == null && kvmGuestNic == null) { + kvmPrivateNic = _kvmPrivateNic; + kvmPublicNic = _kvmPublicNic; + kvmGuestNic = _kvmGuestNic; + } - if (kvmPrivateNic != null) { - parameters += " --prvNic=" + kvmPrivateNic; + if (kvmPublicNic == null) { + kvmPublicNic = (kvmGuestNic != null) ? kvmGuestNic : kvmPrivateNic; + } + + if (kvmPrivateNic == null) { + kvmPrivateNic = (kvmPublicNic != null) ? kvmPublicNic : kvmGuestNic; } - if (kvmGuestNic != null) { - parameters += " --guestNic=" + kvmGuestNic; + if (kvmGuestNic == null) { + kvmGuestNic = (kvmPublicNic != null) ? kvmPublicNic : kvmPrivateNic; } - + + String parameters = " -m " + _hostIp + " -z " + dcId + " -p " + podId + " -c " + clusterId + " -g " + guid + " -a"; + + parameters += " --pubNic=" + kvmPublicNic; + parameters += " --prvNic=" + kvmPrivateNic; + parameters += " --guestNic=" + kvmGuestNic; + SSHCmdHelper.sshExecuteCmd(sshConnection, "cloud-setup-agent " + parameters, 3); KvmDummyResourceBase kvmResource = new KvmDummyResourceBase();