diff --git a/test/integration/smoke/test_service_offerings.py b/test/integration/smoke/test_service_offerings.py index 9d05a7ac3e5..9d4650b88a3 100644 --- a/test/integration/smoke/test_service_offerings.py +++ b/test/integration/smoke/test_service_offerings.py @@ -31,7 +31,7 @@ from marvin.lib.common import (list_service_offering, list_virtual_machines, get_domain, get_zone, - get_template, + get_test_template, list_hosts) from nose.plugins.attrib import attr @@ -167,13 +167,13 @@ class TestServiceOfferings(cloudstackTestCase): cls.apiclient, cls.services["service_offerings"]["tiny"] ) - template = get_template( + template = get_test_template( cls.apiclient, cls.zone.id, cls.hypervisor ) if template == FAILED: - assert False, "get_template() failed to return template" + assert False, "get_test_template() failed to return template" # Set Zones and disk offerings cls.services["small"]["zoneid"] = cls.zone.id @@ -458,9 +458,9 @@ class TestCpuCapServiceOfferings(cloudstackTestCase): cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests()) cls.services['mode'] = cls.zone.networktype - template = get_template(cls.apiclient, cls.zone.id, cls.hypervisor) + template = get_test_template(cls.apiclient, cls.zone.id, cls.hypervisor) if template == FAILED: - assert False, "get_template() failed to return template" + assert False, "get_test_template() failed to return template" cls.services["small"]["zoneid"] = cls.zone.id cls.services["small"]["template"] = template.id diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index b8ebcb6cbaf..7c5ce5c503f 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -644,6 +644,26 @@ test_data = { "Lb": "VpcVirtualRouter" } }, + "nw_offering_reduced_vpc": { + "name": 'Reduced Network for VPC', + "displaytext": 'Reduced Network for VPC', + "guestiptype": 'Isolated', + "supportedservices": 'Dhcp,StaticNat,SourceNat,NetworkACL,UserData,' + 'Dns', + "traffictype": 'GUEST', + "availability": 'Optional', + "tags": "native", + "useVpc": 'on', + "ispersistent": 'True', + "serviceProviderList": { + "Dhcp": "VpcVirtualRouter", + "StaticNat": "VpcVirtualRouter", + "SourceNat": "VpcVirtualRouter", + "NetworkACL": "VpcVirtualRouter", + "UserData": "VpcVirtualRouter", + "Dns": "VpcVirtualRouter" + } + }, "nw_off_persistent_VPCVR_LB": { "name": "Persistent Network VPC with LB", "displaytext": "Persistent Network VPC No LB",