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

Fix all occurrences of account.account

Browse Source 
Fixes the dereference of account objects with account.account. This is
to conform to recent library changes in Marvin

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-05-20 22:59:52 +05:30
parent 145a116c9b
commit 54ac779b8f
19 changed files with 535 additions and 535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/component/test_accounts.py
View File

@ -561,7 +561,7 @@ class TestNonRootAdminsPrivileges(cloudstackTestCase):
self.apiclient,
self.services["account"]
)
self.debug("Created account: %s" % account_1.account.name)
self.debug("Created account: %s" % account_1.name)
self.cleanup.append(account_1)
account_2 = Account.create(
self.apiclient,

28
test/integration/component/test_high_availability.py
View File

@ -220,7 +220,7 @@ class TestHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id
)
vms = VirtualMachine.list(
@ -248,7 +248,7 @@ class TestHighAvailability(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -264,7 +264,7 @@ class TestHighAvailability(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
@ -372,7 +372,7 @@ class TestHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id
)
vms = VirtualMachine.list(
@ -424,7 +424,7 @@ class TestHighAvailability(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -464,7 +464,7 @@ class TestHighAvailability(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -513,7 +513,7 @@ class TestHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id
)
vms = VirtualMachine.list(
@ -615,7 +615,7 @@ class TestHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id
)
vms = VirtualMachine.list(
@ -643,7 +643,7 @@ class TestHighAvailability(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -659,7 +659,7 @@ class TestHighAvailability(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
@ -833,7 +833,7 @@ class TestHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id
)
vms = VirtualMachine.list(
@ -952,7 +952,7 @@ class TestHighAvailability(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -990,7 +990,7 @@ class TestHighAvailability(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1037,7 +1037,7 @@ class TestHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id
)
vms = VirtualMachine.list(

14
test/integration/component/test_host_high_availability.py
View File

@ -190,7 +190,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering_with_ha.id
)
vms = VirtualMachine.list(
@ -235,7 +235,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering_with_ha.id
)
@ -289,7 +289,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering_without_ha.id
)
@ -358,7 +358,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering_with_ha.id
)
@ -464,7 +464,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering_with_ha.id
)
@ -573,7 +573,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering_with_ha.id
)
@ -705,7 +705,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering_without_ha.id
)

0
test/integration/component/test_ldap.py Executable file → Normal file
View File

34
test/integration/component/test_projects.py
View File

@ -782,8 +782,8 @@ class TestProjectOwners(cloudstackTestCase):
project = Project.create(
self.apiclient,
self.services["project"],
account=self.admin.account.name,
domainid=self.admin.account.domainid
account=self.admin.name,
domainid=self.admin.domainid
)
self.cleanup.append(project)
# Cleanup created project at end of test
@ -815,20 +815,20 @@ class TestProjectOwners(cloudstackTestCase):
"Check project name from list response"
)
self.debug("Adding %s user to project: %s" % (
self.new_admin.account.name,
self.new_admin.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
self.new_admin.account.name,
self.new_admin.name,
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
account=self.new_admin.account.name,
account=self.new_admin.name,
)
self.debug(accounts_reponse)
self.assertEqual(
@ -853,14 +853,14 @@ class TestProjectOwners(cloudstackTestCase):
# Update the project with new admin
project.update(
self.apiclient,
account=self.new_admin.account.name
account=self.new_admin.name
)
# listProjectAccount to verify the user is new admin of the project
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
account=self.new_admin.account.name,
account=self.new_admin.name,
)
self.debug(accounts_reponse)
self.assertEqual(
@ -886,7 +886,7 @@ class TestProjectOwners(cloudstackTestCase):
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
account=self.admin.account.name,
account=self.admin.name,
)
self.debug(accounts_reponse)
self.assertEqual(
@ -923,8 +923,8 @@ class TestProjectOwners(cloudstackTestCase):
project = Project.create(
self.apiclient,
self.services["project"],
account=self.admin.account.name,
domainid=self.admin.account.domainid
account=self.admin.name,
domainid=self.admin.domainid
)
# Cleanup created project at end of test
self.cleanup.append(project)
@ -965,20 +965,20 @@ class TestProjectOwners(cloudstackTestCase):
"Check project name from list response"
)
self.debug("Adding %s user to project: %s" % (
self.new_admin.account.name,
self.new_admin.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
self.new_admin.account.name,
self.new_admin.name,
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
account=self.new_admin.account.name,
account=self.new_admin.name,
)
self.debug(accounts_reponse)
self.assertEqual(
@ -1000,18 +1000,18 @@ class TestProjectOwners(cloudstackTestCase):
"Newly added user is not added as a regular user"
)
self.debug("Updating project with new Admin: %s" %
self.new_admin.account.name)
self.new_admin.name)
# Update the project with new admin
project.update(
self.apiclient,
account=self.new_admin.account.name
account=self.new_admin.name
)
# listProjectAccount to verify the user is new admin of the project
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
account=self.new_admin.account.name,
account=self.new_admin.name,
)
self.assertEqual(
isinstance(accounts_reponse, list),
@ -1106,7 +1106,7 @@ class TestProjectOwners(cloudstackTestCase):
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
account=self.new_admin.account.name,
account=self.new_admin.name,
)
self.assertEqual(
isinstance(accounts_reponse, list),

120
test/integration/component/test_redundant_router.py
View File

@ -331,7 +331,7 @@ class TestCreateRvRNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -375,7 +375,7 @@ class TestCreateRvRNetwork(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -538,7 +538,7 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
guestcidr=' 192.168.2.0/23'
@ -593,7 +593,7 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -760,7 +760,7 @@ class TestRVRInternals(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -804,7 +804,7 @@ class TestRVRInternals(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -1019,7 +1019,7 @@ class TestRedundancy(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -1031,7 +1031,7 @@ class TestRedundancy(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network.id)]
)
@ -1572,7 +1572,7 @@ class TestRedundancy(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network.id)]
)
@ -1712,7 +1712,7 @@ class TestApplyAndDeleteNetworkRulesOnRvR(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -1756,7 +1756,7 @@ class TestApplyAndDeleteNetworkRulesOnRvR(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -1801,7 +1801,7 @@ class TestApplyAndDeleteNetworkRulesOnRvR(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -1870,7 +1870,7 @@ class TestApplyAndDeleteNetworkRulesOnRvR(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -1902,7 +1902,7 @@ class TestApplyAndDeleteNetworkRulesOnRvR(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -2037,7 +2037,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -2081,7 +2081,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -2126,7 +2126,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -2142,7 +2142,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
self.apiclient,
publicipid=public_ip.ipaddress.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
except Exception as e:
self.fail("Failed to create VPN for account: %s - %s" % (
@ -2154,7 +2154,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
username="root",
password="password",
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
except Exception as e:
self.fail("Failed to create VPN user: %s" % e)
@ -2163,7 +2163,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
remote_vpns = Vpn.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
publicipid=public_ip.ipaddress.id,
listall=True
)
@ -2184,7 +2184,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
remote_vpns = Vpn.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
publicipid=public_ip.ipaddress.id,
listall=True
)
@ -2306,7 +2306,7 @@ class TestNetworkRulesMasterDownDeleteNetworkRules(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -2350,7 +2350,7 @@ class TestNetworkRulesMasterDownDeleteNetworkRules(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -2412,7 +2412,7 @@ class TestNetworkRulesMasterDownDeleteNetworkRules(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -2481,7 +2481,7 @@ class TestNetworkRulesMasterDownDeleteNetworkRules(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -2513,7 +2513,7 @@ class TestNetworkRulesMasterDownDeleteNetworkRules(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -2694,7 +2694,7 @@ class TestApplyDeleteNetworkRulesRebootRouter(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -2738,7 +2738,7 @@ class TestApplyDeleteNetworkRulesRebootRouter(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -2790,7 +2790,7 @@ class TestApplyDeleteNetworkRulesRebootRouter(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -2851,7 +2851,7 @@ class TestApplyDeleteNetworkRulesRebootRouter(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -2872,7 +2872,7 @@ class TestApplyDeleteNetworkRulesRebootRouter(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -3058,7 +3058,7 @@ class TestRestartRvRNetworkWithoutCleanup(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -3102,7 +3102,7 @@ class TestRestartRvRNetworkWithoutCleanup(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -3279,7 +3279,7 @@ class TestRestartRvRNetworkWithCleanup(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -3323,7 +3323,7 @@ class TestRestartRvRNetworkWithCleanup(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -3500,7 +3500,7 @@ class TestDeleteRvRNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -3544,7 +3544,7 @@ class TestDeleteRvRNetwork(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -3719,7 +3719,7 @@ class TestNetworkGCRvR(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -3763,7 +3763,7 @@ class TestNetworkGCRvR(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -3999,7 +3999,7 @@ class TestApplyRulesRestartRvRNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -4043,7 +4043,7 @@ class TestApplyRulesRestartRvRNetwork(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -4095,7 +4095,7 @@ class TestApplyRulesRestartRvRNetwork(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -4156,7 +4156,7 @@ class TestApplyRulesRestartRvRNetwork(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -4177,7 +4177,7 @@ class TestApplyRulesRestartRvRNetwork(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@ -4439,7 +4439,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=network_off_vr.id,
zoneid=self.zone.id
)
@ -4471,7 +4471,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -4500,7 +4500,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -4528,7 +4528,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -4574,7 +4574,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -4606,7 +4606,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -4635,7 +4635,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -4676,7 +4676,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -4808,7 +4808,7 @@ class TestRVRWithDiffEnvs(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -4852,7 +4852,7 @@ class TestRVRWithDiffEnvs(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -4972,7 +4972,7 @@ class TestRVRWithDiffEnvs(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -5016,7 +5016,7 @@ class TestRVRWithDiffEnvs(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -5208,7 +5208,7 @@ class TestRVRWithDiffEnvs(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -5265,7 +5265,7 @@ class TestRVRWithDiffEnvs(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)],
hostid=host.id
@ -5449,7 +5449,7 @@ class TestRVRWithDiffEnvs(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@ -5506,7 +5506,7 @@ class TestRVRWithDiffEnvs(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)],
hostid=host.id

70
test/integration/component/test_stopped_vm.py
View File

@ -188,7 +188,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
diskofferingid=self.disk_offering.id,
mode=self.zone.networktype
@ -242,7 +242,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=True,
diskofferingid=self.disk_offering.id,
@ -299,7 +299,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False,
diskofferingid=self.disk_offering.id,
@ -332,7 +332,7 @@ class TestDeployVM(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -389,7 +389,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False,
diskofferingid=self.disk_offering.id,
@ -426,7 +426,7 @@ class TestDeployVM(cloudstackTestCase):
self.services["volume"],
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
diskofferingid=self.disk_offering.id
)
self.debug("Created volume in account: %s" % self.account.name)
@ -457,7 +457,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False,
diskofferingid=self.disk_offering.id,
@ -494,7 +494,7 @@ class TestDeployVM(cloudstackTestCase):
self.services["volume"],
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
diskofferingid=self.disk_offering.id
)
self.debug("Created volume in account: %s" % self.account.name)
@ -570,7 +570,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False,
diskofferingid=self.disk_offering.id,
@ -607,7 +607,7 @@ class TestDeployVM(cloudstackTestCase):
self.services["volume"],
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
diskofferingid=self.disk_offering.id
)
self.debug("Created volume in account: %s" % self.account.name)
@ -653,7 +653,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False,
diskofferingid=self.disk_offering.id,
@ -689,7 +689,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
self.services["iso"],
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("Successfully created ISO with ID: %s" % iso.id)
@ -746,7 +746,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False,
)
@ -782,7 +782,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
diskofferingid=self.disk_offering.id
)
@ -819,7 +819,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
type='DATADISK',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -943,7 +943,7 @@ class TestDeployHaEnabledVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
diskofferingid=self.disk_offering.id,
startvm=False
@ -990,7 +990,7 @@ class TestDeployHaEnabledVM(cloudstackTestCase):
self.apiclient,
self.services["iso"],
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
try:
# Dowanload the ISO
@ -1007,7 +1007,7 @@ class TestDeployHaEnabledVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
templateid=self.iso.id,
serviceofferingid=self.service_offering.id,
diskofferingid=self.disk_offering.id,
@ -1057,7 +1057,7 @@ class TestDeployHaEnabledVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
diskofferingid=self.disk_offering.id,
startvm=False
@ -1175,7 +1175,7 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
diskofferingid=self.disk_offering.id,
startvm=False
@ -1210,7 +1210,7 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1225,7 +1225,7 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
diskofferingid=self.disk_offering.id,
startvm=True
@ -1260,7 +1260,7 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1295,7 +1295,7 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertNotEqual(
@ -1397,7 +1397,7 @@ class TestDeployVMBasicZone(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=True,
diskofferingid=self.disk_offering.id,
@ -1455,7 +1455,7 @@ class TestDeployVMBasicZone(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False,
mode=self.zone.networktype
@ -1570,7 +1570,7 @@ class TestDeployVMFromTemplate(cloudstackTestCase):
self.services["template"],
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
try:
self.template.download(self.apiclient)
@ -1606,7 +1606,7 @@ class TestDeployVMFromTemplate(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
templateid=self.template.id,
startvm=False,
@ -1744,7 +1744,7 @@ class TestVMAccountLimit(cloudstackTestCase):
self.apiclient,
0, # Instance
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
max=1
)
self.debug(
@ -1756,7 +1756,7 @@ class TestVMAccountLimit(cloudstackTestCase):
self.services["virtual_machine"],
templateid=self.template.id,
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False
)
@ -1775,7 +1775,7 @@ class TestVMAccountLimit(cloudstackTestCase):
self.services["virtual_machine"],
templateid=self.template.id,
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False
)
@ -1861,7 +1861,7 @@ class TestUploadAttachVolume(cloudstackTestCase):
self.services["volume"],
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("Uploading the volume: %s" % volume.name)
volume.wait_for_upload(self.apiclient)
@ -1878,7 +1878,7 @@ class TestUploadAttachVolume(cloudstackTestCase):
self.services["virtual_machine"],
templateid=self.template.id,
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False
)
@ -1999,7 +1999,7 @@ class TestDeployOnSpecificHost(cloudstackTestCase):
self.services["virtual_machine"],
templateid=self.template.id,
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
hostid=host.id
)
@ -2013,7 +2013,7 @@ class TestDeployOnSpecificHost(cloudstackTestCase):
id=vm.id,
listall=True,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.assertEqual(

110
test/integration/component/test_tags.py
View File

@ -224,7 +224,7 @@ class TestResourceTags(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
mode=cls.zone.networktype
)
@ -280,7 +280,7 @@ class TestResourceTags(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -297,7 +297,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.cleanup.append(public_ip)
@ -346,7 +346,7 @@ class TestResourceTags(cloudstackTestCase):
resourceType='LoadBalancer',
key='LB',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
value=40
)
@ -393,7 +393,7 @@ class TestResourceTags(cloudstackTestCase):
resourceType='LoadBalancer',
key='LB',
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.assertEqual(
@ -423,7 +423,7 @@ class TestResourceTags(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -440,7 +440,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.cleanup.append(public_ip)
@ -484,7 +484,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='portForwardingRule',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='PF',
value=40
)
@ -529,7 +529,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='portForwardingRule',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='PF',
value=40
)
@ -560,7 +560,7 @@ class TestResourceTags(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -577,7 +577,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.cleanup.append(public_ip)
@ -626,7 +626,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='FirewallRule',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='FW',
value='40'
)
@ -671,7 +671,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='FirewallRule',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='FW',
value='40'
)
@ -704,7 +704,7 @@ class TestResourceTags(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -721,7 +721,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id
)
self.cleanup.append(public_ip)
@ -754,7 +754,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
public_ip.ipaddress.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
except Exception as e:
@ -792,7 +792,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='VPN',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='protocol',
value='L2TP'
)
@ -823,7 +823,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='VPN',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='protocol',
value='L2TP'
)
@ -863,7 +863,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -907,7 +907,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -978,7 +978,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='Template',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='OS',
value='CentOS'
)
@ -1019,7 +1019,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='Template',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='OS',
value='CentOS'
)
@ -1042,7 +1042,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
self.services["iso"],
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("ISO created with ID: %s" % iso.id)
@ -1070,7 +1070,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='ISO',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='OS',
value='CentOS'
)
@ -1115,7 +1115,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='ISO',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='OS',
value='CentOS'
)
@ -1141,7 +1141,7 @@ class TestResourceTags(cloudstackTestCase):
self.services["volume"],
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
diskofferingid=self.disk_offering.id
)
self.cleanup.append(volume)
@ -1162,7 +1162,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='volume',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -1205,7 +1205,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='volume',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region'
)
self.assertEqual(
@ -1262,7 +1262,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='snapshot',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='type',
value='manual'
)
@ -1312,7 +1312,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='snapshot',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='type',
value='manual'
)
@ -1337,7 +1337,7 @@ class TestResourceTags(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1363,7 +1363,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='Network',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -1381,7 +1381,7 @@ class TestResourceTags(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True,
key='region',
value='India'
@ -1409,7 +1409,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='Network',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -1479,7 +1479,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -1516,7 +1516,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -1550,7 +1550,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -1596,7 +1596,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -1642,7 +1642,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -1691,7 +1691,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
self.services["project"],
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
# Cleanup created project at end of test
self.cleanup.append(project)
@ -1758,7 +1758,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='project',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -1799,7 +1799,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
self.services["iso"],
account=user_account.name,
domainid=user_account.account.domainid
domainid=user_account.domainid
)
self.debug("ISO created with ID: %s" % iso.id)
@ -1827,7 +1827,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='ISO',
account=user_account.name,
domainid=user_account.account.domainid,
domainid=user_account.domainid,
key='region',
)
@ -1849,7 +1849,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='ISO',
account=other_user_account.name,
domainid=other_user_account.account.domainid,
domainid=other_user_account.domainid,
key='region',
)
@ -1884,7 +1884,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
self.services["iso"],
account=user_account.name,
domainid=user_account.account.domainid
domainid=user_account.domainid
)
self.debug("ISO created with ID: %s" % iso.id)
@ -1912,7 +1912,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='ISO',
account=user_account.name,
domainid=user_account.account.domainid,
domainid=user_account.domainid,
key='region',
)
@ -2009,7 +2009,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -2042,7 +2042,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -2065,7 +2065,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -2103,7 +2103,7 @@ class TestResourceTags(cloudstackTestCase):
self.services["volume"],
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
diskofferingid=self.disk_offering.id
)
self.cleanup.append(volume)
@ -2124,7 +2124,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='volume',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
)
self.assertEqual(
@ -2152,7 +2152,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -2185,7 +2185,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -2246,7 +2246,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)
@ -2295,7 +2295,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
key='region',
value='India'
)

124
test/integration/component/test_vpc.py
View File

@ -316,7 +316,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -348,7 +348,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -373,7 +373,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@ -397,7 +397,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering_no_lb.id,
zoneid=self.zone.id,
gateway=gateway,
@ -432,7 +432,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -475,7 +475,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -500,7 +500,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@ -524,7 +524,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering_no_lb.id,
zoneid=self.zone.id,
gateway=gateway,
@ -575,7 +575,7 @@ class TestVPC(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -613,7 +613,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc_1)
@ -624,7 +624,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc_2)
@ -714,7 +714,7 @@ class TestVPC(cloudstackTestCase):
supportedservices='Vpn,Dhcp,Dns,SourceNat,PortForwarding,Lb,UserData,StaticNat,NetworkACL',
listall=True,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.assertEqual(
isinstance(vpcs, list),
@ -733,7 +733,7 @@ class TestVPC(cloudstackTestCase):
restartrequired=True,
listall=True,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
if vpcs is not None:
for vpc in vpcs:
@ -748,7 +748,7 @@ class TestVPC(cloudstackTestCase):
restartrequired=False,
listall=True,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.assertEqual(
isinstance(vpcs, list),
@ -789,7 +789,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc_1)
@ -869,7 +869,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -898,7 +898,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -913,7 +913,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@ -927,7 +927,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -937,7 +937,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -949,7 +949,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@ -959,7 +959,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@ -970,7 +970,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_1.id,
vpcid=vpc.id
)
@ -1002,7 +1002,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_1.id,
vpcid=vpc.id
)
@ -1031,7 +1031,7 @@ class TestVPC(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.assertEqual(
isinstance(public_ips, list),
@ -1049,7 +1049,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_2.id,
vpcid=vpc.id
)
@ -1068,7 +1068,7 @@ class TestVPC(cloudstackTestCase):
accountid=self.account.name,
networkid=network_2.id,
vpcid=vpc.id,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (
@ -1214,7 +1214,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1243,7 +1243,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -1258,7 +1258,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@ -1272,7 +1272,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -1282,7 +1282,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -1294,7 +1294,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@ -1304,7 +1304,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@ -1315,7 +1315,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_1.id,
vpcid=vpc.id
)
@ -1347,7 +1347,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_1.id,
vpcid=vpc.id
)
@ -1376,7 +1376,7 @@ class TestVPC(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.assertEqual(
isinstance(public_ips, list),
@ -1394,7 +1394,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_2.id,
vpcid=vpc.id
)
@ -1413,7 +1413,7 @@ class TestVPC(cloudstackTestCase):
accountid=self.account.name,
networkid=network_2.id,
vpcid=vpc.id,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (
@ -1558,7 +1558,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1574,7 +1574,7 @@ class TestVPC(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1590,7 +1590,7 @@ class TestVPC(cloudstackTestCase):
src_nat_list = PublicIPAddress.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True,
issourcenat=True,
vpcid=vpc.id
@ -1614,7 +1614,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc_1)
@ -1628,7 +1628,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc_2)
@ -1642,7 +1642,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("%s" % vpc_3)
except Exception as e:
@ -1677,7 +1677,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
self.network_offering = NetworkOffering.create(
@ -1701,7 +1701,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@ -1714,7 +1714,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -1729,7 +1729,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
zoneid=self.zone.id,
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@ -1823,7 +1823,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1852,7 +1852,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@ -1879,7 +1879,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkDomain=netdomain
)
self.validate_vpc_network(vpc)
@ -1904,7 +1904,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@ -1917,7 +1917,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -2355,7 +2355,7 @@ class TestVPC(cloudstackTestCase):
self.services["vpc"],
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.services["vpc_no_name"]["cidr"] = "10.1.1.1/16"
@ -2367,7 +2367,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
# Create VPC without zoneid param
@ -2377,7 +2377,7 @@ class TestVPC(cloudstackTestCase):
self.services["vpc"],
vpcofferingid=self.vpc_off.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
vpc_wo_cidr = {"name": "TestVPC_WO_CIDR",
@ -2392,7 +2392,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
@attr(tags=["advanced", "intervlan"])
@ -2414,7 +2414,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -2439,7 +2439,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@ -2671,7 +2671,7 @@ class TestVPCHostMaintenance(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc, state='Disabled')
return
@ -2697,7 +2697,7 @@ class TestVPCHostMaintenance(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc, state='Disabled')
interval = list_configurations(

44
test/integration/component/test_vpc_host_maintenance.py
View File

@ -242,7 +242,7 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@ -258,7 +258,7 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@ -277,7 +277,7 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off_no_lb.id,
zoneid=cls.zone.id,
gateway='10.1.2.1',
@ -288,7 +288,7 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_1.id,
networkids=[str(cls.network_1.id)]
)
@ -297,7 +297,7 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_1.id,
networkids=[str(cls.network_1.id)]
)
@ -305,14 +305,14 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_2.id,
networkids=[str(cls.network_2.id)]
)
routers = Router.list(
cls.api_client,
account=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
listall=True
)
if isinstance(routers, list):
@ -376,7 +376,7 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=self.network_1.id,
listall=True
)
@ -391,7 +391,7 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=self.network_2.id,
listall=True
)
@ -441,7 +441,7 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -458,7 +458,7 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -618,7 +618,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@ -634,7 +634,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@ -653,7 +653,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off_no_lb.id,
zoneid=cls.zone.id,
gateway='10.1.2.1',
@ -664,7 +664,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_1.id,
networkids=[str(cls.network_1.id)]
)
@ -673,7 +673,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_2.id,
networkids=[str(cls.network_1.id)]
)
@ -681,7 +681,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_1.id,
networkids=[str(cls.network_2.id)]
)
@ -689,7 +689,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_2.id,
networkids=[str(cls.network_2.id)]
)
@ -739,7 +739,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=self.network_1.id,
listall=True
)
@ -754,7 +754,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=self.network_2.id,
listall=True
)
@ -800,7 +800,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=self.network_1.id,
vpcid=self.vpc.id
)
@ -825,7 +825,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=self.network_2.id,
vpcid=self.vpc.id
)

106
test/integration/component/test_vpc_network.py
View File

@ -333,7 +333,7 @@ class TestVPCNetwork(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -353,7 +353,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -426,7 +426,7 @@ class TestVPCNetwork(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -451,7 +451,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -497,7 +497,7 @@ class TestVPCNetwork(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -517,7 +517,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -588,7 +588,7 @@ class TestVPCNetwork(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -608,7 +608,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -646,7 +646,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@ -693,7 +693,7 @@ class TestVPCNetwork(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -744,7 +744,7 @@ class TestVPCNetwork(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -772,7 +772,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@ -821,7 +821,7 @@ class TestVPCNetwork(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -842,7 +842,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@ -890,7 +890,7 @@ class TestVPCNetwork(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -952,7 +952,7 @@ class TestVPCNetwork(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -976,7 +976,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -1022,7 +1022,7 @@ class TestVPCNetwork(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1193,7 +1193,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1215,7 +1215,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.2.1.1',
@ -1255,7 +1255,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1277,7 +1277,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.2.1.1',
@ -1317,7 +1317,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1342,7 +1342,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -1384,7 +1384,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1406,7 +1406,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -1447,7 +1447,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -1465,7 +1465,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -1505,7 +1505,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1540,7 +1540,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=account.name,
domainid=account.account.domainid,
domainid=account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -1710,7 +1710,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1751,7 +1751,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_pf.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -1765,7 +1765,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -1774,7 +1774,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -1785,7 +1785,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_1.id,
vpcid=vpc.id
)
@ -1804,7 +1804,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
accountid=self.account.name,
networkid=network_1.id,
vpcid=vpc.id,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (
@ -1816,7 +1816,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_1.id,
vpcid=vpc.id
)
@ -1845,7 +1845,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.assertEqual(
isinstance(public_ips, list),
@ -1934,7 +1934,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_1.id,
vpcid=vpc.id
)
@ -2059,7 +2059,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -2099,7 +2099,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -2113,7 +2113,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -2182,7 +2182,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@ -2197,7 +2197,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@ -2208,7 +2208,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@ -2216,7 +2216,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@ -2224,7 +2224,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -2235,7 +2235,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
accountid=cls.account.name,
networkid=cls.network_1.id,
vpcid=cls.vpc.id,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.lb_rule.assign(cls.api_client, [cls.vm_1, cls.vm_2])
@ -2243,7 +2243,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -2289,7 +2289,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
for vm in vms:
@ -2305,7 +2305,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
for vm in vms:
@ -2396,7 +2396,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -2515,7 +2515,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(

18
test/integration/component/test_vpc_network_lbrules.py
View File

@ -244,7 +244,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
return
@ -264,7 +264,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
def get_Router_For_VPC(self):
routers = list_routers(self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
)
self.assertEqual(isinstance(routers, list),
True,
@ -287,7 +287,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
routers = list_routers(self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
)
self.assertEqual(isinstance(routers, list),
True,
@ -308,7 +308,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
routers = list_routers(self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
zoneid=self.zone.id
)
self.assertEqual(isinstance(routers, list),
@ -391,7 +391,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
public_ip = PublicIPAddress.create(self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=None, #network.id,
vpcid=self.vpc.id
)
@ -420,7 +420,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
return vpc
@ -442,7 +442,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
obj_network = Network.create(self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway=gateway,
@ -460,7 +460,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)],
hostid=host_id
@ -487,7 +487,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
accountid=self.account.name,
networkid=network.id,
vpcid=self.vpc.id,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (vmarray))
lb_rule.assign(self.apiclient, vmarray)

18
test/integration/component/test_vpc_network_pfrules.py
View File

@ -243,7 +243,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
return
@ -262,7 +262,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
def get_Router_For_VPC(self):
routers = list_routers(self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
)
self.assertEqual(isinstance(routers, list),
True,
@ -285,7 +285,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
routers = list_routers(self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
)
self.assertEqual(isinstance(routers, list),
True,
@ -306,7 +306,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
routers = list_routers(self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
zoneid=self.zone.id
)
self.assertEqual(isinstance(routers, list),
@ -391,7 +391,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
public_ip = PublicIPAddress.create(self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=None, #network.id,
vpcid=self.vpc.id
)
@ -420,7 +420,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
return vpc
@ -442,7 +442,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
obj_network = Network.create(self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway=gateway,
@ -460,7 +460,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)],
hostid=host_id
@ -487,7 +487,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
accountid=self.account.name,
networkid=network.id,
vpcid=self.vpc.id,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (vmarray))
lb_rule.assign(self.apiclient, vmarray)

18
test/integration/component/test_vpc_network_staticnatrule.py
View File

@ -243,7 +243,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
return
@ -262,7 +262,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
def get_Router_For_VPC(self):
routers = list_routers(self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
)
self.assertEqual(isinstance(routers, list),
True,
@ -285,7 +285,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
routers = list_routers(self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
)
self.assertEqual(isinstance(routers, list),
True,
@ -306,7 +306,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
routers = list_routers(self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
zoneid=self.zone.id
)
self.assertEqual(isinstance(routers, list),
@ -391,7 +391,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
public_ip = PublicIPAddress.create(self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=None, #network.id,
vpcid=self.vpc.id
)
@ -420,7 +420,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
return vpc
@ -442,7 +442,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
obj_network = Network.create(self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway=gateway,
@ -460,7 +460,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)],
hostid=host_id
@ -487,7 +487,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
accountid=self.account.name,
networkid=network.id,
vpcid=self.vpc.id,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (vmarray))
lb_rule.assign(self.apiclient, vmarray)

52
test/integration/component/test_vpc_offerings.py
View File

@ -315,7 +315,7 @@ class TestVPCOffering(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -340,7 +340,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@ -352,7 +352,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -363,7 +363,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@ -382,7 +382,7 @@ class TestVPCOffering(cloudstackTestCase):
accountid=self.account.name,
networkid=network.id,
vpcid=vpc.id,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("Associating public IP for network: %s" % vpc.name)
@ -390,7 +390,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@ -438,7 +438,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@ -467,7 +467,7 @@ class TestVPCOffering(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.assertEqual(
isinstance(public_ips, list),
@ -485,7 +485,7 @@ class TestVPCOffering(cloudstackTestCase):
# self.apiclient,
# accountid=self.account.name,
# zoneid=self.zone.id,
# domainid=self.account.account.domainid,
# domainid=self.account.domainid,
# networkid=network.id,
# vpcid=vpc.id
# )
@ -502,7 +502,7 @@ class TestVPCOffering(cloudstackTestCase):
# self.apiclient,
# publicipid=public_ip_4.ipaddress.id,
# account=self.account.name,
# domainid=self.account.account.domainid,
# domainid=self.account.domainid,
# networkid=network.id,
# vpcid=vpc.id
# )
@ -516,7 +516,7 @@ class TestVPCOffering(cloudstackTestCase):
# username="root",
# password="password",
# account=self.account.name,
# domainid=self.account.account.domainid
# domainid=self.account.domainid
# )
# except Exception as e:
# self.fail("Failed to create VPN user: %s" % e)
@ -525,7 +525,7 @@ class TestVPCOffering(cloudstackTestCase):
# remote_vpns = Vpn.list(
# self.apiclient,
# account=self.account.name,
# domainid=self.account.account.domainid,
# domainid=self.account.domainid,
# publicipid=public_ip_4.ipaddress.id,
# listall=True
# )
@ -596,7 +596,7 @@ class TestVPCOffering(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -612,7 +612,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@ -626,7 +626,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -637,7 +637,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@ -715,7 +715,7 @@ class TestVPCOffering(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -731,7 +731,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@ -745,7 +745,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -756,7 +756,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@ -836,7 +836,7 @@ class TestVPCOffering(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -852,7 +852,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@ -864,7 +864,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -875,7 +875,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@ -975,7 +975,7 @@ class TestVPCOffering(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("VPC network creation failed! (Test succeeded)")
self.debug("Enabling the VPC offering created")
@ -989,7 +989,7 @@ class TestVPCOffering(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)

56
test/integration/component/test_vpc_routers.py
View File

@ -214,7 +214,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls._cleanup.append(cls.service_offering)
@ -361,7 +361,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -436,7 +436,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -483,7 +483,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -499,7 +499,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -520,7 +520,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -548,7 +548,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -581,7 +581,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
router = routers[0]
@ -639,7 +639,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@ -656,7 +656,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@ -668,7 +668,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@ -676,7 +676,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@ -686,7 +686,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@ -694,14 +694,14 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
vms = VirtualMachine.list(
cls.apiclient,
account=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
listall=True
)
public_ip_1 = PublicIPAddress.create(
cls.apiclient,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -727,7 +727,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -748,7 +748,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=cls.account.name,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
# cls.assertEqual(
# isinstance(public_ips, list),
@ -766,7 +766,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -779,7 +779,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
accountid=cls.account.name,
networkid=cls.network_1.id,
vpcid=cls.vpc.id,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
lb_rule.assign(cls.apiclient, [vm_3])
@ -961,13 +961,13 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
public_ips = PublicIPAddress.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
for vm, public_ip in zip(vms, public_ips):
@ -1086,7 +1086,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1180,7 +1180,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1247,7 +1247,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1263,7 +1263,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1306,7 +1306,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1351,7 +1351,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1384,7 +1384,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
router = routers[0]

98
test/integration/component/test_vpc_vm_life_cycle.py
View File

@ -237,7 +237,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@ -253,7 +253,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@ -272,7 +272,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off_no_lb.id,
zoneid=cls.zone.id,
gateway='10.1.2.1',
@ -283,7 +283,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@ -292,7 +292,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@ -300,7 +300,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_2.id)]
)
@ -309,7 +309,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -320,7 +320,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
accountid=cls.account.name,
networkid=cls.network_1.id,
vpcid=cls.vpc.id,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.lb_rule.assign(cls.api_client, [cls.vm_1, cls.vm_2])
@ -328,7 +328,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -516,7 +516,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -966,7 +966,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@ -982,7 +982,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@ -1006,7 +1006,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.shared_nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.2.1',
@ -1017,7 +1017,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id),
str(cls.network_2.id)]
@ -1027,7 +1027,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id),
str(cls.network_2.id)]
@ -1036,7 +1036,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id),
str(cls.network_2.id)]
@ -1045,7 +1045,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -1056,7 +1056,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
accountid=cls.account.name,
networkid=cls.network_1.id,
vpcid=cls.vpc.id,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.lb_rule.assign(cls.api_client, [cls.vm_1, cls.vm_2, cls.vm_3])
@ -1064,7 +1064,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -1242,7 +1242,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1368,7 +1368,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1773,7 +1773,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@ -1789,7 +1789,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@ -1809,7 +1809,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off_no_lb.id,
zoneid=cls.zone.id,
gateway='10.1.2.1',
@ -1965,7 +1965,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id),
str(self.network_2.id)]
@ -1990,7 +1990,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=self.network_1.id,
listall=True
)
@ -2033,7 +2033,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id)]
)
@ -2111,7 +2111,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@ -2127,7 +2127,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@ -2146,7 +2146,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off_no_lb.id,
zoneid=cls.zone.id,
gateway='10.1.2.1',
@ -2157,7 +2157,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@ -2166,7 +2166,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@ -2174,7 +2174,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_2.id)]
)
@ -2183,7 +2183,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -2194,7 +2194,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
accountid=cls.account.name,
networkid=cls.network_1.id,
vpcid=cls.vpc.id,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.lb_rule.assign(cls.api_client, [cls.vm_1, cls.vm_2])
@ -2202,7 +2202,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -2405,7 +2405,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -2868,7 +2868,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@ -2884,7 +2884,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@ -2903,7 +2903,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkofferingid=cls.nw_off_no_lb.id,
zoneid=cls.zone.id,
gateway='10.1.2.1',
@ -2914,7 +2914,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_1.id,
networkids=[str(cls.network_1.id)]
)
@ -2923,7 +2923,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_1.id,
networkids=[str(cls.network_1.id)]
)
@ -2931,7 +2931,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_2.id,
networkids=[str(cls.network_2.id)]
)
@ -2940,7 +2940,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -2951,7 +2951,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
accountid=cls.account.name,
networkid=cls.network_1.id,
vpcid=cls.vpc.id,
domainid=cls.account.account.domainid
domainid=cls.account.domainid
)
cls.lb_rule.assign(cls.api_client, [cls.vm_1, cls.vm_2])
@ -2959,7 +2959,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.account.domainid,
domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@ -3057,7 +3057,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=self.network_1.id,
listall=True
)
@ -3072,7 +3072,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=self.network_2.id,
listall=True
)
@ -3204,7 +3204,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(

154
test/integration/component/test_vpc_vms_deployment.py
View File

@ -320,7 +320,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -339,7 +339,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -363,7 +363,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@ -378,7 +378,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.3.1',
@ -392,7 +392,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -404,7 +404,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@ -415,7 +415,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_3.id)]
)
@ -425,7 +425,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -468,7 +468,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
state="Running",
listall=True
)
@ -535,7 +535,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -554,7 +554,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -578,7 +578,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@ -593,7 +593,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.3.1',
@ -607,7 +607,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -619,7 +619,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@ -630,7 +630,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_3.id)]
)
@ -640,7 +640,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -720,7 +720,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
state="Running",
listall=True
)
@ -788,7 +788,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -807,7 +807,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -831,7 +831,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@ -846,7 +846,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.3.1',
@ -860,7 +860,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -872,7 +872,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@ -883,7 +883,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_3.id)]
)
@ -893,7 +893,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -965,7 +965,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.4.1',
@ -978,7 +978,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_4.id)]
)
@ -989,7 +989,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
state="Running",
listall=True
)
@ -1057,7 +1057,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1076,7 +1076,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -1100,7 +1100,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@ -1115,7 +1115,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.3.1',
@ -1129,7 +1129,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -1141,7 +1141,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@ -1152,7 +1152,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_3.id)]
)
@ -1162,7 +1162,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1236,7 +1236,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.4.1',
@ -1249,7 +1249,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_4.id)]
)
@ -1283,7 +1283,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
state="Running",
listall=True
)
@ -1337,7 +1337,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1360,7 +1360,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.0.1',
@ -1399,7 +1399,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway=gateway,
@ -1417,7 +1417,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway=gateway,
@ -1436,7 +1436,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway=gateway,
@ -1453,7 +1453,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@ -1512,7 +1512,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1531,7 +1531,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -1555,7 +1555,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@ -1569,7 +1569,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -1578,7 +1578,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -1590,7 +1590,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@ -1599,7 +1599,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@ -1609,7 +1609,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1650,7 +1650,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_1.id,
listall=True
)
@ -1685,7 +1685,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_2.id,
listall=True
)
@ -1704,7 +1704,7 @@ class TestVMDeployVPC(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1777,7 +1777,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@ -1796,7 +1796,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@ -1820,7 +1820,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@ -1834,7 +1834,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -1843,7 +1843,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@ -1855,7 +1855,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@ -1864,7 +1864,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@ -1874,7 +1874,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@ -1895,7 +1895,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_1.id,
vpcid=vpc.id
)
@ -1927,7 +1927,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_1.id,
vpcid=vpc.id
)
@ -1956,7 +1956,7 @@ class TestVMDeployVPC(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.assertEqual(
isinstance(public_ips, list),
@ -1974,7 +1974,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_2.id,
vpcid=vpc.id
)
@ -1993,7 +1993,7 @@ class TestVMDeployVPC(cloudstackTestCase):
accountid=self.account.name,
networkid=network_2.id,
vpcid=vpc.id,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (
@ -2066,7 +2066,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_2.id,
vpcid=vpc.id
)
@ -2098,7 +2098,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_2.id,
vpcid=vpc.id
)
@ -2127,7 +2127,7 @@ class TestVMDeployVPC(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.assertEqual(
isinstance(public_ips, list),
@ -2145,7 +2145,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_2.id,
vpcid=vpc.id
)
@ -2164,7 +2164,7 @@ class TestVMDeployVPC(cloudstackTestCase):
accountid=self.account.name,
networkid=network_2.id,
vpcid=vpc.id,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (
@ -2339,7 +2339,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid,
domainid=self.account.domainid,
networkid=network_1.id,
listall=True
)
@ -2447,7 +2447,7 @@ class TestVMDeployVPC(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
domainid=self.account.account.domainid
domainid=self.account.domainid
)
self.assertEqual(
networks,

4
test/integration/component/test_vpn_users.py
View File

@ -396,7 +396,7 @@ class TestVPNUsers(cloudstackTestCase):
DomainName=self.account.domain)
self.debug("Adding new user to VPN as a global admin: %s" %
admin.account.name)
admin.name)
try:
self.create_VPN_Users(api_client=api_client)
except Exception as e:
@ -438,7 +438,7 @@ class TestVPNUsers(cloudstackTestCase):
DomainName=self.account.domain)
self.debug("Adding new user to VPN as a domain admin: %s" %
admin.account.name)
admin.name)
try:
self.create_VPN_Users(api_client=api_client)
except Exception as e: