CLOUDSTACK-3923: Fix the scripts to select default vpc offering CLOUDSTACK-3923: Fix the scripts to select default vpc offering
Signed-off-by: Prasanna Santhanam <[email protected]> (cherry picked from commit 99d8ed9b68e3d480a3d86cb8ecd19c1e9b354dff) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/890ba45e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/890ba45e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/890ba45e Branch: refs/heads/4.2 Commit: 890ba45e429c29a2deb4eb76242f8f6358776c2e Parents: 91bf546 Author: SrikanteswaraRao Talluri <[email protected]> Authored: Tue Jul 30 23:51:06 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Wed Jul 31 11:13:09 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_internal_lb.py | 2 +- test/integration/smoke/test_network_acl.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/890ba45e/test/integration/smoke/test_internal_lb.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_internal_lb.py b/test/integration/smoke/test_internal_lb.py index 0535d6a..7510169 100644 --- a/test/integration/smoke/test_internal_lb.py +++ b/test/integration/smoke/test_internal_lb.py @@ -113,7 +113,7 @@ class TestInternalLb(cloudstackTestCase): self.networkOffering.update(self.apiclient, state="Enabled") #2) Create VPC and network in it - vpcOffering = VpcOffering.list(self.apiclient) + vpcOffering = VpcOffering.list(self.apiclient,isdefault=True) self.assert_(vpcOffering is not None and len(vpcOffering)>0, "No VPC offerings found") self.services["vpc"] = {} self.services["vpc"]["name"] = "vpc-internallb" http://git-wip-us.apache.org/repos/asf/cloudstack/blob/890ba45e/test/integration/smoke/test_network_acl.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_network_acl.py b/test/integration/smoke/test_network_acl.py index 4b3c1f7..3363e46 100644 --- a/test/integration/smoke/test_network_acl.py +++ b/test/integration/smoke/test_network_acl.py @@ -109,7 +109,7 @@ class TestNetworkACL(cloudstackTestCase): self.assert_(networkOffering is not None and len(networkOffering) > 0, "No VPC based network offering") # 1) Create VPC - vpcOffering = VpcOffering.list(self.apiclient) + vpcOffering = VpcOffering.list(self.apiclient,isdefault=True) self.assert_(vpcOffering is not None and len(vpcOffering)>0, "No VPC offerings found") self.services["vpc"] = {} self.services["vpc"]["name"] = "vpc-networkacl"
