From da77ac88d5946eb04fc2492f025daa6ce8976b5c Mon Sep 17 00:00:00 2001 From: Alex Brett Date: Wed, 18 Nov 2015 18:05:20 +0000 Subject: [PATCH] Remove some testing code --- exec/testcases/scalextreme/poc.py | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/exec/testcases/scalextreme/poc.py b/exec/testcases/scalextreme/poc.py index 85d547e71..4beb04287 100644 --- a/exec/testcases/scalextreme/poc.py +++ b/exec/testcases/scalextreme/poc.py @@ -2,21 +2,6 @@ import xenrt from xenrt.lib.scalextreme import SXProcess -class SXDeployTest(xenrt.TestCase): - - def run(self, arglist): - - # Find the Debian template - template = self.getGuest("Debian Wheezy 7.0") - host = template.getHost() - sxp = SXProcess("57994", "1", "2947") - - # Find our providerId (TODO: we should store this in the registry) - providerName = "xenrt-%d" % xenrt.GEC().jobid() - providerId = [x['providerId'] for x in sxp.apiHandler.execute(category="providers") if x['providerName'] == providerName][0] - - sxp.deploy(providerId, host, template.getUUID(), template.password) - class XDPoc(xenrt.TestCase): def run(self, arglist): @@ -25,12 +10,9 @@ class XDPoc(xenrt.TestCase): template = self.getGuest("Windows Server 2012 R2") host = template.getHost() sxp = SXProcess.getByName("XenApp and XenDesktop Proof of Concept (25)", templateDeploymentProfile="xenrt-template") - # sxp = SXProcess("58687", "2", "2937") - # Find our providerId (TODO: we should store this in the registry) - providerName = "xenrt-%d" % xenrt.GEC().jobid() - providerId = [x['providerId'] for x in sxp.apiHandler.execute(category="providers") if x['providerName'] == providerName][0] + provider = xenrt.TEC().registry.sxProviderGetDefault() - sxp.deploy(providerId, host, template.getUUID(), template.password) + sxp.deploy(provider['id'], host, template.getUUID(), template.password) # TODO: Check the correct VMs etc have been deployed -- 2.39.5