cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pdion...@apache.org
Subject [1/3] git commit: updated refs/heads/4.5 to 98d75b0
Date Tue, 02 Dec 2014 15:04:16 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 d42e3df9c -> 98d75b025


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98d75b02/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 77a5b74..d644dc3 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -323,6 +323,7 @@ test_data = {
             "name": "webvms",
             "type": "host anti-affinity",
         },
+        "userdata": "This is sample data"
     },
     "virtual_machine2": {
         "name": "testvm2",
@@ -800,6 +801,13 @@ test_data = {
         "endport": "22",
         "cidrlist": "0.0.0.0/0"
     },
+    "ingress_rule_ICMP": {
+        "name": 'ICMP',
+        "protocol": 'ICMP',
+        "startport": -1,
+        "endport": -1,
+        "cidrlist": '0.0.0.0/0',
+    },
     "vpncustomergateway": {
             "ipsecpsk": "secreatKey",
             "ikepolicy": "aes128-sha1",
@@ -1435,5 +1443,10 @@ test_data = {
             "url": "",
             "name": "Primary iSCSI"
         },
+        "host": {
+                 "publicport": 22,
+                 "username": "root",
+                 "password": "password",
+        }
     }
 }


Mime
View raw message