Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7D964200BE7 for ; Mon, 5 Dec 2016 09:23:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7C70B160B17; Mon, 5 Dec 2016 08:23:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CC443160AF9 for ; Mon, 5 Dec 2016 09:23:15 +0100 (CET) Received: (qmail 23951 invoked by uid 500); 5 Dec 2016 08:23:14 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 23930 invoked by uid 99); 5 Dec 2016 08:23:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Dec 2016 08:23:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CFDB8E076F; Mon, 5 Dec 2016 08:23:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Mon, 05 Dec 2016 08:23:14 -0000 Message-Id: <1716e2e976d54cfc8f7234bed4d3af9f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: updated refs/heads/master to 46d11b3 archived-at: Mon, 05 Dec 2016 08:23:16 -0000 Repository: cloudstack Updated Branches: refs/heads/master a2e65ac28 -> 46d11b371 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/master Commit: db39a060858005a15d55201e72a10069f24ef2f1 Parents: 14b4642 Author: Murali Reddy Authored: Wed Nov 30 18:36:43 2016 +0530 Committer: Murali Reddy 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)