You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/31 07:43:48 UTC
[2/2] git commit: updated refs/heads/master to fee7a86
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 <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bd7bff79
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bd7bff79
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bd7bff79
Branch: refs/heads/master
Commit: bd7bff792b19e564f819fc257c2858016a928bd6
Parents: 2cca335
Author: SrikanteswaraRao Talluri <sr...@citrix.com>
Authored: Tue Jul 30 23:51:06 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 31 11:12:48 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/bd7bff79/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/bd7bff79/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"