You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/04/18 04:26:14 UTC
[26/41] git commit: updated refs/heads/marvin_refactor to 94b18c6
CLOUDSTACK-2032: populate mode in the services dict from the list zones instead of hard coding
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ee3cc41
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ee3cc41
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ee3cc41
Branch: refs/heads/marvin_refactor
Commit: 5ee3cc41fecb08b0dba16341fef12684a50ecc98
Parents: 7cc82db
Author: Talluri <Sr...@citrix.com>
Authored: Wed Apr 17 23:36:05 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Apr 17 19:40:13 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_accounts.py | 10 ++++++++--
.../component/test_allocation_states.py | 2 +-
test/integration/component/test_blocker_bugs.py | 8 ++++++--
test/integration/component/test_egress_rules.py | 13 +++++++++++--
test/integration/component/test_eip_elb.py | 3 ++-
.../integration/component/test_network_offering.py | 5 ++++-
test/integration/component/test_project_configs.py | 6 +++++-
test/integration/component/test_project_limits.py | 4 +++-
.../component/test_project_resources.py | 7 ++++++-
test/integration/component/test_project_usage.py | 10 +++++++++-
test/integration/component/test_projects.py | 8 +++++++-
test/integration/component/test_resource_limits.py | 4 +++-
test/integration/component/test_routers.py | 5 ++++-
test/integration/component/test_security_groups.py | 9 +++++++--
test/integration/component/test_snapshots.py | 8 +++++++-
test/integration/component/test_templates.py | 3 ++-
test/integration/component/test_usage.py | 10 +++++++++-
.../integration/component/test_vm_passwdenabled.py | 1 +
test/integration/component/test_volumes.py | 6 +++++-
19 files changed, 100 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index cdb3e58..882423e 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -95,7 +95,6 @@ class Services:
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
- "mode": 'advanced'
}
@@ -110,6 +109,7 @@ class TestAccounts(cloudstackTestCase):
cls.services = Services().services
# Get Zone, Domain and templates
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -239,6 +239,7 @@ class TestRemoveUserFromAccount(cloudstackTestCase):
cls.services = Services().services
# Get Zone, Domain and templates
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -506,7 +507,7 @@ class TestNonRootAdminsPrivileges(cloudstackTestCase):
cls.services = Services().services
# Get Zone settings
cls.zone = get_zone(cls.api_client, cls.services)
-
+ cls.services['mode'] = zone.networktype
# Create an account, domain etc
cls.domain = Domain.create(
cls.api_client,
@@ -852,6 +853,7 @@ class TesttemplateHierarchy(cloudstackTestCase):
cls.services = Services().services
# Get Zone settings
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.services["template"]["zoneid"] = cls.zone.id
# Create domains, accounts and template
@@ -1000,6 +1002,7 @@ class TestAddVmToSubDomain(cloudstackTestCase):
cls.api_client,
cls.services,
)
+ cls.services['mode'] = zone.networktype
cls.sub_domain = Domain.create(
cls.api_client,
cls.services["domain"],
@@ -1145,6 +1148,7 @@ class TestUserDetails(cloudstackTestCase):
# Get Zone, Domain etc
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls._cleanup = []
return
@@ -1451,6 +1455,7 @@ class TestUserLogin(cloudstackTestCase):
# Get Zone, Domain etc
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls._cleanup = []
return
@@ -1615,6 +1620,7 @@ class TestDomainForceRemove(cloudstackTestCase):
cls.api_client,
cls.services,
)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_allocation_states.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_allocation_states.py b/test/integration/component/test_allocation_states.py
index 103cb10..efbb3ba 100644
--- a/test/integration/component/test_allocation_states.py
+++ b/test/integration/component/test_allocation_states.py
@@ -79,7 +79,6 @@ class Services:
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
- "mode": 'advanced',
}
@@ -94,6 +93,7 @@ class TestAllocationState(cloudstackTestCase):
cls.services = Services().services
# Get Zone, Domain and templates
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls._cleanup = []
return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_blocker_bugs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py
index 33e4a73..e85a073 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -101,8 +101,6 @@ class Services:
"ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
- "mode": 'advanced',
- # Networking mode, Advanced, Basic
}
@@ -115,6 +113,7 @@ class TestSnapshots(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"]
@@ -422,6 +421,7 @@ class TestTemplate(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["templates"]["zoneid"] = cls.zone.id
@@ -543,6 +543,7 @@ class TestNATRules(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
@@ -737,6 +738,7 @@ class TestRouters(cloudstackTestCase):
cls.services = Services().services
# Get Zone, Domain and templates
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -863,6 +865,7 @@ class TestRouterRestart(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
@@ -992,6 +995,7 @@ class TestTemplates(cloudstackTestCase):
# Get Zone, templates etc
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_egress_rules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_egress_rules.py b/test/integration/component/test_egress_rules.py
index 6b9cd4f..ffcb299 100644
--- a/test/integration/component/test_egress_rules.py
+++ b/test/integration/component/test_egress_rules.py
@@ -122,8 +122,6 @@ class Services:
# CentOS 5.3 (64-bit)
"sleep": 60,
"timeout": 10,
- "mode": 'basic',
- # Networking mode: Basic or Advanced
}
@@ -156,6 +154,7 @@ class TestDefaultSecurityGroupEgress(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -314,6 +313,7 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -471,6 +471,7 @@ class TestDefaultGroupEgress(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -671,6 +672,7 @@ class TestDefaultGroupEgressAfterDeploy(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -853,6 +855,7 @@ class TestRevokeEgressRule(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -1114,6 +1117,7 @@ class TestInvalidAccountAuthroize(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -1235,6 +1239,7 @@ class TestMultipleAccountsEgressRuleNeg(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -1482,6 +1487,7 @@ class TestMultipleAccountsEgressRule(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -1778,6 +1784,7 @@ class TestStartStopVMWithEgressRule(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -1989,6 +1996,7 @@ class TestInvalidParametersForEgress(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -2171,6 +2179,7 @@ class TestEgressAfterHostMaintainance(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.pod = get_pod(
cls.api_client,
zoneid=cls.zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_eip_elb.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_eip_elb.py b/test/integration/component/test_eip_elb.py
index 89fdd25..c588c1b 100644
--- a/test/integration/component/test_eip_elb.py
+++ b/test/integration/component/test_eip_elb.py
@@ -85,7 +85,6 @@ class Services:
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
- "mode": 'basic'
}
class TestEIP(cloudstackTestCase):
@@ -97,6 +96,7 @@ class TestEIP(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -919,6 +919,7 @@ class TestELB(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_network_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_network_offering.py b/test/integration/component/test_network_offering.py
index 0de03aa..cc6f25e 100644
--- a/test/integration/component/test_network_offering.py
+++ b/test/integration/component/test_network_offering.py
@@ -142,7 +142,6 @@ class Services:
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
- "mode": 'advanced'
}
@@ -158,6 +157,7 @@ class TestNOVirtualRouter(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -736,6 +736,7 @@ class TestNOWithNetscaler(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -1371,6 +1372,7 @@ class TestNetworkUpgrade(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -1827,6 +1829,7 @@ class TestSharedNetworkWithoutIp(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_project_configs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_configs.py b/test/integration/component/test_project_configs.py
index 854b5a4..92290d0 100644
--- a/test/integration/component/test_project_configs.py
+++ b/test/integration/component/test_project_configs.py
@@ -102,7 +102,6 @@ class Services:
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
- "mode": 'advanced'
}
@@ -117,6 +116,7 @@ class TestUserProjectCreation(cloudstackTestCase):
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
configs = Configurations.list(
cls.api_client,
@@ -282,6 +282,7 @@ class TestProjectCreationNegative(cloudstackTestCase):
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
# Checking for prereqisits - global configs
configs = Configurations.list(
@@ -427,6 +428,7 @@ class TestProjectInviteRequired(cloudstackTestCase):
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
# Create domains, account etc.
cls.domain = get_domain(cls.api_client, cls.services)
@@ -578,6 +580,7 @@ class TestProjectInviteRequiredTrue(cloudstackTestCase):
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
# Create domains, account etc.
cls.domain = get_domain(cls.api_client, cls.services)
@@ -730,6 +733,7 @@ class TestProjectInviteTimeout(cloudstackTestCase):
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
# Create domains, account etc.
cls.domain = get_domain(cls.api_client, cls.services)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py
index afae180..2eceb88 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -116,7 +116,6 @@ class Services:
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
- "mode": 'advanced',
}
@@ -131,6 +130,7 @@ class TestProjectLimits(cloudstackTestCase):
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
# Create domains, account etc.
cls.domain = Domain.create(
@@ -481,6 +481,7 @@ class TestResourceLimitsProject(cloudstackTestCase):
cls.services = Services().services
# Get Zone, Domain and templates
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
@@ -921,6 +922,7 @@ class TestMaxProjectNetworks(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_project_resources.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py
index 24091d2..9ad0365 100644
--- a/test/integration/component/test_project_resources.py
+++ b/test/integration/component/test_project_resources.py
@@ -134,7 +134,6 @@ class Services:
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
- "mode": 'advanced',
}
@@ -149,6 +148,7 @@ class TestOfferings(cloudstackTestCase):
cls.services = Services().services
# Get Zone and template
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -329,6 +329,7 @@ class TestNetwork(cloudstackTestCase):
cls.services = Services().services
# Get Zone and template
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -516,6 +517,7 @@ class TestTemplates(cloudstackTestCase):
cls.services = Services().services
# Get Zone, Domain and templates
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
@@ -745,6 +747,7 @@ class TestSnapshots(cloudstackTestCase):
cls.services = Services().services
# Get Zone, Domain and templates
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
@@ -891,6 +894,7 @@ class TestPublicIpAddress(cloudstackTestCase):
cls.services = Services().services
# Get Zone, Domain and templates
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
@@ -1190,6 +1194,7 @@ class TestSecurityGroup(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index 9f0488d..34335b7 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -109,7 +109,6 @@ class Services:
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
- "mode": 'advanced'
}
@@ -125,6 +124,7 @@ class TestVmUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -319,6 +319,7 @@ class TestPublicIPUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
@@ -490,6 +491,7 @@ class TestVolumeUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"]
@@ -674,6 +676,7 @@ class TestTemplateUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id
template = get_template(
cls.api_client,
@@ -846,6 +849,7 @@ class TestISOUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id
cls.services["iso"]["zoneid"] = cls.zone.id
# Create Account, ISO image etc
@@ -993,6 +997,7 @@ class TestLBRuleUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
@@ -1175,6 +1180,7 @@ class TestSnapshotUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -1352,6 +1358,7 @@ class TestNatRuleUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
@@ -1534,6 +1541,7 @@ class TestVpnUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_projects.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py
index 3e45cae..767cb06 100644
--- a/test/integration/component/test_projects.py
+++ b/test/integration/component/test_projects.py
@@ -96,7 +96,6 @@ class Services:
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
- "mode": 'advanced'
}
@@ -111,6 +110,7 @@ class TestMultipleProjectCreation(cloudstackTestCase):
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
# Create domains, account etc.
cls.domain = get_domain(
@@ -323,6 +323,7 @@ class TestCrossDomainAccountAdd(cloudstackTestCase):
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.domain = get_domain(
cls.api_client,
cls.services
@@ -456,6 +457,7 @@ class TestDeleteAccountWithProject(cloudstackTestCase):
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.domain = get_domain(
cls.api_client,
cls.services
@@ -569,6 +571,7 @@ class TestDeleteDomainWithProject(cloudstackTestCase):
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
configs = Configurations.list(
cls.api_client,
@@ -713,6 +716,7 @@ class TestProjectOwners(cloudstackTestCase):
cls.services
)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
configs = Configurations.list(
cls.api_client,
@@ -1136,6 +1140,7 @@ class TestProjectResources(cloudstackTestCase):
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.domain = get_domain(
cls.api_client,
cls.services
@@ -1444,6 +1449,7 @@ class TestProjectSuspendActivate(cloudstackTestCase):
cls.services = Services().services
# Get Zone, domain, template etc
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.domain = get_domain(
cls.api_client,
cls.services
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_resource_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py
index c20770a..3e7548e 100644
--- a/test/integration/component/test_resource_limits.py
+++ b/test/integration/component/test_resource_limits.py
@@ -105,7 +105,6 @@ class Services:
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
- "mode": 'advanced',
}
@@ -118,6 +117,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
@@ -881,6 +881,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
cls.services = Services().services
# Get Zone, Domain and templates
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
@@ -1338,6 +1339,7 @@ class TestMaxAccountNetworks(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py
index 02a08de..41bf23f 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -91,7 +91,6 @@ class Services:
},
"ostype": 'CentOS 5.3 (64-bit)',
# Used for Get_Template : CentOS 5.3 (64 bit)
- "mode": 'advanced', # Networking mode: Advanced, basic
}
@@ -105,6 +104,7 @@ class TestRouterServices(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -592,6 +592,7 @@ class TestRouterStopCreatePF(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
@@ -803,6 +804,7 @@ class TestRouterStopCreateLB(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
@@ -1014,6 +1016,7 @@ class TestRouterStopCreateFW(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_security_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index 39f6d6f..4255d42 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -94,8 +94,6 @@ class Services:
# CentOS 5.3 (64-bit)
"sleep": 60,
"timeout": 10,
- "mode": 'basic',
- # Networking mode: Basic or Advanced
}
@@ -125,6 +123,7 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -397,6 +396,7 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -532,6 +532,7 @@ class TestRevokeIngressRule(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -690,6 +691,7 @@ class TestDhcpOnlyRouter(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -826,6 +828,7 @@ class TestdeployVMWithUserData(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -985,6 +988,7 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
# Get Zone, Domain and templates
self.domain = get_domain(self.apiclient, self.services)
self.zone = get_zone(self.apiclient, self.services)
+ self.services['mode'] = zone.networktype
template = get_template(
self.apiclient,
@@ -1230,6 +1234,7 @@ class TestIngressRule(cloudstackTestCase):
# Get Zone, Domain and templates
self.domain = get_domain(self.apiclient, self.services)
self.zone = get_zone(self.apiclient, self.services)
+ self.services['mode'] = zone.networktype
template = get_template(
self.apiclient,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py
index 825b8c6..9ff57ab 100644
--- a/test/integration/component/test_snapshots.py
+++ b/test/integration/component/test_snapshots.py
@@ -121,7 +121,6 @@ class Services:
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
- "mode": 'advanced', # Networking mode: Advanced, Basic
}
@@ -134,6 +133,7 @@ class TestSnapshotRootDisk(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -356,6 +356,7 @@ class TestSnapshots(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"]
@@ -1190,6 +1191,7 @@ class TestCreateVMsnapshotTemplate(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.template = get_template(
cls.api_client,
@@ -1485,6 +1487,7 @@ class TestAccountSnapshotClean(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -1833,6 +1836,7 @@ class TestSnapshotDetachedDisk(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -2120,6 +2124,7 @@ class TestSnapshotLimit(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -2378,6 +2383,7 @@ class TestSnapshotEvents(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py
index 65d9fe0..980640d 100644
--- a/test/integration/component/test_templates.py
+++ b/test/integration/component/test_templates.py
@@ -97,7 +97,6 @@ class Services:
"ostype": 'CentOS 5.3 (64-bit)',
"sleep": 60,
"timeout": 10,
- "mode": 'advanced', # Networking mode: Advanced, basic
}
@@ -128,6 +127,7 @@ class TestCreateTemplate(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.service_offering = ServiceOffering.create(
@@ -283,6 +283,7 @@ class TestTemplates(cloudstackTestCase):
# Get Zone, templates etc
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
#populate second zone id for iso copy
cmd = listZones.listZonesCmd()
zones = cls.api_client.listZones(cmd)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py
index 82d13e5..27e3719 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -105,7 +105,6 @@ class Services:
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
- "mode": 'advanced'
}
@@ -118,6 +117,7 @@ class TestVmUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -301,6 +301,7 @@ class TestPublicIPUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -452,6 +453,7 @@ class TestVolumeUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"]
@@ -625,6 +627,7 @@ class TestTemplateUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id
template = get_template(
cls.api_client,
@@ -789,6 +792,7 @@ class TestISOUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id
cls.services["iso"]["zoneid"] = cls.zone.id
# Create Account, ISO image etc
@@ -925,6 +929,7 @@ class TestLBRuleUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
@@ -1086,6 +1091,7 @@ class TestSnapshotUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
@@ -1252,6 +1258,7 @@ class TestNatRuleUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
@@ -1413,6 +1420,7 @@ class TestVpnUsage(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_vm_passwdenabled.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py
index fb88170..eccc488 100644
--- a/test/integration/component/test_vm_passwdenabled.py
+++ b/test/integration/component/test_vm_passwdenabled.py
@@ -83,6 +83,7 @@ class TestVMPasswordEnabled(cloudstackTestCase):
# Get Zone, Domain and templates
domain = get_domain(cls.api_client, cls.services)
zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee3cc41/test/integration/component/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py
index bedf6ef..d1f3cf5 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -87,7 +87,6 @@ class Services:
},
"sleep": 50,
"ostype": 'CentOS 5.3 (64-bit)',
- "mode": 'advanced',
}
@@ -101,6 +100,7 @@ class TestAttachVolume(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"]
@@ -371,6 +371,7 @@ class TestAttachDetachVolume(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"]
@@ -616,6 +617,7 @@ class TestAttachVolumeISO(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"]
@@ -807,6 +809,7 @@ class TestVolumes(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"]
@@ -1046,6 +1049,7 @@ class TestDeployVmWithCustomDisk(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"],