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 04:09:51 UTC
git commit: updated refs/heads/master to 7e9e804
Updated Branches:
refs/heads/master a3df696fd -> 7e9e80448
Automation: Fix test_vpc_network_pfrules.py
Need to wait VM to boot up before stop the VR.
Also test 4 is identical to test 3, fix it.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e9e8044
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e9e8044
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e9e8044
Branch: refs/heads/master
Commit: 7e9e80448430f83067b8bc21b5bf5ac114b1ad14
Parents: a3df696
Author: Sheng Yang <sh...@citrix.com>
Authored: Wed Jul 31 19:08:17 2013 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Wed Jul 31 19:09:45 2013 -0700
----------------------------------------------------------------------
test/integration/component/test_vpc_network_pfrules.py | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e9e8044/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 9e6243b..274012d 100644
--- a/test/integration/component/test_vpc_network_pfrules.py
+++ b/test/integration/component/test_vpc_network_pfrules.py
@@ -557,6 +557,10 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
network_2 = self.create_network(self.services["network_offering_no_lb"], '10.1.2.1')
vm_1 = self.deployvm_in_network(network_1)
vm_2 = self.deployvm_in_network(network_2)
+
+ # wait until VM is up before stop the VR
+ time.sleep(120)
+
public_ip_1 = self.acquire_publicip(network_1)
public_ip_2 = self.acquire_publicip(network_2)
router = self.stop_vpcrouter()
@@ -581,8 +585,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
# 6. Deploy vm2 in network2.
# 7. Use the Create PF rule for vm1 in network1.
# 8. Use the Create PF rule for vm2 in network2.
- # 9. Start VPC Virtual Router.
- # 10. Successfully ssh into the Guest VM1 and VM2 using the PF rule
+ # 9. Successfully ssh into the Guest VM1 and VM2 using the PF rule
network_1 = self.create_network(self.services["network_offering"])
network_2 = self.create_network(self.services["network_offering_no_lb"], '10.1.2.1')
@@ -590,10 +593,8 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
vm_2 = self.deployvm_in_network(network_2)
public_ip_1 = self.acquire_publicip(network_1)
public_ip_2 = self.acquire_publicip(network_2)
- router = self.stop_vpcrouter()
self.create_natrule(vm_1, public_ip_1, network_1)
self.create_natrule(vm_2, public_ip_2, network_2)
- self.start_vpcrouter(router)
self.check_ssh_into_vm(vm_1, public_ip_1, testnegative=False)
self.check_ssh_into_vm(vm_2, public_ip_2, testnegative=False)
return
@@ -621,7 +622,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
public_ip_1 = self.acquire_publicip(network_1)
self.create_natrule(vm_1, public_ip_1, network_1)
http_rule = self.create_natrule(vm_1, public_ip_1, network_1, self.services["http_rule"])
- #http_rule = self.create_egress_Internet_Rule(network_1)
self.check_ssh_into_vm(vm_1, public_ip_1, testnegative=False)
self.check_wget_from_vm(vm_1, public_ip_1, testnegative=False)
router = self.stop_vpcrouter()
@@ -651,7 +651,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
public_ip_1 = self.acquire_publicip(network_1)
self.create_natrule(vm_1, public_ip_1, network_1)
http_rule=self.create_natrule(vm_1, public_ip_1, network_1, self.services["http_rule"])
- #http_rule = self.create_egress_Internet_Rule(network_1)
self.check_ssh_into_vm(vm_1, public_ip_1, testnegative=False)
self.check_wget_from_vm(vm_1, public_ip_1, testnegative=False)
http_rule.delete(self.apiclient)
@@ -682,7 +681,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
public_ip_1 = self.acquire_publicip(network_1)
nat_rule = self.create_natrule(vm_1, public_ip_1, network_1)
http_rule = self.create_natrule(vm_1, public_ip_1, network_1, self.services["http_rule"])
- #http_rule = self.create_egress_Internet_Rule(network_1)
self.check_ssh_into_vm(vm_1, public_ip_1, testnegative=False)
self.check_wget_from_vm(vm_1, public_ip_1, testnegative=False)
router = self.stop_vpcrouter()
@@ -715,7 +713,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
public_ip_1 = self.acquire_publicip(network_1)
nat_rule = self.create_natrule(vm_1, public_ip_1, network_1)
http_rule = self.create_natrule(vm_1, public_ip_1, network_1, self.services["http_rule"])
- #http_rule = self.create_egress_Internet_Rule(network_1)
self.check_ssh_into_vm(vm_1, public_ip_1, testnegative=False)
self.check_wget_from_vm(vm_1, public_ip_1, testnegative=False)
http_rule.delete(self.apiclient)