You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/10/21 04:45:50 UTC
[03/17] git commit: updated refs/heads/4.8 to a664e03
fix macchinina template specificied for vmware in Marvin tests
- Fix macchnina template url
- Fix a variable scope issue
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/99da5338
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/99da5338
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/99da5338
Branch: refs/heads/4.8
Commit: 99da5338ff0b36be8cb139927e00782c15d1a235
Parents: 47104cf
Author: Paul Angus <pa...@shapeblue.com>
Authored: Fri Sep 30 13:16:29 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Oct 5 15:11:00 2016 +0530
----------------------------------------------------------------------
test/integration/smoke/test_internal_lb.py | 2 +-
test/integration/smoke/test_vpc_vpn.py | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99da5338/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 c4be42b..b378db9 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",
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99da5338/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 af74e6f..3811514 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,