You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2014/03/14 20:06:20 UTC
git commit: updated refs/heads/master to d9e1c9c
Repository: cloudstack
Updated Branches:
refs/heads/master 3aee404a4 -> d9e1c9c50
CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately
Conflicts:
server/src/com/cloud/network/NetworkModelImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d9e1c9c5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d9e1c9c5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d9e1c9c5
Branch: refs/heads/master
Commit: d9e1c9c5025ba9d8f7083dacea92938a2b379827
Parents: 3aee404
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Fri Mar 14 11:43:40 2014 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Mar 14 11:57:58 2014 -0700
----------------------------------------------------------------------
api/src/com/cloud/network/NetworkModel.java | 4 ++--
server/src/com/cloud/network/NetworkModelImpl.java | 4 ++--
.../network/router/VpcVirtualNetworkApplianceManagerImpl.java | 6 ++++--
server/test/com/cloud/network/MockNetworkModelImpl.java | 2 +-
server/test/com/cloud/vpc/MockNetworkModelImpl.java | 2 +-
5 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9e1c9c5/api/src/com/cloud/network/NetworkModel.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkModel.java b/api/src/com/cloud/network/NetworkModel.java
index f6555db..1c40e87 100644
--- a/api/src/com/cloud/network/NetworkModel.java
+++ b/api/src/com/cloud/network/NetworkModel.java
@@ -199,10 +199,10 @@ public interface NetworkModel {
List<? extends PhysicalNetwork> getPhysicalNtwksSupportingTrafficType(long zoneId, TrafficType trafficType);
/**
- * @param guestNic
+ * @param ntwkId
* @return
*/
- boolean isPrivateGateway(Nic guestNic);
+ boolean isPrivateGateway(long ntwkId);
Map<Service, Map<Capability, String>> getNetworkCapabilities(long networkId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9e1c9c5/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index 7b4b2be..cdacf78 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1671,8 +1671,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
}
@Override
- public boolean isPrivateGateway(Nic guestNic) {
- Network network = getNetwork(guestNic.getNetworkId());
+ public boolean isPrivateGateway(long ntwkId) {
+ Network network = getNetwork(ntwkId);
if (network.getTrafficType() != TrafficType.Guest || network.getNetworkOfferingId() != s_privateOfferingId.longValue()) {
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9e1c9c5/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 8296460..1f13334 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -782,8 +782,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
//plug guest nic
PlugNicCommand plugNicCmd = new PlugNicCommand(getNicTO(router, guestNic.getNetworkId(), null), router.getInstanceName(), router.getType());
cmds.addCommand(plugNicCmd);
-
- if (!_networkModel.isPrivateGateway(guestNic)) {
+ if (!_networkModel.isPrivateGateway(guestNic.getNetworkId())) {
//set guest network
VirtualMachine vm = _vmDao.findById(router.getId());
NicProfile nicProfile = _networkModel.getNicProfile(vm, guestNic.getNetworkId(), null);
@@ -1210,6 +1209,9 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
//3) allocate nic for guest gateway if needed
List<? extends Network> guestNetworks = _vpcMgr.getVpcNetworks(vpcId);
for (Network guestNetwork : guestNetworks) {
+ if (_networkModel.isPrivateGateway(guestNetwork.getId())) {
+ continue;
+ }
if (guestNetwork.getState() == Network.State.Implemented || guestNetwork.getState() == Network.State.Setup) {
NicProfile guestNic = createGuestNicProfileForVpcRouter(guestNetwork);
networks.put(guestNetwork, new ArrayList<NicProfile>(Arrays.asList(guestNic)));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9e1c9c5/server/test/com/cloud/network/MockNetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/test/com/cloud/network/MockNetworkModelImpl.java
index 6c9e597..093b4ed 100644
--- a/server/test/com/cloud/network/MockNetworkModelImpl.java
+++ b/server/test/com/cloud/network/MockNetworkModelImpl.java
@@ -591,7 +591,7 @@ public class MockNetworkModelImpl extends ManagerBase implements NetworkModel {
* @see com.cloud.network.NetworkModel#isPrivateGateway(com.cloud.vm.Nic)
*/
@Override
- public boolean isPrivateGateway(Nic guestNic) {
+ public boolean isPrivateGateway(long ntwkId) {
// TODO Auto-generated method stub
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9e1c9c5/server/test/com/cloud/vpc/MockNetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockNetworkModelImpl.java b/server/test/com/cloud/vpc/MockNetworkModelImpl.java
index 67ab8e8..41c1c0e 100644
--- a/server/test/com/cloud/vpc/MockNetworkModelImpl.java
+++ b/server/test/com/cloud/vpc/MockNetworkModelImpl.java
@@ -607,7 +607,7 @@ public class MockNetworkModelImpl extends ManagerBase implements NetworkModel {
* @see com.cloud.network.NetworkModel#isPrivateGateway(com.cloud.vm.Nic)
*/
@Override
- public boolean isPrivateGateway(Nic guestNic) {
+ public boolean isPrivateGateway(long ntwkId) {
// TODO Auto-generated method stub
return false;
}