cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/marvin to ca67e25
Date Fri, 11 Apr 2014 06:14:38 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/marvin 94fc4bf6b -> ca67e25f2


CLOUDSTACK-6316: fixed test data and their references in the test files and few more fixes
in tests


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

Branch: refs/heads/marvin
Commit: ca67e25f2399d4c2bb7b7fde30616f6acf683f16
Parents: 94fc4bf
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Fri Apr 11 11:43:38 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Fri Apr 11 11:43:38 2014 +0530

----------------------------------------------------------------------
 .../component/test_ip_reservation.py            | 10 ++++-----
 .../component/test_persistent_networks.py       |  4 ++--
 test/integration/component/test_portable_ip.py  |  2 +-
 test/integration/component/test_region_vpc.py   |  4 ++--
 .../test_vpc_distributed_routing_offering.py    |  4 ++--
 tools/marvin/marvin/config/test_data.py         | 22 ++++++++++++++++++++
 6 files changed, 34 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca67e25f/test/integration/component/test_ip_reservation.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_ip_reservation.py b/test/integration/component/test_ip_reservation.py
index 7a82076..ed2cb78 100644
--- a/test/integration/component/test_ip_reservation.py
+++ b/test/integration/component/test_ip_reservation.py
@@ -84,7 +84,7 @@ class TestIpReservation(cloudstackTestCase):
         cls.api_client = cls.testClient.getApiClient()
 
         # Fill services from the external config file
-        cls.services = cls.testClient.getParsedTestDataConfig()
+        cls.testData = cls.testClient.getParsedTestDataConfig()
 
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.api_client)
@@ -532,7 +532,7 @@ class TestRestartNetwork(cloudstackTestCase):
         cls.api_client = cls.testClient.getApiClient()
 
         # Fill services from the external config file
-        cls.services = cls.testClient.getParsedTestDataConfig()
+        cls.testData = cls.testClient.getParsedTestDataConfig()
 
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.api_client)
@@ -657,7 +657,7 @@ class TestUpdateIPReservation(cloudstackTestCase):
         cls.api_client = cls.testClient.getApiClient()
 
         # Fill services from the external config file
-        cls.services = cls.testClient.getParsedTestDataConfig()
+        cls.testData = cls.testClient.getParsedTestDataConfig()
 
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.api_client)
@@ -807,7 +807,7 @@ class TestRouterOperations(cloudstackTestCase):
         cls.api_client = cls.testClient.getApiClient()
 
         # Fill services from the external config file
-        cls.services = cls.testClient.getParsedTestDataConfig()
+        cls.testData = cls.testClient.getParsedTestDataConfig()
 
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.api_client)
@@ -977,7 +977,7 @@ class TestFailureScnarios(cloudstackTestCase):
         cls.api_client = cls.testClient.getApiClient()
 
         # Fill services from the external config file
-        cls.services = cls.testClient.getParsedTestDataConfig()
+        cls.testData = cls.testClient.getParsedTestDataConfig()
 
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.api_client)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca67e25f/test/integration/component/test_persistent_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_persistent_networks.py b/test/integration/component/test_persistent_networks.py
index b5b4bd4..deb0d6e 100644
--- a/test/integration/component/test_persistent_networks.py
+++ b/test/integration/component/test_persistent_networks.py
@@ -57,7 +57,7 @@ class TestPersistentNetworks(cloudstackTestCase):
         cls.services["virtual_machine"]["template"] = cls.template.id
         cls.service_offering = ServiceOffering.create(
                                             cls.api_client,
-                                            cls.services["service_offerings"]["small"]
+                                            cls.services["service_offering"]
                                             )
         cls.isolated_persistent_network_offering = cls.createNetworkOffering("nw_off_isolated_persistent")
         cls.isolated_persistent_network_offering_netscaler = cls.createNetworkOffering("nw_off_isolated_persistent_netscaler")
