Revert "travis: fix test/integration/component/test_public_ip.py (#5486)"

weizhouapache · weizhouapache · commit ab36260eabff · 2022-10-20T08:28:09.000+02:00
This reverts commit 7444bc6.
diff --git a/test/integration/component/test_public_ip.py b/test/integration/component/test_public_ip.py
@@ -376,7 +376,7 @@ def test_02_list_publicip_domain_admin(self):
         )
 
         # Step 2. Associate IP in range dedicated to domain1
-        ip_address_1 = self.get_free_ipaddress(self.public_ip_range1.vlan.id, self.account1.domainid, self.account1.name)
+        ip_address_1 = self.get_free_ipaddress(self.public_ip_range1.vlan.id)
         ipaddress = PublicIPAddress.create(
             self.apiclient,
             zoneid=self.zone.id,
@@ -519,7 +519,7 @@ def test_03_list_publicip_user_domain(self):
         )
 
         # Step 4: Associate IP in range dedicated to sub domain
-        ip_address_1 = self.get_free_ipaddress(self.public_ip_range2.vlan.id, self.sub_account.domainid, self.sub_account.name)
+        ip_address_1 = self.get_free_ipaddress(self.public_ip_range2.vlan.id)
         ipaddress = PublicIPAddress.create(
             sub_user_api_client,
             zoneid=self.zone.id,
@@ -729,7 +729,7 @@ def test_05_list_publicip_user_domain(self):
         )
 
         # Acquire public ip address from VPC
-        ip_address_1 = self.get_free_ipaddress(self.public_ip_range3.vlan.id, self.account2.domainid, self.account2.name)
+        ip_address_1 = self.get_free_ipaddress(self.public_ip_range3.vlan.id)
         PublicIPAddress.create(
             user_api_client,
             zoneid=self.zone.id,
@@ -828,12 +828,10 @@ def test_06_list_publicip_user_domain(self):
         except Exception as e:
             self.info("Got exception as expected since domain2 can't access network of domain1")
 
-    def get_free_ipaddress(self, vlanId, domainId, account):
+    def get_free_ipaddress(self, vlanId):
         ipaddresses = PublicIPAddress.list(
             self.apiclient,
             vlanid=vlanId,
-            domainId=domainId,
-            account=account,
             state='Free'
         )
         self.assertEqual(
