From 99da5338ff0b36be8cb139927e00782c15d1a235 Mon Sep 17 00:00:00 2001 From: Paul Angus Date: Fri, 30 Sep 2016 13:16:29 +0530 Subject: [PATCH] fix macchinina template specificied for vmware in Marvin tests - Fix macchnina template url - Fix a variable scope issue Signed-off-by: Rohit Yadav --- test/integration/smoke/test_internal_lb.py | 2 +- test/integration/smoke/test_vpc_vpn.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/integration/smoke/test_internal_lb.py b/test/integration/smoke/test_internal_lb.py index c4be42b6702..b378db9a4c2 100644 --- a/test/integration/smoke/test_internal_lb.py +++ b/test/integration/smoke/test_internal_lb.py @@ -254,7 +254,7 @@ class Services: "format": "ova", "hypervisor": "vmware", "ostype": "Other PV (64-bit)", - "url": "http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-vmware.vmdk.bz2", + "url": "http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-vmware.ova", "requireshvm": "True", } } diff --git a/test/integration/smoke/test_vpc_vpn.py b/test/integration/smoke/test_vpc_vpn.py index af74e6f18f6..3811514dea0 100644 --- a/test/integration/smoke/test_vpc_vpn.py +++ b/test/integration/smoke/test_vpc_vpn.py @@ -253,7 +253,7 @@ class Services: "format": "ova", "hypervisor": "vmware", "ostype": "Other PV (64-bit)", - "url": "http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-vmware.vmdk.bz2", + "url": "http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-vmware.ova", "requireshvm": "True", } } @@ -320,6 +320,7 @@ class TestVpcRemoteAccessVpn(cloudstackTestCase): self.assert_(vpcOffering is not None and len( vpcOffering) > 0, "No VPC offerings found") + vpc = None try: vpc = VPC.create( apiclient=self.apiclient,