Fixes for BVT and Regression run failures against 4.4 CS

test/integration/component/test_advancedsg_networks.py

@@ -1307,11 +1307,11 @@ class TestNetworksInAdvancedSG_VmOperations(cloudstackTestCase):
                                                   zoneid=self.zone.id)
 
         # Creaint user API client of account 1
-        api_client_account_1 = self.testClient.createUserApiClient(UserName=account_1.name,
+        api_client_account_1 = self.testClient.getUserApiClient(UserName=account_1.name,
                                                          DomainName=account_1.domain)
 
         # Creaint user API client of account 2
-        api_client_account_2 = self.testClient.createUserApiClient(UserName=account_2.name,
+        api_client_account_2 = self.testClient.getUserApiClient(UserName=account_2.name,
                                                          DomainName=account_2.domain)
 
         self.debug("Creating virtual machine in account %s with account specific shared network %s" %
@@ -1419,11 +1419,11 @@ class TestNetworksInAdvancedSG_VmOperations(cloudstackTestCase):
         self.cleanup_networks.append(shared_network_domain_2)
 
         # Creaint user API client of account 1
-        api_client_domain_1 = self.testClient.createUserApiClient(UserName=account_1.name,
+        api_client_domain_1 = self.testClient.getUserApiClient(UserName=account_1.name,
                                                          DomainName=account_1.domain)
 
         # Creaint user API client of account 2
-        api_client_domain_2 = self.testClient.createUserApiClient(UserName=account_2.name,
+        api_client_domain_2 = self.testClient.getUserApiClient(UserName=account_2.name,
                                                          DomainName=account_2.domain)
 
         self.debug("Creating virtual machine in domain %s with domain wide shared network %s" %

test/integration/component/test_dynamic_compute_offering.py

@@ -225,7 +225,7 @@ class TestDynamicServiceOffering(cloudstackTestCase):
 
         # Create Account
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id, admin=isadmin)
-        apiclient = self.testClient.createUserApiClient(
+        apiclient = self.testClient.getUserApiClient(
                                     UserName=self.account.name,
                                     DomainName=self.account.domain)
         self.cleanup.append(self.account)
@@ -287,7 +287,7 @@ class TestDynamicServiceOffering(cloudstackTestCase):
 
         # Create Account and its api client
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id, admin=isadmin)
-        apiclient = self.testClient.createUserApiClient(
+        apiclient = self.testClient.getUserApiClient(
                                     UserName=self.account.name,
                                     DomainName=self.account.domain)
         self.cleanup.append(self.account)
@@ -354,7 +354,7 @@ class TestDynamicServiceOffering(cloudstackTestCase):
 
         # Create Account and api client
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id, admin=isadmin)
-        apiclient = self.testClient.createUserApiClient(
+        apiclient = self.testClient.getUserApiClient(
                                     UserName=self.account.name,
                                     DomainName=self.account.domain)
         self.cleanup.append(self.account)
@@ -502,7 +502,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
 
         # Create Account
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id, admin=isadmin)
-        apiclient = self.testClient.createUserApiClient(
+        apiclient = self.testClient.getUserApiClient(
                                     UserName=self.account.name,
                                     DomainName=self.account.domain)
         self.cleanup.append(self.account)
@@ -567,7 +567,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
 
         # Create Account and api client
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id, admin=isadmin)
-        apiclient = self.testClient.createUserApiClient(
+        apiclient = self.testClient.getUserApiClient(
                                     UserName=self.account.name,
                                     DomainName=self.account.domain)
         self.cleanup.append(self.account)
@@ -651,7 +651,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
 
         # Create account and api client
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id, admin=isadmin)
-        apiclient = self.testClient.createUserApiClient(
+        apiclient = self.testClient.getUserApiClient(
                                     UserName=self.account.name,
                                     DomainName=self.account.domain)
         self.cleanup.append(self.account)
@@ -719,7 +719,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
 
         # Create Account
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id, admin=isadmin)
-        apiclient = self.testClient.createUserApiClient(
+        apiclient = self.testClient.getUserApiClient(
                                     UserName=self.account.name,
                                     DomainName=self.account.domain)
         self.cleanup.append(self.account)
@@ -795,7 +795,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
 
         # Create Account and api client
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id, admin=isadmin)
-        apiclient = self.testClient.createUserApiClient(
+        apiclient = self.testClient.getUserApiClient(
                                     UserName=self.account.name,
                                     DomainName=self.account.domain)
         self.cleanup.append(self.account)
@@ -855,7 +855,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
 
         # Crate account and api client
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id, admin=isadmin)
-        apiclient = self.testClient.createUserApiClient(
+        apiclient = self.testClient.getUserApiClient(
                                     UserName=self.account.name,
                                     DomainName=self.account.domain)
         self.cleanup.append(self.account)
@@ -930,7 +930,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
 
         # Create account and api client
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id, admin=isadmin)
-        apiclient = self.testClient.createUserApiClient(
+        apiclient = self.testClient.getUserApiClient(
                                     UserName=self.account.name,
                                     DomainName=self.account.domain)
         self.cleanup.append(self.account)
@@ -995,7 +995,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
 
         # Create account and api client
         self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id, admin=isadmin)
-        apiclient = self.testClient.createUserApiClient(
+        apiclient = self.testClient.getUserApiClient(
                                     UserName=self.account.name,
                                     DomainName=self.account.domain)
         self.cleanup.append(self.account)

test/integration/component/test_multiple_ips_per_nic.py

@@ -149,7 +149,7 @@ class TestBasicOperations(cloudstackTestCase):
         cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client,
                                                                       cls.services["shared_network_offering"])
         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"])
@@ -426,7 +426,7 @@ class TestBasicOperations(cloudstackTestCase):
         self.cleanup.append(self.account)
         self.cleanup.append(child_domain)
 
-        apiclient = self.testClient.createUserApiClient(UserName=self.account.name, DomainName=self.account.domain)
+        apiclient = self.testClient.getUserApiClient(UserName=self.account.name, DomainName=self.account.domain)
 
         if(shouldTestBeSkipped(networkType=value, zoneType=self.mode)):
             self.skipTest("Skipping test as %s network is not supported in basic zone" % value)
@@ -499,7 +499,7 @@ class TestNetworkRules(cloudstackTestCase):
 
         cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["shared_network_offering"])
         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)
@@ -873,7 +873,7 @@ class TestVmNetworkOperations(cloudstackTestCase):
 
         cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["shared_network_offering"])
         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)

tools/marvin/marvin/config/test_data.py

@@ -149,6 +149,26 @@ test_data = {
             "PortForwarding": 'VirtualRouter',
         },
     },
+    "nw_off_isolated_netscaler": {
+        "name": "Network offering-ns services",
+        "displaytext": "Network offering-ns services",
+        "guestiptype": "Isolated",
+        "supportedservices":
+        "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat",
+        "traffictype": "GUEST",
+        "availability": "Optional'",
+        "serviceProviderList": {
+            "Dhcp": "VirtualRouter",
+            "Dns": "VirtualRouter",
+            "SourceNat": "VirtualRouter",
+            "PortForwarding": "VirtualRouter",
+            "Vpn": "VirtualRouter",
+            "Firewall": "VirtualRouter",
+            "Lb": "NetScaler",
+            "UserData": "VirtualRouter",
+            "StaticNat": "VirtualRouter"
+        }
+    },
     "nw_off_isolated_persistent": {
         "name": 'Test Nw off isolated persistent',
         "displaytext": 'Test Nw off isolated persistent',