diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 4f3a2b8b99d..ca1f67dbb69 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 { 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(), diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py index 0a19607243b..deb4a74e042 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() diff --git a/test/integration/smoke/test_privategw_acl.py b/test/integration/smoke/test_privategw_acl.py index 22b3fa7de1f..9b85fe8732d 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')