serviceCapabilityList is case sensitive Signed-off-by: Prasanna Santhanam <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24258648 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24258648 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24258648 Branch: refs/heads/object_store Commit: 24258648bf2fc298318e8cf446b62ecf6b8afef8 Parents: 6e63bb7 Author: Prasanna Santhanam <[email protected]> Authored: Wed Jun 19 12:46:36 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Wed Jun 19 12:48:37 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/24258648/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/24258648/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/24258648/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/24258648/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/24258648/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/24258648/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/24258648/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' }
