Skip to content

Commit 68b4b84

Browse files
yadvryadvr
authored
marvin: add missing test data for test_migration smoketest (apache#3106)
Add missing test data for test_migration smoketest, use test_template for smoketest. Signed-off-by: Rohit Yadav <[email protected]>
1 parent a7ccbdc commit 68b4b84

2 files changed

Lines changed: 25 additions & 5 deletions

File tree

‎test/integration/smoke/test_service_offerings.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
list_virtual_machines,
3232
get_domain,
3333
get_zone,
34-
get_template,
34+
get_test_template,
3535
list_hosts)
3636
from nose.plugins.attrib import attr
3737

@@ -167,13 +167,13 @@ def setUpClass(cls):
167167
cls.apiclient,
168168
cls.services["service_offerings"]["tiny"]
169169
)
170-
template = get_template(
170+
template = get_test_template(
171171
cls.apiclient,
172172
cls.zone.id,
173173
cls.hypervisor
174174
)
175175
if template == FAILED:
176-
assert False, "get_template() failed to return template"
176+
assert False, "get_test_template() failed to return template"
177177

178178
# Set Zones and disk offerings
179179
cls.services["small"]["zoneid"] = cls.zone.id
@@ -458,9 +458,9 @@ def setUpClass(cls):
458458
cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
459459
cls.services['mode'] = cls.zone.networktype
460460

461-
template = get_template(cls.apiclient, cls.zone.id, cls.hypervisor)
461+
template = get_test_template(cls.apiclient, cls.zone.id, cls.hypervisor)
462462
if template == FAILED:
463-
assert False, "get_template() failed to return template"
463+
assert False, "get_test_template() failed to return template"
464464

465465
cls.services["small"]["zoneid"] = cls.zone.id
466466
cls.services["small"]["template"] = template.id

‎tools/marvin/marvin/config/test_data.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,26 @@
644644
"Lb": "VpcVirtualRouter"
645645
}
646646
},
647+
"nw_offering_reduced_vpc": {
648+
"name": 'Reduced Network for VPC',
649+
"displaytext": 'Reduced Network for VPC',
650+
"guestiptype": 'Isolated',
651+
"supportedservices": 'Dhcp,StaticNat,SourceNat,NetworkACL,UserData,'
652+
'Dns',
653+
"traffictype": 'GUEST',
654+
"availability": 'Optional',
655+
"tags": "native",
656+
"useVpc": 'on',
657+
"ispersistent": 'True',
658+
"serviceProviderList": {
659+
"Dhcp": "VpcVirtualRouter",
660+
"StaticNat": "VpcVirtualRouter",
661+
"SourceNat": "VpcVirtualRouter",
662+
"NetworkACL": "VpcVirtualRouter",
663+
"UserData": "VpcVirtualRouter",
664+
"Dns": "VpcVirtualRouter"
665+
}
666+
},
647667
"nw_off_persistent_VPCVR_LB": {
648668
"name": "Persistent Network VPC with LB",
649669
"displaytext": "Persistent Network VPC No LB",

0 commit comments

Comments
 (0)