cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/marvin to 2f02abf
Date Fri, 11 Apr 2014 06:42:33 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/marvin ca67e25f2 -> 2f02abf36


Fixed failed tests in regression tests.


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

Branch: refs/heads/marvin
Commit: 2f02abf364ce0b192f2e830f7cfb69e78817048d
Parents: ca67e25
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Fri Apr 11 12:11:50 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Fri Apr 11 12:11:50 2014 +0530

----------------------------------------------------------------------
 .../component/test_ip_reservation.py            | 20 ++---
 test/integration/component/test_region_vpc.py   |  2 +-
 .../test_vpc_distributed_routing_offering.py    |  2 +-
 tools/marvin/marvin/config/test_data.py         | 93 +++++++++++++++++---
 4 files changed, 95 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f02abf3/test/integration/component/test_ip_reservation.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_ip_reservation.py b/test/integration/component/test_ip_reservation.py
index ed2cb78..dea26ab 100644
--- a/test/integration/component/test_ip_reservation.py
+++ b/test/integration/component/test_ip_reservation.py
@@ -92,10 +92,10 @@ class TestIpReservation(cloudstackTestCase):
         cls.template = get_template(
                             cls.api_client,
                             cls.zone.id,
-                            cls.services["ostype"]
+                            cls.testData["ostype"]
                             )
         if cls.template == FAILED:
-            assert False, "get_template() failed to return template with description %s"
% cls.services["ostype"]
+            assert False, "get_template() failed to return template with description %s"
% cls.testData["ostype"]
         cls.testData["domainid"] = cls.domain.id
         cls.testData["zoneid"] = cls.zone.id
         cls.testData["virtual_machine"]["zoneid"] = cls.zone.id
@@ -540,10 +540,10 @@ class TestRestartNetwork(cloudstackTestCase):
         cls.template = get_template(
                             cls.api_client,
                             cls.zone.id,
-                            cls.services["ostype"]
+                            cls.testData["ostype"]
                             )
         if cls.template == FAILED:
-            assert False, "get_template() failed to return template with description %s"
% cls.services["ostype"]
+            assert False, "get_template() failed to return template with description %s"
% cls.testData["ostype"]
         cls.testData["domainid"] = cls.domain.id
         cls.testData["zoneid"] = cls.zone.id
         cls.testData["virtual_machine"]["zoneid"] = cls.zone.id
@@ -665,10 +665,10 @@ class TestUpdateIPReservation(cloudstackTestCase):
         cls.template = get_template(
                             cls.api_client,
                             cls.zone.id,
-                            cls.services["ostype"]
+                            cls.testData["ostype"]
                             )
         if cls.template == FAILED:
-            assert False, "get_template() failed to return template with description %s"
% cls.services["ostype"]
+            assert False, "get_template() failed to return template with description %s"
% cls.testData["ostype"]
         cls.testData["domainid"] = cls.domain.id
         cls.testData["zoneid"] = cls.zone.id
         cls.testData["virtual_machine"]["zoneid"] = cls.zone.id
@@ -815,10 +815,10 @@ class TestRouterOperations(cloudstackTestCase):
         cls.template = get_template(
                             cls.api_client,
                             cls.zone.id,
-                            cls.services["ostype"]
+                            cls.testData["ostype"]
                             )
         if cls.template == FAILED:
-            assert False, "get_template() failed to return template with description %s"
% cls.services["ostype"]
+            assert False, "get_template() failed to return template with description %s"
% cls.testData["ostype"]
         cls.testData["domainid"] = cls.domain.id
         cls.testData["zoneid"] = cls.zone.id
         cls.testData["virtual_machine"]["zoneid"] = cls.zone.id
@@ -985,10 +985,10 @@ class TestFailureScnarios(cloudstackTestCase):
         cls.template = get_template(
                             cls.api_client,
                             cls.zone.id,
-                            cls.services["ostype"]
+                            cls.testData["ostype"]
                             )
         if cls.template == FAILED:
-            assert False, "get_template() failed to return template with description %s"
% cls.services["ostype"]
+            assert False, "get_template() failed to return template with description %s"
% cls.testData["ostype"]
         cls.testData["domainid"] = cls.domain.id
         cls.testData["zoneid"] = cls.zone.id
         cls.testData["virtual_machine"]["zoneid"] = cls.zone.id

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f02abf3/test/integration/component/test_region_vpc.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_region_vpc.py b/test/integration/component/test_region_vpc.py
index 09f350a..e348065 100644
--- a/test/integration/component/test_region_vpc.py
+++ b/test/integration/component/test_region_vpc.py
@@ -164,7 +164,7 @@ class TestRegionVpcOffering(cloudstackTestCase):
         cls.services = testClient.getParsedTestDataConfig()
 
         # Get Zone, Domain and templates
