cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [23/50] git commit: updated refs/heads/saml2 to 09da909
Date Sat, 16 Aug 2014 10:55:54 GMT
CLOUDSTACK-7329: Fixed issues in test_region_vpc.py

Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/525ee4a4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/525ee4a4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/525ee4a4

Branch: refs/heads/saml2
Commit: 525ee4a4aada2aa90bf53b301151f20111788e65
Parents: 6a4a11e
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Wed Aug 13 16:32:24 2014 +0530
Committer: Santhosh Edukulla <santhosh.edukulla@gmail.com>
Committed: Wed Aug 13 17:10:48 2014 +0530

----------------------------------------------------------------------
 test/integration/component/test_region_vpc.py | 81 ++++++++++++++++------
 1 file changed, 61 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/525ee4a4/test/integration/component/test_region_vpc.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_region_vpc.py b/test/integration/component/test_region_vpc.py
index e348065..6866e48 100644
--- a/test/integration/component/test_region_vpc.py
+++ b/test/integration/component/test_region_vpc.py
@@ -19,15 +19,27 @@ import unittest
 """ Component tests for region level VPC functionality
 """
 #Import Local Modules
-import marvin
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from marvin.sshClient import SshClient
-import datetime
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.lib.utils import cleanup_resources, validateList
+from marvin.lib.base import (VPC,
+                             VpcOffering,
+                             ServiceOffering,
+                             PhysicalNetwork,
+                             Account,
+                             NetworkOffering,
+                             Network,
+                             VirtualMachine,
+                             NetworkServiceProvider,
+                             PublicIPAddress,
+                             LoadBalancerRule,
+                             NATRule,
+                             NetworkACL,
+                             StaticNATRule)
+from marvin.lib.common import (get_domain,
+                               get_zone,
+                               get_template)
+from marvin.codes import FAILED, PASS
 
 
 class Services:
@@ -161,7 +173,7 @@ class TestRegionVpcOffering(cloudstackTestCase):
     def setUpClass(cls):
         testClient = super(TestRegionVpcOffering, cls).getClsTestClient()
         cls.apiclient = testClient.getApiClient()
-        cls.services = testClient.getParsedTestDataConfig()
+        cls.services = Services().services
 
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.apiclient)
@@ -185,9 +197,30 @@ class TestRegionVpcOffering(cloudstackTestCase):
                                             cls.apiclient,
                                             cls.services["service_offering"]
                                             )
-        cls._cleanup = [
-                        cls.service_offering,
-                        ]
+        cls._cleanup = [cls.service_offering, ]
+
+        try:
+            list_physical_networks = PhysicalNetwork.list(
+                                                     cls.apiclient,
+                                                     zoneid=cls.zone.id
+                                                     )
+            assert validateList(list_physical_networks)[0] == PASS,\
+                "physical networks list validation failed"
+
+            cls.isOvsPluginEnabled = False
+            for i in range(0, len(list_physical_networks)):
+                list_network_serviceprovider = NetworkServiceProvider.list(
+                                                                       cls.apiclient,
+                                                                       physicalnetworkid=list_physical_networks[i].id
+                                                                       )
+                for j in range(0, len(list_network_serviceprovider)):
+                    if((str(list_network_serviceprovider[j].name).lower() == 'ovs') and
+                        (str(list_network_serviceprovider[j].state).lower() == 'enabled')):
+                        cls.isOvsPluginEnabled = True
+                        break
+        except Exception as e:
+            cls.tearDownClass()
+            raise unittest.SkipTest(e)
         return
 
     @classmethod
@@ -243,7 +276,7 @@ class TestRegionVpcOffering(cloudstackTestCase):
                 "Name of the VPC offering should match with listVPCOff data"
                 )
         self.assertEqual(
-                 vpc_offs[0].regionlevelvpc,True,
+                 vpc_offs[0].supportsregionLevelvpc,True,
                  "VPC offering is not set up for region level VPC"
                 )
         self.debug(
@@ -301,6 +334,9 @@ class TestRegionVpcOffering(cloudstackTestCase):
         # 1. Create VPC Offering by specifying all supported Services
         # 2. VPC offering should be created successfully.
 
+        if not self.isOvsPluginEnabled:
+            self.skipTest("OVS plugin should be enabled to run this test case")
+
         self.debug("Creating inter VPC offering")
         vpc_off = VpcOffering.create(
                                      self.apiclient,
@@ -313,7 +349,8 @@ class TestRegionVpcOffering(cloudstackTestCase):
                          vpcofferingid=vpc_off.id,
                          zoneid=self.zone.id,
                          account=self.account.name,
-                         domainid=self.account.domainid
+                         domainid=self.account.domainid,
+                         networkDomain=self.account.domainid
                          )
         self.assertEqual(vpc.distributedvpcrouter, True, "VPC created should have 'distributedvpcrouter'
set to True")
 
@@ -340,6 +377,9 @@ class TestRegionVpcOffering(cloudstackTestCase):
         # 9. Create Egress Network ACL for this network to access google.com.
         # 10. Enable VPN services
 
+        if not self.isOvsPluginEnabled:
+            self.skipTest("OVS plugin should be enabled to run this test case")
+
         self.debug("Creating a VPC offering..")
         vpc_off = VpcOffering.create(
                                      self.apiclient,
@@ -356,7 +396,8 @@ class TestRegionVpcOffering(cloudstackTestCase):
                          vpcofferingid=vpc_off.id,
                          zoneid=self.zone.id,
                          account=self.account.name,
-                         domainid=self.account.domainid
+                         domainid=self.account.domainid,
+                         networkDomain=self.account.domainid
                          )
         self.validate_vpc_network(vpc)
 
@@ -415,7 +456,7 @@ class TestRegionVpcOffering(cloudstackTestCase):
         self.debug("Creating LB rule for IP address: %s" %
                                         public_ip.ipaddress.ipaddress)
 
-        lb_rule = LoadBalancerRule.create(
+        LoadBalancerRule.create(
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=public_ip.ipaddress.id,
@@ -439,7 +480,7 @@ class TestRegionVpcOffering(cloudstackTestCase):
                                         network.id
                                         ))
 
-        nat_rule = NATRule.create(
+        NATRule.create(
                                   self.apiclient,
                                   virtual_machine,
                                   self.services["natrule"],
@@ -450,14 +491,14 @@ class TestRegionVpcOffering(cloudstackTestCase):
                                   )
 
         self.debug("Adding NetwrokACl rules to make PF and LB accessible")
-        networkacl_1 = NetworkACL.create(
+        NetworkACL.create(
                 self.apiclient,
                 networkid=network.id,
                 services=self.services["natrule"],
                 traffictype='Ingress'
                 )
 
-        networkacl_2 = NetworkACL.create(
+        NetworkACL.create(
                                 self.apiclient,
                                 networkid=network.id,
                                 services=self.services["lbrule"],
@@ -520,4 +561,4 @@ class TestRegionVpcOffering(cloudstackTestCase):
                          "List public Ip for network should list the Ip addr"
                          )
         # TODO: Remote Access VPN is not yet supported in VPC
-        return
\ No newline at end of file
+        return


Mime
View raw message