cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmaxi...@apache.org
Subject [cloudstack] 01/01: Merge pull request #2004 from nuagenetworks/feature/vr_without_public_ip
Date Thu, 02 Nov 2017 10:56:11 GMT
This is an automated email from the ASF dual-hosted git repository.

fmaximus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit d077b3efc67ddc7855bd2e425c2d6cb355de5cff
Merge: 2139dbe 1d382e0
Author: Frank Maximus <the.evergreen@gmail.com>
AuthorDate: Thu Nov 2 11:56:05 2017 +0100

    Merge pull request #2004 from nuagenetworks/feature/vr_without_public_ip
    
    CLOUDSTACK-9832: Do not assign public IP NIC to the VPC VR when the VPC offering does
not contain VpcVirtualRouter as a SourceNat provider

 .../service/NetworkOrchestrationService.java       |  5 ++
 .../src/com/cloud/network/vpc/VpcManager.java      |  7 ++
 .../cloud/network/router/VpcNetworkHelperImpl.java | 77 +++++++++++--------
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  | 33 ++------
 .../deployment/VpcRouterDeploymentDefinition.java  | 14 ++--
 .../VpcRouterDeploymentDefinitionTest.java         | 26 ++++++-
 test/integration/plugins/nuagevsp/nuageTestCase.py | 32 +++++++-
 .../plugins/nuagevsp/test_nuage_static_nat.py      | 89 +++++++++++++++++++++-
 .../plugins/nuagevsp/test_nuage_vpc_internal_lb.py | 81 +++++++++++++++-----
 .../plugins/nuagevsp/test_nuage_vpc_network.py     | 13 +++-
 .../integration/plugins/nuagevsp/test_nuage_vsp.py | 11 ++-
 11 files changed, 292 insertions(+), 96 deletions(-)

diff --cc test/integration/plugins/nuagevsp/test_nuage_static_nat.py
index ef4611f,74d3a5d..9d168e9
--- a/test/integration/plugins/nuagevsp/test_nuage_static_nat.py
+++ b/test/integration/plugins/nuagevsp/test_nuage_static_nat.py
@@@ -162,31 -165,30 +165,31 @@@ class TestNuageStaticNat(nuageTestCase)
              except Exception as e:
                  self.debug("Failed to wget from VM - %s" % e)
                  self.debug("Retrying wget from VM after some time...")
-                 time.sleep(60)
+                 time.sleep(5)
                  tries += 1
  
 -        if not filename and not headers:
 -            if non_default_nic:
 -                self.debug("Failed to wget from VM via this NIC as it is not "
 -                           "the default NIC")
 -            else:
 -                self.fail("Failed to wget from VM")
 -
 -        # Removing Ingress Firewall/Network ACL rule
 -        self.debug("Removing the created Ingress Firewall/Network ACL "
 -                   "rule in the network...")
 -        public_http_rule.delete(self.api_client)
 +        try:
 +            if not filename and not headers:
 +                if non_default_nic:
 +                    self.debug("Failed to wget from VM via this NIC as it "
 +                               "is not the default NIC")
 +                else:
 +                    self.fail("Failed to wget from VM")
 +        finally:
 +            # Removing Ingress Firewall/Network ACL rule
 +            self.debug("Removing the created Ingress Firewall/Network ACL "
 +                       "rule in the network...")
 +            public_http_rule.delete(self.api_client)
  
 -        # VSD verification
 -        with self.assertRaises(Exception):
 -            self.verify_vsd_firewall_rule(public_http_rule)
 -        self.debug("Ingress Firewall/Network ACL rule successfully "
 -                   "deleted in VSD")
 +            # VSD verification
 +            with self.assertRaises(Exception):
 +                self.verify_vsd_firewall_rule(public_http_rule)
 +            self.debug("Ingress Firewall/Network ACL rule successfully "
 +                       "deleted in VSD")
  
 -        self.debug("Successfully verified Static NAT traffic by performing "
 -                   "wget traffic test with the given Static NAT enabled "
 -                   "public IP - %s" % public_ip)
 +            self.debug("Successfully verified Static NAT traffic by "
 +                       "performing wget traffic test with the given Static "
 +                       "NAT enabled public IP - %s" % public_ip)
  
      # wget_from_internet - From within the given VM (ssh client),
      # fetches index.html file of an Internet web server, wget www.google.com

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>.

Mime
View raw message