You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/28 17:44:33 UTC
[06/24] git commit: updated refs/heads/4.4 to e33d4a5
Fixed Few cases running on invalid zone,domain Fixed creating client on user passed port Fixed other misc issues
Signed-off-by: jayapal <ja...@apache.org>
(cherry picked from commit 081ab7852505b46a6bb52b88dd89998f50ca54b6)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b8824d09
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b8824d09
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b8824d09
Branch: refs/heads/4.4
Commit: b8824d09cb497268701a034d73ce877f0bff3f35
Parents: 5e18332
Author: santhoshe <sa...@gmail.com>
Authored: Thu May 8 00:52:29 2014 +1000
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jul 28 17:43:17 2014 +0200
----------------------------------------------------------------------
test/integration/smoke/test_deploy_vm.py | 12 ++++++------
tools/marvin/marvin/cloudstackTestClient.py | 14 +++++++-------
tools/marvin/marvin/marvinPlugin.py | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8824d09/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 ca4891d..5a2695d 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/b8824d09/tools/marvin/marvin/cloudstackTestClient.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py
index 53d48ab..c7ad5c0 100644
--- a/tools/marvin/marvin/cloudstackTestClient.py
+++ b/tools/marvin/marvin/cloudstackTestClient.py
@@ -152,23 +152,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/b8824d09/tools/marvin/marvin/marvinPlugin.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index 4200a65..98bbb3f 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()