apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7508: Remove duplicate network offerings from test_data.py

Browse Source
This commit is contained in:
sanjeev 2014-09-08 17:21:11 +05:30
parent 23f5772c30
commit 535e7a6670
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/marvin/marvin/config/test_data.py
View File

@ -572,7 +572,7 @@ test_data = {
"supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat,NetworkACL",
"traffictype": "GUEST",
"availability": "Optional",
"ispersistent": "False",
"ispersistent": "True",
"useVpc": "on",
"serviceProviderList": {
"Dhcp": "VpcVirtualRouter",
@ -593,7 +593,7 @@ test_data = {
"supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,UserData,StaticNat,NetworkACL",
"traffictype": "GUEST",
"availability": "Optional",
"ispersistent": "False",
"ispersistent": "True",
"useVpc": "on",
"serviceProviderList": {
"Dhcp": "VpcVirtualRouter",
@ -653,28 +653,6 @@ test_data = {
"StaticNat": 'VirtualRouter',
},
},
"nw_off_persistent_VPCVR_NoLB": {
"name": 'VPC Network offering',
"displaytext": 'VPC Network off',
"guestiptype": 'Isolated',
"supportedservices":
'Vpn,Dhcp,Dns,SourceNat,PortForwarding,UserData,StaticNat,NetworkACL',
"traffictype": 'GUEST',
"availability": 'Optional',
"ispersistent": 'True',
"useVpc": 'on',
"serviceProviderList": {
"Vpn": 'VpcVirtualRouter',
"Dhcp": 'VpcVirtualRouter',
"Dns": 'VpcVirtualRouter',
"SourceNat": 'VpcVirtualRouter',
"PortForwarding": 'VpcVirtualRouter',
"UserData": 'VpcVirtualRouter',
"StaticNat": 'VpcVirtualRouter',
"NetworkACL": 'VpcVirtualRouter'
},
},
"network_acl_rule": {
"protocol":"TCP",