You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/10/25 18:32:33 UTC
[1/2] git commit: updated refs/heads/master to 8a09f88
Repository: cloudstack
Updated Branches:
refs/heads/master 3d2b6f743 -> 8a09f88d7
Add wait for template download
Refactored template section of services
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b95c8200
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b95c8200
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b95c8200
Branch: refs/heads/master
Commit: b95c8200e20e7a2bec369b2ba8b8c4fbbc71b0ca
Parents: 2b34df0
Author: Michael Andersen <ma...@schubergphilis.com>
Authored: Fri Oct 23 15:22:48 2015 +0200
Committer: Michael Andersen <ma...@schubergphilis.com>
Committed: Fri Oct 23 15:23:53 2015 +0200
----------------------------------------------------------------------
test/integration/smoke/test_internal_lb.py | 56 +++++++++++++------------
1 file changed, 29 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b95c8200/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 da845ea..6bcf8bc 100644
--- a/test/integration/smoke/test_internal_lb.py
+++ b/test/integration/smoke/test_internal_lb.py
@@ -204,24 +204,27 @@ class Services:
"publicport": 22,
"protocol": 'TCP',
},
- "template_kvm": {
- "name": "tiny-kvm",
- "displaytext": "macchinina kvm",
- "format": "qcow2",
- "hypervisor": "kvm",
- "ostype": "Other PV (64-bit)",
- "url": "http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-kvm.qcow2.bz2",
- "requireshvm": "True",
- },
- "template_xen": {
- "name": "tiny-xen",
- "displaytext": "macchinina xen",
- "format": "vhd",
- "hypervisor": "xen",
- "ostype": "Other (64-bit)",
- "url": "http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-xen.vhd.bz2",
- "requireshvm": "True",
- },
+ "template": {
+ "kvm": {
+ "name": "tiny-kvm",
+ "displaytext": "macchinina kvm",
+ "format": "qcow2",
+ "hypervisor": "kvm",
+ "ostype": "Other PV (64-bit)",
+ "url": "http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-kvm.qcow2.bz2",
+ "requireshvm": "True"
+ },
+
+ "xen": {
+ "name": "tiny-xen",
+ "displaytext": "macchinina xen",
+ "format": "vhd",
+ "hypervisor": "xen",
+ "ostype": "Other (64-bit)",
+ "url": "http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-xen.vhd.bz2",
+ "requireshvm": "True",
+ }
+ }
}
@@ -244,6 +247,7 @@ class TestInternalLb(cloudstackTestCase):
cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
cls.domain = get_domain(cls.apiclient)
+ cls.logger.debug("Creating compute offering: %s" %cls.services["compute_offering"]["name"])
cls.compute_offering = ServiceOffering.create(
cls.apiclient,
cls.services["compute_offering"]
@@ -252,12 +256,11 @@ class TestInternalLb(cloudstackTestCase):
cls.account = Account.create(
cls.apiclient, services=cls.services["account"])
- if cls.services["default_hypervisor"] == "kvm":
- cls.template = Template.register(cls.apiclient, cls.services["template_kvm"], cls.zone.id, hypervisor=cls.services[
- "template_kvm"]["hypervisor"], account=cls.account.name, domainid=cls.domain.id)
- else:
- cls.template = Template.register(cls.apiclient, cls.services["template_xen"], cls.zone.id, hypervisor=cls.services[
- "template_xen"]["hypervisor"], account=cls.account.name, domainid=cls.domain.id)
+ cls.hypervisor = cls.services["default_hypervisor"]
+
+ cls.logger.debug("Downloading Template: %s from: %s" %(cls.services["template"][cls.hypervisor]["name"], cls.services["template"][cls.hypervisor]["url"]))
+ cls.template = Template.register(cls.apiclient, cls.services["template"][cls.hypervisor], cls.zone.id, hypervisor=cls.hypervisor, account=cls.account.name, domainid=cls.domain.id)
+ cls.template.download(cls.apiclient)
if cls.template == FAILED:
assert False, "get_template() failed to return template"
@@ -266,7 +269,7 @@ class TestInternalLb(cloudstackTestCase):
%s" % (cls.account.name,
cls.account.id))
- cls.cleanup = [cls.account]
+ cls.cleanup = [cls.template, cls.account, cls.compute_offering]
return
def get_networkoffering_state(self, offering):
@@ -366,8 +369,7 @@ class TestInternalLb(cloudstackTestCase):
accountid=self.account.name,
domainid=self.domain.id,
serviceofferingid=self.compute_offering.id,
- hypervisor=self.services[
- "template_kvm"]["hypervisor"]
+ hypervisor=self.hypervisor
)
self.assertIsNotNone(
vm, "Failed to deploy vm in network: %s" % networkid)
[2/2] git commit: updated refs/heads/master to 8a09f88
Posted by re...@apache.org.
Merge pull request #971 from michaelandersen/fix/loadbalancer-test
smoke/test_internal_lb.py: Fix template not ready errorAdd wait for template download
Refactored template section of services
Added some extra logging in the setup phase
* pr/971:
Add wait for template download Refactored template section of services
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8a09f88d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8a09f88d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8a09f88d
Branch: refs/heads/master
Commit: 8a09f88d7f1b183cefd50ff1871e25cfddadef64
Parents: 3d2b6f7 b95c820
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sun Oct 25 18:31:52 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sun Oct 25 18:31:53 2015 +0100
----------------------------------------------------------------------
test/integration/smoke/test_internal_lb.py | 56 +++++++++++++------------
1 file changed, 29 insertions(+), 27 deletions(-)
----------------------------------------------------------------------