cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject git commit: updated refs/heads/4.4-forward to 4466ed1
Date Sat, 10 May 2014 11:18:46 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward a7dd5aae5 -> 4466ed1ce


Fixing few issues in Multiple IPs test cases


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

Branch: refs/heads/4.4-forward
Commit: 4466ed1ce18fd5391b2b96fa551c171ae7e09723
Parents: a7dd5aa
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Sat May 10 00:26:46 2014 -0400
Committer: girish@clogeny.com <gaurav.aradhye@clogeny.com>
Committed: Sat May 10 00:29:58 2014 -0400

----------------------------------------------------------------------
 .../component/test_multiple_ips_per_nic.py      | 22 +++++++++++---------
 tools/marvin/marvin/config/test_data.py         | 21 +++++++++++++++++++
 2 files changed, 33 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4466ed1c/test/integration/component/test_multiple_ips_per_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py
index 1b1cd82..2db15e5 100644
--- a/test/integration/component/test_multiple_ips_per_nic.py
+++ b/test/integration/component/test_multiple_ips_per_nic.py
@@ -164,11 +164,11 @@ class TestBasicOperations(cloudstackTestCase):
                                             cls.services["service_offering"]
                                             )
         cls._cleanup = [cls.service_offering]
-        cls.services["shared_network_offering"]["specifyVlan"] = "True"
-        cls.services["shared_network_offering"]["specifyIpRanges"] = "True"
+        cls.services["shared_network_offering_all_services"]["specifyVlan"] = "True"
+        cls.services["shared_network_offering_all_services"]["specifyIpRanges"] = "True"
 
         cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client,
-                                                                      cls.services["shared_network_offering"])
+                                                                      cls.services["shared_network_offering_all_services"])
         cls._cleanup.append(cls.shared_network_offering)
         cls.mode = cls.zone.networktype
         if cls.mode.lower() == "advanced":
@@ -464,7 +464,7 @@ class TestBasicOperations(cloudstackTestCase):
         try:
             ipaddress_1 = NIC.addIp(apiclient, id=virtual_machine.nic[0].id)
         except Exception as e:
-            self.fail("Failed while adding secondary IP to NIC of vm %s" % virtual_machine.id)
+            self.fail("Failed while adding secondary IP to NIC of vm %s: %s" % (virtual_machine.id,
e))
 
         try:
             NIC.list(apiclient, virtualmachineid=virtual_machine.id)
@@ -515,10 +515,11 @@ class TestNetworkRules(cloudstackTestCase):
                                             cls.services["service_offering"]
                                             )
         cls._cleanup = [cls.service_offering]
-        cls.services["shared_network_offering"]["specifyVlan"] = "True"
-        cls.services["shared_network_offering"]["specifyIpRanges"] = "True"
+        cls.services["shared_network_offering_all_services"]["specifyVlan"] = "True"
+        cls.services["shared_network_offering_all_services"]["specifyIpRanges"] = "True"
 
-        cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["shared_network_offering"])
+        cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client,
+                                        cls.services["shared_network_offering_all_services"])
         cls._cleanup.append(cls.shared_network_offering)
         cls.mode = cls.zone.networktype
         if cls.mode.lower() == "advanced":
@@ -889,10 +890,11 @@ class TestVmNetworkOperations(cloudstackTestCase):
                                             cls.services["service_offering"]
                                             )
         cls._cleanup = [cls.service_offering]
-        cls.services["shared_network_offering"]["specifyVlan"] = "True"
-        cls.services["shared_network_offering"]["specifyIpRanges"] = "True"
+        cls.services["shared_network_offering_all_services"]["specifyVlan"] = "True"
+        cls.services["shared_network_offering_all_services"]["specifyIpRanges"] = "True"
 
-        cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["shared_network_offering"])
+        cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client,
+                                        cls.services["shared_network_offering_all_services"])
         cls._cleanup.append(cls.shared_network_offering)
         cls.mode = cls.zone.networktype
         if cls.mode.lower() == "advanced":

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4466ed1c/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 73a5965..fbf5e25 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -277,6 +277,27 @@ test_data = {
             "UserData": "VirtualRouter"
         }
     },
+    "shared_network_offering_all_services": {
+            "name":"shaared network offering with services enabled",
+            "displaytext": "Shard network offering",
+            "guestiptype": "Shared",
+            "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat",
+            "specifyVlan" : "False",
+            "specifyIpRanges" : "False",
+            "traffictype": "GUEST",
+            "serviceProviderList" : {
+                "Dhcp": "VirtualRouter",
+                "Dns": "VirtualRouter",
+                "UserData": "VirtualRouter",
+                "SourceNat": "VirtualRouter",
+                "PortForwarding": "VirtualRouter",
+                "Vpn": "VirtualRouter",
+                "Firewall": "VirtualRouter",
+                "Lb": "VirtualRouter",
+                "UserData": "VirtualRouter",
+                "StaticNat": "VirtualRouter"
+            }
+    },
     "shared_network_offering_sg": {
         "name": "MySharedOffering-sg",
         "displaytext": "MySharedOffering-sg",


Mime
View raw message