Fixing few issues in Multiple IPs test cases

Gaurav Aradhye · girish@clogeny.com · commit 6c8a0a1f968c · 2014-05-10T00:37:56.000-04:00
diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py
@@ -143,11 +143,11 @@ def setUpClass(cls):
                                             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 == "advanced":
@@ -443,7 +443,7 @@ def test_operations_non_root_admin_api_client(self, value):
         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)
@@ -494,10 +494,11 @@ def setUpClass(cls):
                                             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 == "advanced":
@@ -868,10 +869,11 @@ def setUpClass(cls):
                                             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 == "advanced":
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
@@ -296,6 +296,27 @@
             "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",
