apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.15' into main

Browse Source
This commit is contained in:
Rohit Yadav 2021-09-22 14:38:56 +05:30
commit 847078b3c8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/integration/component/test_public_ip.py
View File

@ -376,7 +376,7 @@ class TestPublicIp(cloudstackTestCase):
) )
# Step 2. Associate IP in range dedicated to domain1 # 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( ipaddress = PublicIPAddress.create(
self.apiclient, self.apiclient,
zoneid=self.zone.id, zoneid=self.zone.id,
@ -519,7 +519,7 @@ class TestPublicIp(cloudstackTestCase):
) )
# Step 4: Associate IP in range dedicated to sub domain # 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( ipaddress = PublicIPAddress.create(
sub_user_api_client, sub_user_api_client,
zoneid=self.zone.id, zoneid=self.zone.id,
@ -729,7 +729,7 @@ class TestPublicIp(cloudstackTestCase):
) )
# Acquire public ip address from VPC # 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( PublicIPAddress.create(
user_api_client, user_api_client,
zoneid=self.zone.id, zoneid=self.zone.id,
@ -828,10 +828,12 @@ class TestPublicIp(cloudstackTestCase):
except Exception as e: except Exception as e:
self.info("Got exception as expected since domain2 cant access network of domain1") 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( ipaddresses = PublicIPAddress.list(
self.apiclient, self.apiclient,
vlanid=vlanId, vlanid=vlanId,
domainId=domainId,
account=account,
state='Free' state='Free'
) )
self.assertEqual( self.assertEqual(