From fd6be7a37b892e1a4f10abbb435ba76a03f74fe8 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Thu, 13 Dec 2012 14:08:39 -0800 Subject: [PATCH] marvin: establishing some defaults when logging in just use defaults if no service dict values are provided --- tools/marvin/marvin/integration/lib/base.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py index e8c3b25bd89..0daea5dd579 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