cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [14/29] git commit: updated refs/heads/master-6-17-stable to 93712c2
Date Fri, 28 Jun 2013 19:22:35 GMT
serviceCapabilityList is case sensitive

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 24258648bf2fc298318e8cf446b62ecf6b8afef8)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4510667f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4510667f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4510667f

Branch: refs/heads/master-6-17-stable
Commit: 4510667f44560afe37f9cf881c37b41425aee796
Parents: 9eeacd1
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Wed Jun 19 12:46:36 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sat Jun 29 00:52:07 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_netscaler_configs.py         | 2 +-
 test/integration/component/test_netscaler_lb.py              | 2 +-
 test/integration/component/test_netscaler_nw_off.py          | 5 ++---
 test/integration/component/test_vpc_network.py               | 2 +-
 test/integration/component/test_vpc_network_lbrules.py       | 3 ---
 test/integration/component/test_vpc_network_pfrules.py       | 3 ---
 test/integration/component/test_vpc_network_staticnatrule.py | 3 ---
 7 files changed, 5 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4510667f/test/integration/component/test_netscaler_configs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_configs.py b/test/integration/component/test_netscaler_configs.py
index 3c18c00..5de0843 100644
--- a/test/integration/component/test_netscaler_configs.py
+++ b/test/integration/component/test_netscaler_configs.py
@@ -104,7 +104,7 @@ class Services:
                                             "UserData": 'VirtualRouter',
                                             "StaticNat": 'VirtualRouter',
                                     },
-                                    "servicecapabilitylist": {
+                                    "serviceCapabilityList": {
                                         "SourceNat": {
                                             "SupportedSourceNatTypes": "peraccount"
                                         },

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4510667f/test/integration/component/test_netscaler_lb.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb.py b/test/integration/component/test_netscaler_lb.py
index 9d06275..534ffb1 100644
--- a/test/integration/component/test_netscaler_lb.py
+++ b/test/integration/component/test_netscaler_lb.py
@@ -93,7 +93,7 @@ class Services:
                                             "UserData": 'VirtualRouter',
                                             "StaticNat": 'VirtualRouter',
                                     },
-                                    "servicecapabilitylist": {
+                                    "serviceCapabilityList": {
                                         "SourceNat": {
                                             "SupportedSourceNatTypes": "peraccount"
                                         },

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4510667f/test/integration/component/test_netscaler_nw_off.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py
index cd3b48e..256d1be 100644
--- a/test/integration/component/test_netscaler_nw_off.py
+++ b/test/integration/component/test_netscaler_nw_off.py
@@ -117,7 +117,7 @@ class Services:
                                             "UserData": 'VirtualRouter',
                                             "StaticNat": 'VirtualRouter',
                                     },
-                                    "servicecapabilitylist": {
+                                    "serviceCapabilityList": {
                                         "SourceNat": {
                                             "SupportedSourceNatTypes": "peraccount"
                                         },
@@ -157,11 +157,10 @@ class Services:
                                     "publicport": 22,
                                     "openfirewall": False,
                          },
-                         "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+                         "ostype": 'Cent OS 5.3 (64 bit)',
                          # Cent OS 5.3 (64 bit)
                          "sleep": 60,
                          "timeout": 10,
-                         "mode": 'advanced'
                     }
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4510667f/test/integration/component/test_vpc_network.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py
index a997f43..9d5081f 100644
--- a/test/integration/component/test_vpc_network.py
+++ b/test/integration/component/test_vpc_network.py
@@ -752,7 +752,7 @@ class TestVPCNetwork(cloudstackTestCase):
         self.validate_vpc_network(vpc)
 
         # Enable redundant router capability for the network offering
-        self.services["network"]["servicecapabilitylist"] = {
+        self.services["network"]["serviceCapabilityList"] = {
                                                 "SourceNat": {
                                                     "RedundantRouter": "true",
                                                     },

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4510667f/test/integration/component/test_vpc_network_lbrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_lbrules.py b/test/integration/component/test_vpc_network_lbrules.py
index 3461bb4..b0357fa 100644
--- a/test/integration/component/test_vpc_network_lbrules.py
+++ b/test/integration/component/test_vpc_network_lbrules.py
@@ -87,8 +87,6 @@ class Services:
                                             "StaticNat": 'VpcVirtualRouter',
                                             "NetworkACL": 'VpcVirtualRouter'
                                         },
-                                    "servicecapabilitylist": {
-                                    },
                                 },
                         "network_offering_no_lb": {
                                     "name": 'VPC Network offering',
@@ -176,7 +174,6 @@ class Services:
                         "ostype": 'CentOS 5.3 (64-bit)',
                         "sleep": 60,
                         "timeout": 10,
-                        "mode": 'advanced'
                     }
 
 class TestVPCNetworkLBRules(cloudstackTestCase):

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4510667f/test/integration/component/test_vpc_network_pfrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_pfrules.py b/test/integration/component/test_vpc_network_pfrules.py
index 8d1d9ec..b478b6a 100644
--- a/test/integration/component/test_vpc_network_pfrules.py
+++ b/test/integration/component/test_vpc_network_pfrules.py
@@ -84,8 +84,6 @@ class Services:
                     "StaticNat": 'VpcVirtualRouter',
                     "NetworkACL": 'VpcVirtualRouter'
                 },
-                "servicecapabilitylist": {
-                },
             },
             "network_offering_no_lb": {
                 "name": 'VPC Network offering',
@@ -175,7 +173,6 @@ class Services:
             "ostype": 'CentOS 5.3 (64-bit)',
             "sleep": 60,
             "timeout": 10,
-            "mode": 'advanced'
         }
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4510667f/test/integration/component/test_vpc_network_staticnatrule.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_staticnatrule.py b/test/integration/component/test_vpc_network_staticnatrule.py
index bed1b52..c5d9e57 100644
--- a/test/integration/component/test_vpc_network_staticnatrule.py
+++ b/test/integration/component/test_vpc_network_staticnatrule.py
@@ -83,8 +83,6 @@ class Services:
                                                         "StaticNat": 'VpcVirtualRouter',
                                                         "NetworkACL": 'VpcVirtualRouter'
                                                     },
-                                                "servicecapabilitylist": {
-                                                },
                                         },
                                 "network_offering_no_lb": {
                                                 "name": 'VPC Network offering',
@@ -174,7 +172,6 @@ class Services:
                                 "ostype": 'CentOS 5.3 (64-bit)',
                                 "sleep": 60,
                                 "timeout": 10,
-                                "mode": 'advanced'
                         }
 
 


Mime
View raw message