-        domain = get_domain(cls.apiclient)
+        cls.domain = get_domain(cls.apiclient)
         cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
         cls.services['mode'] = cls.zone.networktype
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f02abf3/test/integration/component/test_vpc_distributed_routing_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_distributed_routing_offering.py b/test/integration/component/test_vpc_distributed_routing_offering.py
index 7bf7d46..cc9a191 100644
--- a/test/integration/component/test_vpc_distributed_routing_offering.py
+++ b/test/integration/component/test_vpc_distributed_routing_offering.py
@@ -159,7 +159,7 @@ class TestVPCDistributedRouterOffering(cloudstackTestCase):
         cls.services = testClient.getParsedTestDataConfig()
 
         # Get Zone, Domain and templates
-        domain = get_domain(cls.apiclient)
+        cls.domain = get_domain(cls.apiclient)
         cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
         cls.services['mode'] = cls.zone.networktype
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f02abf3/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 160b055..67acc77 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -1,12 +1,14 @@
 test_data = {
         "region": {
-                "regionid": "2",
-                "regionname": "Region2",
-                "regionendpoint": "http://region2:8080/client"
+            "regionid": "2",
+            "regionname": "Region2",
+            "regionendpoint": "http://region2:8080/client"
         },
         "zone": "NA",
         "hypervisor": "XenServer",
-        "vdomain": { "name": "domain" },
+        "vdomain": {
+            "name": "domain"
+        },
 	    "email" : "test@test.com",
 	    "gateway" : "172.1.1.1",
         "netmask" : "255.255.255.0",
@@ -298,7 +300,78 @@ test_data = {
                 "Dns": 'VirtualRouter',
                 "UserData": 'VirtualRouter',
             },
-        },        
+        },
+        "nw_off_persistent_RVR":{
+            "name": 'Network offering-RVR services',
+                    "displaytext": 'Network off-RVR services',
+                    "guestiptype": 'Isolated',
+                    "supportedservices": 'Vpn,Dhcp,Dns,SourceNat,PortForwarding,Firewall,Lb,UserData,StaticNat',
+                    "traffictype": 'GUEST',
+                    "isPersistent":'True',
+                    "availability": 'Optional',
+                    "serviceProviderList": {
+                            "Vpn": 'VirtualRouter',
+                            "Dhcp": 'VirtualRouter',
+                            "Dns": 'VirtualRouter',
+                            "SourceNat": 'VirtualRouter',
+                            "PortForwarding": 'VirtualRouter',
+                            "Firewall": 'VirtualRouter',
+                            "Lb": 'VirtualRouter',
+                            "UserData": 'VirtualRouter',
+                            "StaticNat": 'VirtualRouter',
+                        },
+                    "serviceCapabilityList": {
+                        "SourceNat": {
+                            "SupportedSourceNatTypes": "peraccount",
+                            "RedundantRouter": "true",
+                        },
+                        "lb": {
+                               "SupportedLbIsolation": "dedicated"
+                        },
+                    },
+        },
+        "nw_off_isolated_persistent_netscaler":{
+            "name": 'Netscaler',
+            "displaytext": 'Netscaler',
+            "guestiptype": 'Isolated',
+            "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat',
+            "traffictype": 'GUEST',
+            "isPersistent":'True',
+            "availability": 'Optional',
+            "serviceProviderList": {
+                    "Dhcp": 'VirtualRouter',
+                    "Dns": 'VirtualRouter',
+                    "SourceNat": 'VirtualRouter',
+                    "PortForwarding": 'VirtualRouter',
+                    "Vpn": 'VirtualRouter',
+                    "Firewall": 'VirtualRouter',
+                    "Lb": 'Netscaler',
+                    "UserData": 'VirtualRouter',
+                    "StaticNat": 'VirtualRouter',
+            },
+
+        },
+        "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_offering_internal_lb": {
             "name": "Network offering for internal lb service",
             "displaytext": "Network offering for internal lb service",
@@ -481,10 +554,10 @@ test_data = {
         "customdisksize": 1,
         "diskname": "Test Volume",
         "portableIpRange": {
-        "gateway" : "10.223.252.195",
-        "netmask" : "255.255.255.192",
-        "startip" : "10.223.252.196",
-        "endip"   : "10.223.252.197",
-        "vlan"    : "1001"
+            "gateway" : "10.223.252.195",
+            "netmask" : "255.255.255.192",
+            "startip" : "10.223.252.196",
+            "endip"   : "10.223.252.197",
+            "vlan"    : "1001"
        }
 }


Mime
View raw message