cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From miguelaferreira <...@git.apache.org>
Subject [GitHub] cloudstack pull request: CLOUDSTACK-8759 - Destroying VPC router r...
Date Thu, 03 Sep 2015 13:00:19 GMT
Github user miguelaferreira commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/773#discussion_r38642313
  
    --- Diff: test/integration/component/test_vpc_router_nics.py ---
    @@ -0,0 +1,449 @@
    +# Licensed to the Apache Software Foundation (ASF) under one
    +# or more contributor license agreements.  See the NOTICE file
    +# distributed with this work for additional information
    +# regarding copyright ownership.  The ASF licenses this file
    +# to you under the Apache License, Version 2.0 (the
    +# "License"); you may not use this file except in compliance
    +# with the License.  You may obtain a copy of the License at
    +#
    +#   http://www.apache.org/licenses/LICENSE-2.0
    +#
    +# Unless required by applicable law or agreed to in writing,
    +# software distributed under the License is distributed on an
    +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
    +# KIND, either express or implied.  See the License for the
    +# specific language governing permissions and limitations
    +# under the License.
    +
    +""" Test VPC nics after router is destroyed """
    +
    +from nose.plugins.attrib import attr
    +from marvin.cloudstackTestCase import cloudstackTestCase
    +from marvin.lib.base import (stopRouter,
    +                             startRouter,
    +                             destroyRouter,
    +                             Account,
    +                             VpcOffering,
    +                             VPC,
    +                             ServiceOffering,
    +                             NATRule,
    +                             NetworkACL,
    +                             PublicIPAddress,
    +                             NetworkOffering,
    +                             Network,
    +                             VirtualMachine,
    +                             LoadBalancerRule)
    +from marvin.lib.common import (get_domain,
    +                               get_zone,
    +                               get_template,
    +                               list_routers)
    +from marvin.lib.utils import cleanup_resources
    +import socket
    +import time
    +import inspect
    +
    +
    +class Services:
    +    """Test VPC network services - Port Forwarding Rules Test Data Class.
    +    """
    +
    +    def __init__(self):
    +        self.services = {
    +            "account": {
    +                "email": "test@test.com",
    +                "firstname": "Test",
    +                "lastname": "User",
    +                "username": "test",
    +                # Random characters are appended for unique
    +                # username
    +                "password": "password",
    +            },
    +            "service_offering": {
    +                "name": "Tiny Instance",
    +                "displaytext": "Tiny Instance",
    +                "cpunumber": 1,
    +                "cpuspeed": 100,
    +                "memory": 128,
    +            },
    +            "network_offering": {
    +                "name": 'VPC Network offering',
    +                "displaytext": 'VPC Network off',
    +                "guestiptype": 'Isolated',
    +                "supportedservices": 'Vpn,Dhcp,Dns,SourceNat,PortForwarding,Lb,UserData,StaticNat,NetworkACL',
    +                "traffictype": 'GUEST',
    +                "availability": 'Optional',
    +                "useVpc": 'on',
    +                "serviceProviderList": {
    +                    "Vpn": 'VpcVirtualRouter',
    +                    "Dhcp": 'VpcVirtualRouter',
    +                    "Dns": 'VpcVirtualRouter',
    +                    "SourceNat": 'VpcVirtualRouter',
    +                    "PortForwarding": 'VpcVirtualRouter',
    +                    "Lb": 'VpcVirtualRouter',
    +                    "UserData": 'VpcVirtualRouter',
    +                    "StaticNat": 'VpcVirtualRouter',
    +                    "NetworkACL": 'VpcVirtualRouter'
    +                },
    +            },
    +            "network_offering_no_lb": {
    +                "name": 'VPC Network offering',
    +                "displaytext": 'VPC Network off',
    +                "guestiptype": 'Isolated',
    +                "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding,UserData,StaticNat,NetworkACL',
    +                "traffictype": 'GUEST',
    +                "availability": 'Optional',
    +                "useVpc": 'on',
    +                "serviceProviderList": {
    +                    "Dhcp": 'VpcVirtualRouter',
    +                    "Dns": 'VpcVirtualRouter',
    +                    "SourceNat": 'VpcVirtualRouter',
    +                    "PortForwarding": 'VpcVirtualRouter',
    +                    "UserData": 'VpcVirtualRouter',
    +                    "StaticNat": 'VpcVirtualRouter',
    +                    "NetworkACL": 'VpcVirtualRouter'
    +                },
    +            },
    +            "vpc_offering": {
    +                "name": 'VPC off',
    +                "displaytext": 'VPC off',
    +                "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat',
    +            },
    +            "vpc": {
    +                "name": "TestVPC",
    +                "displaytext": "TestVPC",
    +                "cidr": '10.0.0.1/24'
    +            },
    +            "network": {
    +                "name": "Test Network",
    +                "displaytext": "Test Network",
    +                "netmask": '255.255.255.0'
    +            },
    +            "lbrule": {
    +                "name": "SSH",
    +                "alg": "leastconn",
    +                # Algorithm used for load balancing
    +                "privateport": 22,
    +                "publicport": 2222,
    +                "openfirewall": False,
    +                "startport": 22,
    +                "endport": 2222,
    +                "protocol": "TCP",
    +                "cidrlist": '0.0.0.0/0',
    +            },
    +            "lbrule_http": {
    +                "name": "HTTP",
    +                "alg": "leastconn",
    +                # Algorithm used for load balancing
    +                "privateport": 80,
    +                "publicport": 8888,
    +                "openfirewall": False,
    +                "startport": 80,
    +                "endport": 8888,
    +                "protocol": "TCP",
    +                "cidrlist": '0.0.0.0/0',
    +            },
    +            "natrule": {
    +                "privateport": 22,
    +                "publicport": 22,
    +                "startport": 22,
    +                "endport": 22,
    +                "protocol": "TCP",
    +                "cidrlist": '0.0.0.0/0',
    +            },
    +            "http_rule": {
    +                "privateport": 80,
    +                "publicport": 80,
    +                "startport": 80,
    +                "endport": 80,
    +                "cidrlist": '0.0.0.0/0',
    +                "protocol": "TCP"
    +            },
    +            "virtual_machine": {
    +                "displayname": "Test VM",
    +                "username": "root",
    +                "password": "password",
    +                "ssh_port": 22,
    +                "privateport": 22,
    +                "publicport": 22,
    +                "protocol": 'TCP',
    +            },
    +            "ostype": 'CentOS 5.3 (64-bit)',
    +            "timeout": 10,
    +        }
    +
    +
    +class TestVPCNics(cloudstackTestCase):
    +
    +    @classmethod
    +    def setUpClass(cls):
    +        # We want to fail quicker if it's failure
    +        socket.setdefaulttimeout(60)
    +
    +        cls.testClient = super(TestVPCNics, cls).getClsTestClient()
    +        cls.api_client = cls.testClient.getApiClient()
    +
    +        cls.services = Services().services
    +        # Get Zone, Domain and templates
    +        cls.domain = get_domain(cls.api_client)
    +        cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
    +        cls.template = get_template(
    +            cls.api_client,
    +            cls.zone.id,
    +            cls.services["ostype"])
    +        cls.services["virtual_machine"]["zoneid"] = cls.zone.id
    +        cls.services["virtual_machine"]["template"] = cls.template.id
    +
    +        cls.service_offering = ServiceOffering.create(
    +            cls.api_client,
    +            cls.services["service_offering"])
    +        cls._cleanup = [cls.service_offering]
    +        return
    +
    +    @classmethod
    +    def tearDownClass(cls):
    +        try:
    +            cleanup_resources(cls.api_client, cls._cleanup)
    +        except Exception as e:
    +            raise Exception("Warning: Exception during cleanup : %s" % e)
    +        return
    +
    +    def setUp(self):
    +        self.routers = []
    +        self.networks = []
    +        self.ips = []
    +        self.apiclient = self.testClient.getApiClient()
    +        self.account = Account.create(
    +            self.apiclient,
    +            self.services["account"],
    +            admin=True,
    +            domainid=self.domain.id)
    +
    +        self.cleanup = [self.account]
    +        self.debug("Creating a VPC offering..")
    +        self.vpc_off = VpcOffering.create(
    +            self.apiclient,
    +            self.services["vpc_offering"])
    +
    +        self.debug("Enabling the VPC offering created")
    +        self.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'
    +        self.vpc = VPC.create(
    +            self.apiclient,
    +            self.services["vpc"],
    +            vpcofferingid=self.vpc_off.id,
    +            zoneid=self.zone.id,
    +            account=self.account.name,
    +            domainid=self.account.domainid)
    +        return
    +
    +    def tearDown(self):
    +        try:
    +            cleanup_resources(self.apiclient, self.cleanup)
    +        except Exception as e:
    +            self.debug("Warning: Exception during cleanup : %s" % e)
    +        return
    +
    +    def query_routers(self):
    +        self.routers = list_routers(self.apiclient,
    +                                    account=self.account.name,
    +                                    domainid=self.account.domainid,
    +                                    )
    --- End diff --
    
    My point is that in this file you use two different styles.
    
    This one (with the last ')' in a separate line):
    ```
            self.assertEqual(
                isinstance(router_response, list),
                True,
                "Check list response returns a valid list"
            )
    ```
    
    And this one (with the last ')' inline) as well:
    ```
            self.assertEqual(
                router.hostid, host.id, "Migration to host %s failed. The router host is"
                " still %s" %
                (host.id, router.hostid))
    ```
    
    One way or another is fine as long as it is consistent. Don't you agree?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message