You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/19 17:53:31 UTC
[3/4] git commit: updated refs/heads/4.6 to 78e5518
CLOUDSTACK-9015 - Delete public IP in order to get both IP and NAT rule removed.
- Set the IP and NAT to None to make sure they get reassigned.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/45949901
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/45949901
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/45949901
Branch: refs/heads/4.6
Commit: 459499017f6aa411aab939d93dc9894ac740f89e
Parents: 952d9a8
Author: Wilder Rodrigues <wr...@schubergphilis.com>
Authored: Wed Nov 18 12:31:29 2015 +0100
Committer: Wilder Rodrigues <wr...@schubergphilis.com>
Committed: Wed Nov 18 16:25:50 2015 +0100
----------------------------------------------------------------------
test/integration/component/test_vpc_redundant.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45949901/test/integration/component/test_vpc_redundant.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_redundant.py b/test/integration/component/test_vpc_redundant.py
index 37a342b..9bdf6c9 100644
--- a/test/integration/component/test_vpc_redundant.py
+++ b/test/integration/component/test_vpc_redundant.py
@@ -535,6 +535,7 @@ class TestVPCRedundancy(cloudstackTestCase):
self.delete_nat_rules()
self.check_master_status(1)
self.do_vpc_test(True)
+ self.delete_public_ip()
self.start_routers()
self.add_nat_rules()
@@ -577,6 +578,14 @@ class TestVPCRedundancy(cloudstackTestCase):
vm.get_nat().delete(self.apiclient)
vm.set_nat(None)
+ def delete_public_ip(self):
+ for o in self.networks:
+ for vm in o.get_vms():
+ if vm.get_ip() is not None:
+ vm.get_ip().delete(self.apiclient)
+ vm.set_ip(None)
+ vm.set_nat(None)
+
def add_nat_rules(self):
for o in self.networks:
for vm in o.get_vms():
@@ -584,7 +593,6 @@ class TestVPCRedundancy(cloudstackTestCase):
vm.set_ip(self.acquire_publicip(o.get_net()))
if vm.get_nat() is None:
vm.set_nat(self.create_natrule(vm.get_vm(), vm.get_ip(), o.get_net()))
- time.sleep(5)
def do_vpc_test(self, expectFail):
retries = 5