cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject [1/3] CLOUDSTACK-2237: Automation-Adding next set of test cases for feature - SG in advanced zone
Date Tue, 14 Jan 2014 09:05:43 GMT
Updated Branches:
  refs/heads/master 16d36dd75 -> c108d7f0d


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c108d7f0/tools/marvin/marvin/config/config.cfg
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/config.cfg b/tools/marvin/marvin/config/config.cfg
index 5849fe8..7840b7c 100644
--- a/tools/marvin/marvin/config/config.cfg
+++ b/tools/marvin/marvin/config/config.cfg
@@ -43,8 +43,8 @@
                              "memory": 128
                             },
         "isolated_network_offering": {
-                                      "name": "Network offering-DA services",
-                                      "displaytext": "Network offering-DA services",
+                                      "name": "Isolated Network offering",
+                                      "displaytext": "Isolated Network offering",
                                       "guestiptype": "Isolated",
                                       "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat",
                                       "traffictype": "GUEST",
@@ -75,8 +75,8 @@
                             "protocol": "TCP"
                             },
         "shared_network": {
-                           "name": "MySharedNetwork - Test",
-                           "displaytext": "MySharedNetwork",
+                           "name": "Test Shared Network",
+                           "displaytext": "Test Shared Network",
                            "vlan" : "",
                            "gateway" :"",
                            "netmask" :"",
@@ -86,8 +86,8 @@
                            "scope":"all"
                           },
         "shared_network_offering_sg": {
-                                    "name": "MySharedOffering-sg",
-                                    "displaytext": "MySharedOffering-sg",
+                                    "name": "SharedNwOffering-sg",
+                                    "displaytext": "SharedNwOffering-sg",
                                     "guestiptype": "Shared",
                                     "supportedservices": "Dhcp,Dns,UserData,SecurityGroup",
                                     "specifyVlan" : "False",
@@ -103,7 +103,7 @@
         "shared_network_sg": {
                                   "name": "Shared-Network-SG-Test",
                                   "displaytext": "Shared-Network_SG-Test",
-                                  "networkofferingid":"1",
+                                  "networkofferingid":"",
                                   "vlan" : "",
                                   "gateway" :"",
                                   "netmask" :"255.255.255.0",
@@ -123,8 +123,8 @@
                 "cidr": "10.0.0.1/24"
                 },
         "shared_network_offering": {
-                                    "name": "MySharedOffering",
-                                    "displaytext": "MySharedOffering",
+                                    "name": "SharedNwOffering",
+                                    "displaytext": "SharedNwOffering",
                                     "guestiptype": "Shared",
                                     "supportedservices": "Dhcp,Dns,UserData",
                                     "specifyVlan" : "False",
@@ -140,7 +140,7 @@
         "ingress_rule": {
                          "protocol": "TCP",
                          "startport": "22",
-                         "endport": "22",
+                         "endport": "80",
                          "cidrlist": "0.0.0.0/0"
                         },
         "ostype": "CentOS 5.3 (64-bit)",


Mime
View raw message