From ec10e8db27e9f3a60a3d74053c5260d87616a3fa Mon Sep 17 00:00:00 2001
From: Girish Shilamkar <girish@clogeny.com>
Date: Wed, 30 Jul 2014 12:08:20 +0530
Subject: [PATCH] CLOUDSTACK-7199: Fixed test_multiple_ips_per_nic.py test
 failures

---
 .../component/test_multiple_ips_per_nic.py    | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py
index 7de2f407222..570ddd2db65 100644
--- a/test/integration/component/test_multiple_ips_per_nic.py
+++ b/test/integration/component/test_multiple_ips_per_nic.py
@@ -150,16 +150,15 @@ class TestBasicOperations(cloudstackTestCase):
                                                                       cls.services["shared_network_offering_all_services"])
         cls._cleanup.append(cls.shared_network_offering)
         cls.mode = cls.zone.networktype
-        if cls.mode == "advanced":
-            cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client,
+        cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client,
                                                                       cls.services["isolated_network_offering"])
-            cls._cleanup.append(cls.isolated_network_offering)
-            cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client,
+        cls._cleanup.append(cls.isolated_network_offering)
+        cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client,
                                                     cls.services["nw_offering_isolated_vpc"])
-            cls._cleanup.append(cls.isolated_network_offering_vpc)
-            cls.vpc_off = VpcOffering.create(cls.api_client, cls.services["vpc_offering"])
-            cls.vpc_off.update(cls.api_client, state='Enabled')
-            cls._cleanup.append(cls.vpc_off)
+        cls._cleanup.append(cls.isolated_network_offering_vpc)
+        cls.vpc_off = VpcOffering.create(cls.api_client, cls.services["vpc_offering"])
+        cls.vpc_off.update(cls.api_client, state='Enabled')
+        cls._cleanup.append(cls.vpc_off)
         return
 
     @classmethod
@@ -489,14 +488,13 @@ class TestNetworkRules(cloudstackTestCase):
                                         cls.services["shared_network_offering_all_services"])
         cls._cleanup.append(cls.shared_network_offering)
         cls.mode = cls.zone.networktype
-        if cls.mode == "advanced":
-            cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["isolated_network_offering"])
-            cls._cleanup.append(cls.isolated_network_offering)
-            cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client, cls.services["nw_offering_isolated_vpc"])
-            cls._cleanup.append(cls.isolated_network_offering_vpc)
-            cls.vpc_off = VpcOffering.create(cls.api_client, cls.services["vpc_offering"])
-            cls.vpc_off.update(cls.api_client, state='Enabled')
-            cls._cleanup.append(cls.vpc_off)
+        cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["isolated_network_offering"])
+        cls._cleanup.append(cls.isolated_network_offering)
+        cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client, cls.services["nw_offering_isolated_vpc"])
+        cls._cleanup.append(cls.isolated_network_offering_vpc)
+        cls.vpc_off = VpcOffering.create(cls.api_client, cls.services["vpc_offering"])
+        cls.vpc_off.update(cls.api_client, state='Enabled')
+        cls._cleanup.append(cls.vpc_off)
         return
 
     @classmethod
@@ -864,14 +862,13 @@ class TestVmNetworkOperations(cloudstackTestCase):
                                         cls.services["shared_network_offering_all_services"])
         cls._cleanup.append(cls.shared_network_offering)
         cls.mode = cls.zone.networktype
-        if cls.mode == "advanced":
-            cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["isolated_network_offering"])
-            cls._cleanup.append(cls.isolated_network_offering)
-            cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client, cls.services["nw_offering_isolated_vpc"])
-            cls._cleanup.append(cls.isolated_network_offering_vpc)
-            cls.vpc_off = VpcOffering.create(cls.api_client, cls.services["vpc_offering"])
-            cls.vpc_off.update(cls.api_client, state='Enabled')
-            cls._cleanup.append(cls.vpc_off)
+        cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["isolated_network_offering"])
+        cls._cleanup.append(cls.isolated_network_offering)
+        cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client, cls.services["nw_offering_isolated_vpc"])
+        cls._cleanup.append(cls.isolated_network_offering_vpc)
+        cls.vpc_off = VpcOffering.create(cls.api_client, cls.services["vpc_offering"])
+        cls.vpc_off.update(cls.api_client, state='Enabled')
+        cls._cleanup.append(cls.vpc_off)
         return
 
     @classmethod