Marvin Tests: Fix VPC network offering selection Signed-off-by: Rohit Yadav <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/79f0adf3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/79f0adf3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/79f0adf3 Branch: refs/heads/4.8 Commit: 79f0adf3974e45ad416a50e0fc24ae6f529eff62 Parents: 99da533 Author: Paul Angus <[email protected]> Authored: Fri Sep 30 13:17:30 2016 +0530 Committer: Rohit Yadav <[email protected]> Committed: Wed Oct 5 15:11:00 2016 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_network_acl.py | 2 +- test/integration/smoke/test_vpc_vpn.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79f0adf3/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 909da7e..734c312 100644 --- a/test/integration/smoke/test_network_acl.py +++ b/test/integration/smoke/test_network_acl.py @@ -64,7 +64,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,isdefault=True) + vpcOffering = VpcOffering.list(self.apiclient, name="Default VPC offering") self.assert_(vpcOffering is not None and len(vpcOffering)>0, "No VPC offerings found") self.services["vpc"] = {} self.services["vpc"]["name"] = "vpc-networkacl" http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79f0adf3/test/integration/smoke/test_vpc_vpn.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_vpc_vpn.py b/test/integration/smoke/test_vpc_vpn.py index 3811514..698cda7 100644 --- a/test/integration/smoke/test_vpc_vpn.py +++ b/test/integration/smoke/test_vpc_vpn.py @@ -316,7 +316,7 @@ class TestVpcRemoteAccessVpn(cloudstackTestCase): networkOffering) > 0, "No VPC based network offering") # 1) Create VPC - vpcOffering = VpcOffering.list(self.apiclient, isdefault=True) + vpcOffering = VpcOffering.list(self.apiclient, name="Default VPC offering") self.assert_(vpcOffering is not None and len( vpcOffering) > 0, "No VPC offerings found")
