commit 69dcffe281aa1333cf6d319b7067b7476428d308
Author: Radek Novacek <rnovacek(a)redhat.com>
Date: Fri Aug 29 09:06:38 2014 +0200
Fix constructor parameters in vdsm and rhevm modes
virt/rhevm/rhevm.py | 13 +++++++------
virt/vdsm/vdsm.py | 20 ++++++++++++++------
2 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/virt/rhevm/rhevm.py b/virt/rhevm/rhevm.py
index 570fa7b..a4069fb 100644
--- a/virt/rhevm/rhevm.py
+++ b/virt/rhevm/rhevm.py
@@ -35,11 +35,12 @@ except ImportError:
class RhevM(virt.HypervisorVirt):
CONFIG_TYPE = "rhevm"
- def __init__(self, logger, url, username, password):
+ def __init__(self, logger, config):
self.logger = logger
- self.url = url
+ self.config = config
+ self.url = self.config.server
if "//" not in self.url:
- self.url = "//" + url
+ self.url = "//" + self.config.server
parsed = urlparse.urlsplit(self.url, "https")
if ":" not in parsed[1]:
netloc = parsed[1] + ":8443"
@@ -47,13 +48,13 @@ class RhevM(virt.HypervisorVirt):
netloc = parsed[1]
self.url = urlparse.urlunsplit((parsed[0], netloc, parsed[2], "",
""))
- self.username = username
- self.password = password
+ self.username = self.config.username
+ self.password = self.config.password
self.hosts_url = urlparse.urljoin(self.url, "/api/hosts")
self.vms_url = urlparse.urljoin(self.url, "/api/vms")
- self.auth = base64.encodestring('%s:%s' % (username, password))[:-1]
+ self.auth = base64.encodestring('%s:%s' % (self.config.username,
self.config.password))[:-1]
def get(self, url):
"""
diff --git a/virt/vdsm/vdsm.py b/virt/vdsm/vdsm.py
index 06b27a3..84cdbc3 100644
--- a/virt/vdsm/vdsm.py
+++ b/virt/vdsm/vdsm.py
@@ -35,8 +35,9 @@ class VdsmError(Exception):
class Vdsm(DirectVirt):
CONFIG_TYPE = "vdsm"
- def __init__(self, logger):
+ def __init__(self, logger, config):
self.logger = logger
+ self.config = config
self._readConfig("/etc/vdsm/vdsm.conf")
self.connect()
@@ -45,13 +46,20 @@ class Vdsm(DirectVirt):
parser.read(configName)
try:
self.ssl = parser.get("vars", "ssl").lower() in
["1", "true"]
- if self.ssl:
+ except (NoSectionError, NoOptionError):
+ self.ssl = True
+
+ if self.ssl:
+ try:
self.trust_store_path = parser.get("vars",
"trust_store_path")
- else:
- self.trust_store_path = None
+ except (NoSectionError, NoOptionError):
+ self.trust_store_path = '/etc/pki/vdsm'
+ else:
+ self.trust_store_path = None
+ try:
self.management_port = parser.get("addresses",
"management_port")
- except (NoSectionError, NoOptionError), e:
- raise VdsmError("Error in vdsm configuration file: %s" % str(e))
+ except (NoSectionError, NoOptionError):
+ self.management_port = 54321
def _getLocalVdsName(self, tsPath):
p = subprocess.Popen([
Show replies by date