You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/10/12 01:47:11 UTC
git commit: CLOUDSTACK-316: if public network is not specified,
set to guest network
Updated Branches:
refs/heads/master e73cbfe6a -> 513b680d9
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/513b680d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/513b680d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/513b680d
Branch: refs/heads/master
Commit: 513b680d96d07fd44479995ac5eb6358725c9421
Parents: e73cbfe
Author: Edison Su <su...@gmail.com>
Authored: Thu Oct 11 16:19:53 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Oct 11 16:46:23 2012 -0700
----------------------------------------------------------------------
.../kvm/discoverer/KvmServerDiscoverer.java | 36 +++++++++-----
1 files changed, 23 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/513b680d/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 <PhysicalNetworkSetupInfo> 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();