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 2014/09/08 14:09:40 UTC
git commit: updated refs/heads/master to 535e7a6
Repository: cloudstack
Updated Branches:
refs/heads/master 23f5772c3 -> 535e7a667
CLOUDSTACK-7508: Remove duplicate network offerings from test_data.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/535e7a66
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/535e7a66
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/535e7a66
Branch: refs/heads/master
Commit: 535e7a667049e37d6a03c7a3e2e5c9645e6ce1f6
Parents: 23f5772
Author: sanjeev <sa...@apache.org>
Authored: Mon Sep 8 17:21:11 2014 +0530
Committer: sanjeev <sa...@apache.org>
Committed: Mon Sep 8 17:21:11 2014 +0530
----------------------------------------------------------------------
tools/marvin/marvin/config/test_data.py | 26 ++------------------------
1 file changed, 2 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/535e7a66/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index b81d09a..4133aba 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -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",
@@ -654,28 +654,6 @@ test_data = {
},
},
- "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",
"traffictype":"ingress",