You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/08/01 00:03:45 UTC
git commit: updated refs/heads/4.2 to 024dea9
Updated Branches:
refs/heads/4.2 fdc048442 -> 024dea93a
Automation: Fix test_vpc_routers.py
Account cannot be cleaned per test case since it's setup in setUpClass()
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/024dea93
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/024dea93
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/024dea93
Branch: refs/heads/4.2
Commit: 024dea93ae36327af830c9b2d7cb54598995caaf
Parents: fdc0484
Author: Sheng Yang <sh...@citrix.com>
Authored: Wed Jul 31 15:01:44 2013 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Wed Jul 31 15:03:37 2013 -0700
----------------------------------------------------------------------
test/integration/component/test_vpc_routers.py | 70 +++++++++------------
1 file changed, 31 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/024dea93/test/integration/component/test_vpc_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_routers.py b/test/integration/component/test_vpc_routers.py
index be141fc..9b772e4 100644
--- a/test/integration/component/test_vpc_routers.py
+++ b/test/integration/component/test_vpc_routers.py
@@ -599,6 +599,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
TestVPCRouterOneNetwork,
cls
).getClsTestClient().getApiClient()
+ cls._cleanup = []
cls.services = Services().services
# Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient, cls.services)
@@ -615,11 +616,13 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
cls.services["service_offering"]
)
+ cls._cleanup.append(cls.service_offering)
cls.vpc_off = VpcOffering.create(
cls.apiclient,
cls.services["vpc_offering"]
)
cls.vpc_off.update(cls.apiclient, state='Enabled')
+ cls._cleanup.append(cls.vpc_off)
cls.account = Account.create(
cls.apiclient,
@@ -627,8 +630,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
admin=True,
domainid=cls.domain.id
)
- cls._cleanup = [cls.account]
-
+ cls._cleanup.insert(0, cls.account)
cls.services["vpc"]["cidr"] = '10.1.1.1/16'
cls.vpc = VPC.create(
@@ -640,6 +642,31 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
domainid=cls.account.domainid
)
+ private_gateway = PrivateGateway.create(
+ cls.apiclient,
+ gateway='10.1.3.1',
+ ipaddress='10.1.3.100',
+ netmask='255.255.255.0',
+ vlan=678,
+ vpcid=cls.vpc.id
+ )
+ cls.gateways = PrivateGateway.list(
+ cls.apiclient,
+ id=private_gateway.id,
+ listall=True
+ )
+
+ static_route = StaticRoute.create(
+ cls.apiclient,
+ cidr='11.1.1.1/24',
+ gatewayid=private_gateway.id
+ )
+ cls.static_routes = StaticRoute.list(
+ cls.apiclient,
+ id=static_route.id,
+ listall=True
+ )
+
cls.nw_off = NetworkOffering.create(
cls.apiclient,
cls.services["network_offering"],
@@ -695,6 +722,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
domainid=cls.account.domainid,
listall=True
)
+
public_ip_1 = PublicIPAddress.create(
cls.apiclient,
accountid=cls.account.name,
@@ -757,7 +785,6 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
vpcid=cls.vpc.id
)
-
lb_rule = LoadBalancerRule.create(
cls.apiclient,
cls.services["lbrule"],
@@ -784,35 +811,6 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
traffictype='Egress'
)
- private_gateway = PrivateGateway.create(
- cls.apiclient,
- gateway='10.1.3.1',
- ipaddress='10.1.3.100',
- netmask='255.255.255.0',
- vlan=678,
- vpcid=cls.vpc.id
- )
- cls.gateways = PrivateGateway.list(
- cls.apiclient,
- id=private_gateway.id,
- listall=True
- )
- static_route = StaticRoute.create(
- cls.apiclient,
- cidr='11.1.1.1/24',
- gatewayid=private_gateway.id
- )
- cls.static_routes = StaticRoute.list(
- cls.apiclient,
- id=static_route.id,
- listall=True
- )
-
- cls._cleanup = [
- cls.service_offering,
- cls.vpc_off
- ]
-
@classmethod
def tearDownClass(cls):
try:
@@ -824,13 +822,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
- self.account = Account.create(
- self.apiclient,
- self.services["account"],
- admin=True,
- domainid=self.domain.id
- )
- self.cleanup = [self.account]
+ self.cleanup = []
return
def tearDown(self):