From 93db64fc2531d72713c6b26d9e749f9aa6fd6640 Mon Sep 17 00:00:00 2001 From: Talluri Date: Wed, 8 May 2013 00:57:26 +0530 Subject: [PATCH] CLOUDSTACK-2359: fix missing network type in the test scripts test_volumes.py and test_templates.py Signed-off-by: Prasanna Santhanam --- 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 deletion(-) diff --git a/test/integration/smoke/test_guest_vlan_range.py b/test/integration/smoke/test_guest_vlan_range.py index 13cf335b893..bd533430f51 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", } diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py index fa4bc4014ec..b2ad4ca5634 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) diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py index ecac8c903c1..4bf8203e74c 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"]