incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: marvin: establishing some defaults
Date Thu, 13 Dec 2012 22:31:23 GMT
Updated Branches:
  refs/heads/master 82a17a413 -> fd6be7a37


marvin: establishing some defaults

when logging in just use defaults if no service dict values are provided


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/fd6be7a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fd6be7a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fd6be7a3

Branch: refs/heads/master
Commit: fd6be7a37b892e1a4f10abbb435ba76a03f74fe8
Parents: 82a17a4
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Thu Dec 13 14:08:39 2012 -0800
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Thu Dec 13 14:09:20 2012 -0800

----------------------------------------------------------------------
 tools/marvin/marvin/integration/lib/base.py |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fd6be7a3/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index e8c3b25..0daea5d 100644
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -205,10 +205,16 @@ class VirtualMachine:
         self.__dict__.update(items)
         if "username" in services:
             self.username = services["username"]
+        else:
+            self.username = 'root'
         if "password" in services:
             self.password = services["password"]
+        else:
+            self.password = 'password'
         if "ssh_port" in services:
             self.ssh_port = services["ssh_port"]
+        else:
+            self.ssh_port = 22
         self.ssh_client = None
         #extract out the ipaddress
         self.ipaddress = self.nic[0].ipaddress


Mime
View raw message