Repository: cloudstack Updated Branches: refs/heads/4.4-forward ff1c4beec -> 081ab7852
Fixed Few cases running on invalid zone,domain Fixed creating client on user passed port Fixed other misc issues Signed-off-by: jayapal <jaya...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/081ab785 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/081ab785 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/081ab785 Branch: refs/heads/4.4-forward Commit: 081ab7852505b46a6bb52b88dd89998f50ca54b6 Parents: ff1c4be Author: santhoshe <santhosh.eduku...@gmail.com> Authored: Thu May 8 00:52:29 2014 +1000 Committer: jayapal <jaya...@apache.org> Committed: Thu May 8 01:45:16 2014 +1000 ---------------------------------------------------------------------- test/integration/smoke/test_deploy_vm.py | 12 ++++++------ tools/marvin/marvin/cloudstackTestClient.py | 15 ++++++++------- tools/marvin/marvin/marvinPlugin.py | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/081ab785/test/integration/smoke/test_deploy_vm.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_deploy_vm.py b/test/integration/smoke/test_deploy_vm.py index c07e663..473b020 100644 --- a/test/integration/smoke/test_deploy_vm.py +++ b/test/integration/smoke/test_deploy_vm.py @@ -169,8 +169,8 @@ class TestDeployVMVolumeCreationFailure(cloudstackTestCase): self.apiclient = self.testClient.getApiClient() # Get Zone, Domain and Default Built-in template - self.domain = get_domain(self.apiclient, self.testdata) - self.zone = get_zone(self.apiclient, self.testdata) + self.domain = get_domain(self.apiclient) + self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests()) self.testdata["mode"] = self.zone.networktype self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"]) @@ -183,7 +183,7 @@ class TestDeployVMVolumeCreationFailure(cloudstackTestCase): #create a service offering self.service_offering = ServiceOffering.create( self.apiclient, - self.testdata["service_offering"]["small"] + self.testdata["service_offerings"]["small"] ) #create first VM self.virtual_machine = VirtualMachine.create( @@ -280,8 +280,8 @@ class TestDeployVMStartFailure(cloudstackTestCase): self.apiclient = self.testClient.getApiClient() # Get Zone, Domain and Default Built-in template - self.domain = get_domain(self.apiclient, self.testdata) - self.zone = get_zone(self.apiclient, self.testdata) + self.domain = get_domain(self.apiclient) + self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests()) self.testdata["mode"] = self.zone.networktype self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"]) @@ -294,7 +294,7 @@ class TestDeployVMStartFailure(cloudstackTestCase): #create a service offering self.service_offering = ServiceOffering.create( self.apiclient, - self.testdata["service_offering"]["small"] + self.testdata["service_offerings"]["small"] ) #create first VM self.virtual_machine = VirtualMachine.create( http://git-wip-us.apache.org/repos/asf/cloudstack/blob/081ab785/tools/marvin/marvin/cloudstackTestClient.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py index 0e3d3d0..9fe559d 100644 --- a/tools/marvin/marvin/cloudstackTestClient.py +++ b/tools/marvin/marvin/cloudstackTestClient.py @@ -26,6 +26,7 @@ from marvin.cloudstackException import GetDetailExceptionInfo from marvin.lib.utils import (random_gen, validateList) from marvin.cloudstackAPI.cloudstackAPIClient import CloudStackAPIClient + class CSTestClient(object): ''' @@ -152,23 +153,23 @@ class CSTestClient(object): if api_key is None: ret = self.__getKeys(user_id) if ret != FAILED: - self.__mgmtDetails.port = 8080 - self.__mgmtDetails.apiKey = ret[0] - self.__mgmtDetails.securityKey = ret[1] + mgmt_details = self.__mgmtDetails + mgmt_details.apiKey = ret[0] + mgmt_details.securityKey = ret[1] else: self.__logger.error("__createApiClient: API Client " "Creation Failed while " "Registering User") return FAILED else: - self.__mgmtDetails.port = 8080 - self.__mgmtDetails.apiKey = api_key - self.__mgmtDetails.securityKey = security_key + mgmt_details.port = 8080 + mgmt_details.apiKey = api_key + mgmt_details.securityKey = security_key ''' Now Create the Connection objects and Api Client using new details ''' - self.__csConnection = CSConnection(self.__mgmtDetails, + self.__csConnection = CSConnection(mgmt_details, self.__asyncTimeOut, self.__logger) self.__apiClient = CloudStackAPIClient(self.__csConnection) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/081ab785/tools/marvin/marvin/marvinPlugin.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py index 74b64ef..52a2cde 100644 --- a/tools/marvin/marvin/marvinPlugin.py +++ b/tools/marvin/marvin/marvinPlugin.py @@ -179,7 +179,7 @@ class MarvinPlugin(Plugin): Dump Start Msg of TestCase to Log """ if self.__tcRunLogger: - self.__tcRunLogger.debug("\n\n::::::::::::STARTED : TC: " + + self.__tcRunLogger.debug("::::::::::::STARTED : TC: " + str(self.__testName) + " :::::::::::") self.__startTime = time.time()
