From 4d0cea6626923a24a432c25eee8d93da4e4f504b Mon Sep 17 00:00:00 2001 From: Girish Shilamkar Date: Wed, 15 May 2013 17:50:43 +0530 Subject: [PATCH] CLOUDSTACK-2513: VPN tests refer to invalid connection.user in cloudConnection cloudConnection object should always have "user" and "passwd" attributes. And they are "None" while creating userAPIClient. As we already have "user" and "password" for mgmt server. Signed-off-by: Prasanna Santhanam --- tools/marvin/marvin/cloudstackConnection.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py index b5ff5bf7b3f..e3977dcf7d4 100644 --- a/tools/marvin/marvin/cloudstackConnection.py +++ b/tools/marvin/marvin/cloudstackConnection.py @@ -43,10 +43,8 @@ class cloudConnection(object): self.securityKey = securityKey self.mgtSvr = mgtSvr self.port = port - if user: - self.user = user - if passwd: - self.passwd = passwd + self.user = user + self.passwd = passwd self.logging = logging self.path = path self.retries = 5