You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/12/05 08:21:59 UTC
[1/3] git commit: updated refs/heads/4.9 to 61644f9
Repository: cloudstack
Updated Branches:
refs/heads/4.9 b81683b74 -> 61644f9ea
CLOUDSTACK-9635: fix test_privategw_acl.py
ensure VLAN used for createPrivateGateway is determined after the guest
networks in the VPC is created, so that we skip VLAN allocated for guest
network for the private network of vpc gateway
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/db39a060
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/db39a060
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/db39a060
Branch: refs/heads/4.9
Commit: db39a060858005a15d55201e72a10069f24ef2f1
Parents: 14b4642
Author: Murali Reddy <mu...@gmail.com>
Authored: Wed Nov 30 18:36:43 2016 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Mon Dec 5 09:54:45 2016 +0530
----------------------------------------------------------------------
test/integration/smoke/test_privategw_acl.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db39a060/test/integration/smoke/test_privategw_acl.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_privategw_acl.py b/test/integration/smoke/test_privategw_acl.py
index 1a86175..231dd34 100644
--- a/test/integration/smoke/test_privategw_acl.py
+++ b/test/integration/smoke/test_privategw_acl.py
@@ -308,6 +308,15 @@ class TestPrivateGwACL(cloudstackTestCase):
self.cleanup = [vpc_1, vpc_2, vpc_off, self.account]
+ network_1 = self.createNetwork(vpc_1, gateway = '10.0.1.1')
+ network_2 = self.createNetwork(vpc_2, gateway = '10.0.2.1')
+
+ vm1 = self.createVM(network_1)
+ vm2 = self.createVM(network_2)
+
+ self.cleanup.insert(0, vm1)
+ self.cleanup.insert(0, vm2)
+
physical_network = self.get_guest_traffic_physical_network(self.apiclient, self.zone.id)
if not physical_network:
self.fail("No Physical Networks found!")
@@ -319,15 +328,6 @@ class TestPrivateGwACL(cloudstackTestCase):
vlans = qresultset
vlan_1 = int(vlans[0][0])
- network_1 = self.createNetwork(vpc_1, gateway = '10.0.1.1')
- network_2 = self.createNetwork(vpc_2, gateway = '10.0.2.1')
-
- vm1 = self.createVM(network_1)
- vm2 = self.createVM(network_2)
-
- self.cleanup.insert(0, vm1)
- self.cleanup.insert(0, vm2)
-
acl1 = self.createACL(vpc_1)
self.createACLItem(acl1.id, cidr = "0.0.0.0/0")
privateGw_1 = self.createPvtGw(vpc_1, "10.0.3.100", "10.0.3.101", acl1.id, vlan_1)
[3/3] git commit: updated refs/heads/4.9 to 61644f9
Posted by bh...@apache.org.
Merge branch '4.8' into 4.9
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/61644f9e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/61644f9e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/61644f9e
Branch: refs/heads/4.9
Commit: 61644f9ea9a078c5dfd9a027beaf30025c29bfad
Parents: b81683b d540015
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Dec 5 13:51:43 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Dec 5 13:51:43 2016 +0530
----------------------------------------------------------------------
test/integration/smoke/test_privategw_acl.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61644f9e/test/integration/smoke/test_privategw_acl.py
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/4.9 to 61644f9
Posted by bh...@apache.org.
Merge pull request #1802 from murali-reddy/test_privategw_acl
CLOUDSTACK-9635: fix test_privategw_acl.pyensure VLAN used for createPrivateGateway is determined after the guest
networks in the VPC is created, so that we skip VLAN allocated for guest
network for the private network of vpc gateway
* pr/1802:
CLOUDSTACK-9635: fix test_privategw_acl.py
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d540015b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d540015b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d540015b
Branch: refs/heads/4.9
Commit: d540015bc8bb8da6b53615bf1e1b30a06688ecce
Parents: 14b4642 db39a06
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Dec 5 13:50:59 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Dec 5 13:51:09 2016 +0530
----------------------------------------------------------------------
test/integration/smoke/test_privategw_acl.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------