You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/03 20:43:37 UTC
[08/11] git commit: updated refs/heads/master to 7e902cd
CLOUDSTACK-9075 - Uses the same vlan since it should have been already released
- After the first test is done, the clean up will delete the whole VPC, also releasing the VLAN that was in use.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6d9a3d82
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6d9a3d82
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6d9a3d82
Branch: refs/heads/master
Commit: 6d9a3d82f9b617d40d0ee1472bef87cb630595d6
Parents: a17fa48
Author: Wilder Rodrigues <wr...@schubergphilis.com>
Authored: Wed Dec 2 07:30:06 2015 +0100
Committer: Wilder Rodrigues <wr...@schubergphilis.com>
Committed: Wed Dec 2 10:36:53 2015 +0100
----------------------------------------------------------------------
.../network/router/VirtualNetworkApplianceManagerImpl.java | 7 ++++---
systemvm/patches/debian/config/opt/cloud/bin/configure.py | 2 +-
test/integration/smoke/test_privategw_acl.py | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d9a3d82/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 4f3a2b8..ca1f67d 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2417,9 +2417,10 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
for (final Nic routerNic : routerNics) {
final Network network = _networkModel.getNetwork(routerNic.getNetworkId());
// Send network usage command for public nic in VPC VR
- // Send network usage command for isolated guest nic of non VPC VR
- if (network != null && (forVpc && network.getTrafficType() == TrafficType.Public || !forVpc && network.getTrafficType() == TrafficType.Guest
- && network.getGuestType() == Network.GuestType.Isolated)) {
+ // Send network usage command for isolated guest nic of non VPC
+ // VR
+ if (forVpc && network.getTrafficType() == TrafficType.Public || !forVpc && network.getTrafficType() == TrafficType.Guest
+ && network.getGuestType() == Network.GuestType.Isolated) {
final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getHostName(), forVpc, routerNic.getIPv4Address());
final String routerType = router.getType().toString();
final UserStatisticsVO previousStats = _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), network.getId(),
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d9a3d82/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
index 0a19607..deb4a74 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -956,7 +956,7 @@ def main(argv):
logging.debug("Configuring iptables rules")
nf = CsNetfilters()
nf.compare(config.get_fw())
-
+
red = CsRedundant(config)
red.set()
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d9a3d82/test/integration/smoke/test_privategw_acl.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_privategw_acl.py b/test/integration/smoke/test_privategw_acl.py
index 22b3fa7..9b85fe8 100644
--- a/test/integration/smoke/test_privategw_acl.py
+++ b/test/integration/smoke/test_privategw_acl.py
@@ -237,7 +237,7 @@ class TestPrivateGwACL(cloudstackTestCase):
acl = self.createACL(vpc)
self.createACLItem(acl.id)
self.createNetwork(vpc)
- privateGw = self.createPvtGw(vpc, "10.0.3.99", acl.id, vlan_1)
+ privateGw = self.createPvtGw(vpc, "10.0.3.99", "10.0.3.100", acl.id, vlan_1)
self.replacePvtGwACL(acl.id, privateGw.id)
@attr(tags=["advanced"], required_hardware="true")
@@ -280,7 +280,7 @@ class TestPrivateGwACL(cloudstackTestCase):
self.fail("No Physical Networks found!")
vlans = physical_networks[0].vlan.split('-')
- vlan_1 = int(vlans[0]) + 1
+ vlan_1 = int(vlans[0])
network_1 = self.createNetwork(vpc_1, gateway = '10.0.1.1')
network_2 = self.createNetwork(vpc_2, gateway = '10.0.2.1')