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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d0cea66 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d0cea66 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d0cea66 Branch: refs/heads/pvlan Commit: 4d0cea6626923a24a432c25eee8d93da4e4f504b Parents: 046580f Author: Girish Shilamkar <[email protected]> Authored: Wed May 15 17:50:43 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Fri May 17 14:05:04 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/cloudstackConnection.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d0cea66/tools/marvin/marvin/cloudstackConnection.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py index b5ff5bf..e3977dc 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
