You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/04/16 20:34:19 UTC
[14/46] git commit: updated refs/heads/internallb to b7709b8
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/e7090e69
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e7090e69
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e7090e69
Branch: refs/heads/internallb
Commit: e7090e6933f7fa2731c817ead10dfafd650a8e85
Parents: 97911e9
Author: Srikanteswararao Talluri <sr...@citrix.com>
Authored: Mon Apr 15 16:47:40 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Apr 15 18:12:23 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_iso.py | 3 +--
test/integration/smoke/test_network.py | 4 +---
test/integration/smoke/test_routers.py | 2 +-
test/integration/smoke/test_templates.py | 3 +--
test/integration/smoke/test_vm_life_cycle.py | 2 +-
test/integration/smoke/test_volumes.py | 2 +-
6 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7090e69/test/integration/smoke/test_iso.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py
index 5bd7bb3..3f8f11a 100644
--- a/test/integration/smoke/test_iso.py
+++ b/test/integration/smoke/test_iso.py
@@ -79,8 +79,6 @@ class Services:
"timeout": 10,
"ostype": "CentOS 5.3 (64-bit)",
# CentOS 5.3 (64 bit)
- "mode": 'advanced'
- # Networking mode: Basic or Advanced
}
@@ -93,6 +91,7 @@ class TestCreateIso(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
self.services["domainid"] = self.domain.id
self.services["iso_2"]["zoneid"] = self.zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7090e69/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index e78cc43..e2c63a4 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -38,8 +38,6 @@ class Services:
self.services = {
"ostype": "CentOS 5.3 (64-bit)",
# Cent OS 5.3 (64 bit)
- "mode": 'advanced',
- # Networking mode: Basic or advanced
"lb_switch_wait": 10,
# Time interval after which LB switches the requests
"sleep": 60,
@@ -120,7 +118,7 @@ class TestPublicIP(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
# Create Accounts & networks
cls.account = Account.create(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7090e69/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index 435c7e4..93116bf 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -64,7 +64,6 @@ class Services:
"ostype": "CentOS 5.3 (64-bit)",
"sleep": 60,
"timeout": 10,
- "mode": 'advanced', #Networking mode: Basic, Advanced
}
@@ -81,6 +80,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)
+ self.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7090e69/test/integration/smoke/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py
index 663b174..2b0e2f5 100644
--- a/test/integration/smoke/test_templates.py
+++ b/test/integration/smoke/test_templates.py
@@ -93,8 +93,6 @@ class Services:
"bootable": True,
"passwordenabled": True,
"ostype": "CentOS 5.3 (64-bit)",
- "mode": 'advanced',
- # Networking mode: Advanced, basic
"sleep": 30,
"timeout": 10,
}
@@ -126,6 +124,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.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"]
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7090e69/test/integration/smoke/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index 564f6e8..cf9fd75 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -1038,4 +1038,4 @@ class TestVMLifeCycle(cloudstackTestCase):
False,
"Check if ISO is detached from virtual machine"
)
- return
\ No newline at end of file
+ return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7090e69/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index 7d910d4..9aa44eb 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -84,7 +84,6 @@ class Services:
"protocol": 'TCP',
"diskdevice": "/dev/xvdb",
"ostype": 'CentOS 5.5 (64-bit)',
- "mode": 'advanced',
"sleep": 10,
"timeout": 600,
}
@@ -100,6 +99,7 @@ class TestCreateVolume(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"]