Change tests file

Author: Henrique Sato

.github/workflows/ci.yml

@@ -140,7 +140,8 @@ jobs:
                   smoke/test_vpc_ipv6
                   smoke/test_vpc_redundant
                   smoke/test_vpc_router_nics
-                  smoke/test_vpc_vpn",
+                  smoke/test_vpc_vpn
+                  smoke/test_vpc_hypervisor_max_networks",
                 "component/find_hosts_for_migration
                   component/test_acl_isolatednetwork
                   component/test_acl_isolatednetwork_delete

test/integration/component/test_vpc_network.py

@@ -34,12 +34,7 @@
                              LoadBalancerRule,
                              Router,
                              StaticNATRule,
-                             NetworkACL,
-                             PublicIPAddress,
-                             Host,
-                             Cluster,
-                             Configurations,
-                             Resources)
+                             NetworkACL)
 from marvin.lib.common import (get_zone,
                                get_domain,
                                get_template,
@@ -191,8 +186,6 @@ def __init__(self):
                 "name": "Test Network",
                 "displaytext": "Test Network",
                 "netmask": '255.255.255.0',
-                # Max networks allowed per hypervisor: Xenserver -> 7, VMWare -> 10 & KVM -> 27
-                "limit": 5,
             },
             "lbrule": {
                 "name": "SSH",
@@ -2761,307 +2754,3 @@ def test_stop_start_vpc_router(self):
         if (exceptionOccurred or (not isRouterInDesiredState)):
             self.fail(exceptionMessage)
         return
-
-
-class TestVPCNetworkHypervisorLimit(cloudstackTestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.testClient = super(TestVPCNetworkHypervisorLimit, cls).getClsTestClient()
-        cls.api_client = cls.testClient.getApiClient()
-
-        cls.services = Services().services
-
-        cls.domain = get_domain(cls.api_client)
-        cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
-
-        cls._cleanup = []
-
-        return
-
-    def setUp(self):
-        self.apiclient = self.testClient.getApiClient()
-        self.dbclient = self.testClient.getDbConnection()
-        self.account = Account.create(
-            self.apiclient,
-            self.services["account"],
-            admin=True,
-            domainid=self.domain.id
-        )
-        self.cleanup = [self.account]
-
-        return
-
-    @classmethod
-    def tearDownClass(cls):
-        super(TestVPCNetworkHypervisorLimit, cls).tearDownClass()
-
-    def tearDown(self):
-        super(TestVPCNetworkHypervisorLimit, self).tearDown()
-
-    def validate_vpc_network(self, network, state=None):
-        """Validates the VPC network"""
-
-        self.debug("Checking if the VPC network was created successfully.")
-        vpc_networks = VPC.list(
-            self.apiclient,
-            id=network.id
-        )
-        self.assertEqual(
-            isinstance(vpc_networks, list),
-            True,
-            "List VPC network should return a valid list"
-        )
-        self.assertEqual(
-            network.name,
-            vpc_networks[0].name,
-            "Name of the VPC network should match with listVPC data"
-        )
-        if state:
-            self.assertEqual(
-                vpc_networks[0].state,
-                state,
-                "VPC state should be '%s'" % state
-            )
-        self.debug("VPC network validated - %s" % network.name)
-
-        return
-
-    def validate_vpc_offering(self, vpc_offering):
-        """Validates the VPC offering"""
-
-        self.debug("Checking if the VPC offering was created successfully.")
-        vpc_offs = VpcOffering.list(
-            self.apiclient,
-            id=vpc_offering.id
-        )
-        self.assertEqual(
-            isinstance(vpc_offs, list),
-            True,
-            "List VPC offerings should return a valid list"
-        )
-        self.assertEqual(
-            vpc_offering.name,
-            vpc_offs[0].name,
-            "Name of the VPC offering should match with listVPCOff data"
-        )
-        self.debug("VPC offering was created successfully - %s" % vpc_offering.name)
-
-        return
-
-    def create_network_max_limit_hypervisor_test(self, hypervisor):
-        Configurations.update(
-            self.apiclient,
-            accountid=self.account.id,
-            name="vpc.max.networks",
-            value=30
-        )
-
-        self.debug("Creating a VPC offering.")
-        vpc_off = VpcOffering.create(
-            self.apiclient,
-            self.services["vpc_offering"]
-        )
-
-        self._cleanup.append(vpc_off)
-        self.validate_vpc_offering(vpc_off)
-
-        self.debug("Enabling the VPC offering.")
-        vpc_off.update(self.apiclient, state='Enabled')
-
-        self.debug("Creating a VPC network in the account: %s" % self.account.name)
-        self.services["vpc"]["cidr"] = '10.1.1.1/16'
-        vpc = VPC.create(
-            self.apiclient,
-            self.services["vpc"],
-            vpcofferingid=vpc_off.id,
-            zoneid=self.zone.id,
-            account=self.account.name,
-            domainid=self.account.domainid
-        )
-        self.validate_vpc_network(vpc)
-
-        vpc_router = Router.list(
-            self.apiclient,
-            vpcId=vpc.id,
-            listAll=True
-        )[0]
-
-        host = Host.list(
-            self.apiclient,
-            id=vpc_router.hostId
-        )[0]
-
-        cluster = Cluster.list(
-            self.apiclient,
-            id=host.clusterId
-        )[0]
-
-        cluster_old_hypervisor_type = cluster.hypervisortype
-
-        self.debug("Updating cluster %s hypervisor from %s to %s." %
-                   (cluster.name, cluster_old_hypervisor_type, hypervisor))
-        Cluster.update(
-            self.apiclient,
-            id=cluster.id,
-            hypervisor=hypervisor
-        )
-
-        network_offering = NetworkOffering.create(
-            self.apiclient,
-            self.services["network_offering"],
-            conservemode=False
-        )
-        # Enable Network offering
-        self._cleanup.append(network_offering)
-        network_offering.update(self.apiclient, state='Enabled')
-
-        # Empty list to store all networks
-        networks = []
-
-        # Creating network using the network offering created
-        self.debug("Creating network with network offering: %s." % network_offering.id)
-        network_1 = Network.create(
-            self.apiclient,
-            self.services["network"],
-            accountid=self.account.name,
-            domainid=self.account.domainid,
-            networkofferingid=network_offering.id,
-            zoneid=self.zone.id,
-            gateway='10.1.0.1',
-            vpcid=vpc.id
-        )
-
-        self.debug("Created network with ID: %s." % network_1.id)
-
-        config_name = "virtual.machine.max.nics.%s" % hypervisor.lower()
-
-        configs = Configurations.list(
-            self.apiclient,
-            name=config_name,
-            listall=True
-        )
-        if not isinstance(configs, list):
-            raise Exception("Failed to find %s virtual machine max NICs." % hypervisor)
-
-        self.services["network"]["limit"] = int(configs[0].value)
-
-        self.debug("Updating network resource limit for account %s with value %s." % (
-            self.account.name, self.services["network"]["limit"]))
-        Resources.updateLimit(
-            self.apiclient,
-            resourcetype=6,
-            account=self.account.name,
-            domainid=self.domain.id,
-            max=self.services["network"]["limit"]
-        )
-
-        # Create networks till max limit of hypervisor
-        for i in range(self.services["network"]["limit"] - 3):
-            # Creating network using the network offering created
-            self.debug("Creating network with network offering: %s." %
-                       network_offering.id)
-            gateway = '10.1.' + str(i + 1) + '.1'
-            self.debug("Gateway for new network: %s." % gateway)
-
-            network = Network.create(
-                self.apiclient,
-                self.services["network"],
-                accountid=self.account.name,
-                domainid=self.account.domainid,
-                networkofferingid=network_offering.id,
-                zoneid=self.zone.id,
-                gateway=gateway,
-                vpcid=vpc.id
-            )
-            self.debug("Created network with ID: %s." % network.id)
-            networks.append(network)
-
-        self.debug(
-            "Trying to create one more network than %s hypervisor limit in VPC: %s." % (hypervisor, vpc.name))
-        gateway = '10.1.' + str(self.services["network"]["limit"]) + '.1'
-
-        with self.assertRaises(Exception):
-            Network.create(
-                self.apiclient,
-                self.services["network"],
-                accountid=self.account.name,
-                domainid=self.account.domainid,
-                networkofferingid=network_offering.id,
-                zoneid=self.zone.id,
-                gateway=gateway,
-                vpcid=vpc.id
-            )
-
-        self.debug("Deleting one of the existing networks.")
-        try:
-            network_1.delete(self.apiclient)
-        except Exception as e:
-            self.fail("Failed to delete network: %s - %s." %
-                      (network_1.name, e))
-
-        self.debug("Creating a new network in VPC: %s." % vpc.name)
-        network = Network.create(
-            self.apiclient,
-            self.services["network"],
-            accountid=self.account.name,
-            domainid=self.account.domainid,
-            networkofferingid=network_offering.id,
-            zoneid=self.zone.id,
-            gateway=gateway,
-            vpcid=vpc.id
-        )
-        self.debug("Created a new network: %s." % network.name)
-        networks.append(network)
-
-        self.debug(
-            "Updating cluster %s hypervisor to its old hypervisor %s." % (cluster.name, cluster_old_hypervisor_type))
-        Cluster.update(
-            self.apiclient,
-            id=cluster.id,
-            hypervisor=cluster_old_hypervisor_type
-        )
-
-        return
-
-    @attr(tags=["advanced", "intervlan"], required_hardware="true")
-    def test_01_create_network_max_limit_xenserver(self):
-        """ Test create networks in VPC up to maximum limit for XenServer hypervisor.
-        """
-
-        # Validate the following
-        # 1. Create a VPC and add maximum # of supported networks to the VPC;
-        # 2. After reaching the maximum networks, adding another network to the VPC must raise an exception;
-        # 3. Delete a network from VPC;
-        # 4. Add a new network to the VPC.
-
-        self.create_network_max_limit_hypervisor_test("XenServer")
-        return
-
-    @attr(tags=["advanced", "intervlan"], required_hardware="true")
-    def test_02_create_network_max_limit_vmware(self):
-        """ Test create networks in VPC up to maximum limit for VMware hypervisor.
-        """
-
-        # Validate the following
-        # 1. Create a VPC and add maximum # of supported networks to the VPC;
-        # 2. After reaching the maximum networks, adding another network to the VPC must raise an exception;
-        # 3. Delete a network from VPC;
-        # 4. Add a new network to the VPC.
-
-        self.create_network_max_limit_hypervisor_test("VMware")
-        return
-
-    @attr(tags=["advanced", "intervlan"], required_hardware="true")
-    def test_03_create_network_max_limit_kvm(self):
-        """ Test create networks in VPC up to maximum limit for KVM hypervisor.
-        """
-
-        # Validate the following
-        # 1. Create a VPC and add maximum # of supported networks to the VPC;
-        # 2. After reaching the maximum networks, adding another network to the VPC must raise an exception;
-        # 3. Delete a network from VPC;
-        # 4. Add a new network to the VPC.
-
-        self.create_network_max_limit_hypervisor_test("KVM")
-        return