@@ -1514,7 +1514,7 @@ class TestVPCNetworkOperations(cloudstackTestCase):
         cls.services["virtual_machine"]["template"] = cls.template.id
         cls.service_offering = ServiceOffering.create(
                                             cls.api_client,
-                                            cls.services["service_offering"]
+                                            cls.services["service_offerings"]["small"]
                                             )
         cls.persistent_network_offering_NoLB = NetworkOffering.create(cls.api_client, cls.services["nw_off_persistent_VPCVR_NoLB"],
                                                                        conservemode=False)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca67e25f/test/integration/component/test_portable_ip.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_portable_ip.py b/test/integration/component/test_portable_ip.py
index 4c67dac..61268eb 100644
--- a/test/integration/component/test_portable_ip.py
+++ b/test/integration/component/test_portable_ip.py
@@ -653,7 +653,7 @@ class TestAssociatePublicIp(cloudstackTestCase):
 
         self.cleanup = []
 
-        portable_ip_range_services = self.services["PortableIpRange"]
+        portable_ip_range_services = self.services["portableIpRange"]
 
         if portable_ip_range_services is None:
             self.skipTest('Failed to read config values related to portable ip range')

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca67e25f/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 43f1fed..09f350a 100644
--- a/test/integration/component/test_region_vpc.py
+++ b/test/integration/component/test_region_vpc.py
@@ -182,7 +182,7 @@ class TestRegionVpcOffering(cloudstackTestCase):
         cls.services["virtual_machine"]["template"] = cls.template.id
 
         cls.service_offering = ServiceOffering.create(
-                                            cls.api_client,
+                                            cls.apiclient,
                                             cls.services["service_offering"]
                                             )
         cls._cleanup = [
@@ -194,7 +194,7 @@ class TestRegionVpcOffering(cloudstackTestCase):
     def tearDownClass(cls):
         try:
             #Cleanup resources used
-            cleanup_resources(cls.api_client, cls._cleanup)
+            cleanup_resources(cls.apiclient, cls._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca67e25f/test/integration/component/test_vpc_distributed_routing_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_distributed_routing_offering.py b/test/integration/component/test_vpc_distributed_routing_offering.py
index 28ddd4b..7bf7d46 100644
--- a/test/integration/component/test_vpc_distributed_routing_offering.py
+++ b/test/integration/component/test_vpc_distributed_routing_offering.py
@@ -174,7 +174,7 @@ class TestVPCDistributedRouterOffering(cloudstackTestCase):
         cls.services["virtual_machine"]["template"] = cls.template.id
 
         cls.service_offering = ServiceOffering.create(
-                                            cls.api_client,
+                                            cls.apiclient,
                                             cls.services["service_offering"]
                                             )
         cls._cleanup = [
@@ -186,7 +186,7 @@ class TestVPCDistributedRouterOffering(cloudstackTestCase):
     def tearDownClass(cls):
         try:
             #Cleanup resources used
-            cleanup_resources(cls.api_client, cls._cleanup)
+            cleanup_resources(cls.apiclient, cls._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca67e25f/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 080d537..160b055 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -47,6 +47,13 @@ test_data = {
             "publicport": 22,
             "protocol": 'TCP',
         },
+       "service_offering": {
+            "name": "Tiny Instance",
+            "displaytext": "Tiny Instance",
+            "cpunumber": 1,
+            "cpuspeed": 100,    # in MHz
+            "memory": 128,    # In MBs
+       },
         "service_offerings": {
             "name": "Tiny Instance",
             "displaytext": "Tiny Instance",
@@ -122,6 +129,21 @@ test_data = {
                 "PortForwarding": 'VirtualRouter',
             },
         },
+        "nw_off_isolated_persistent":{
+            "name": 'Test Nw off isolated persistent',
+            "displaytext": 'Test Nw off isolated persistent',
+            "guestiptype": 'Isolated',
+            "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding',
+            "traffictype": 'GUEST',
+            "isPersistent":'True',
+            "availability": 'Optional',
+            "serviceProviderList" : {
+                "Dhcp": 'VirtualRouter',
+                "Dns": 'VirtualRouter',
+                "SourceNat": 'VirtualRouter',
+                "PortForwarding": 'VirtualRouter',
+            },
+        },
         "isolated_network_offering": {
             "name": "Network offering-DA services",
             "displaytext": "Network offering-DA services",


Mime
View raw message