You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/05/09 20:01:43 UTC
[28/50] [abbrv] git commit: updated refs/heads/vmware-datamodel to
57444fc
CLOUDSTACK-2359: fix missing network type in the test scripts test_volumes.py and test_templates.py
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/93db64fc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93db64fc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93db64fc
Branch: refs/heads/vmware-datamodel
Commit: 93db64fc2531d72713c6b26d9e749f9aa6fd6640
Parents: 548a8d8
Author: Talluri <Sr...@citrix.com>
Authored: Wed May 8 00:57:26 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed May 8 14:26:40 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_guest_vlan_range.py | 2 +-
test/integration/smoke/test_templates.py | 1 +
test/integration/smoke/test_volumes.py | 1 +
3 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93db64fc/test/integration/smoke/test_guest_vlan_range.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_guest_vlan_range.py b/test/integration/smoke/test_guest_vlan_range.py
index 13cf335..bd53343 100644
--- a/test/integration/smoke/test_guest_vlan_range.py
+++ b/test/integration/smoke/test_guest_vlan_range.py
@@ -44,7 +44,7 @@ class Services:
"password": "password",
},
"name": "testphysicalnetwork",
- "vlan": "118-120",
+ "vlan": "2118-2120",
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93db64fc/test/integration/smoke/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py
index fa4bc40..b2ad4ca 100644
--- a/test/integration/smoke/test_templates.py
+++ b/test/integration/smoke/test_templates.py
@@ -292,6 +292,7 @@ class TestTemplates(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'] = cls.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/93db64fc/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index ecac8c9..4bf8203 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -287,6 +287,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'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"]