Skip to content

travis: fix test/integration/component/test_public_ip.py #5486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weizhouapache merged 1 commit into from
Sep 22, 2021
Merged

travis: fix test/integration/component/test_public_ip.py #5486

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions test/integration/component/test_public_ip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
ip_address_1 = self.get_free_ipaddress(self.public_ip_range1.vlan.id, self.account1.domainid, self.account1.name)
ipaddress = PublicIPAddress.create(
self.apiclient,
zoneid=self.zone.id,
Expand Down Expand Up @@ -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)
ip_address_1 = self.get_free_ipaddress(self.public_ip_range2.vlan.id, self.sub_account.domainid, self.sub_account.name)
ipaddress = PublicIPAddress.create(
sub_user_api_client,
zoneid=self.zone.id,
Expand Down Expand Up @@ -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)
ip_address_1 = self.get_free_ipaddress(self.public_ip_range3.vlan.id, self.account2.domainid, self.account2.name)
PublicIPAddress.create(
user_api_client,
zoneid=self.zone.id,
Expand Down Expand Up @@ -828,10 +828,12 @@ def test_06_list_publicip_user_domain(self):
except Exception as e:
self.info("Got exception as expected since domain2 cant access network of domain1")

def get_free_ipaddress(self, vlanId):
def get_free_ipaddress(self, vlanId, domainId, account):
ipaddresses = PublicIPAddress.list(
self.apiclient,
vlanid=vlanId,
domainId=domainId,
account=account,
state='Free'
)
self.assertEqual(
Expand Down