commit ea34f2538726aa5b622eaab128edabc6c9feb77a
Author: Radek Novacek <rnovacek(a)redhat.com>
Date: Thu Oct 30 12:45:55 2014 +0100
satellite: fix wrong options used when connecting to satellite
Patch by: Paul Wayper <paulway(a)redhat.com>
manager/satellite/satellite.py | 18 ++++++++++--------
tests/test_satellite.py | 6 +++---
2 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/manager/satellite/satellite.py b/manager/satellite/satellite.py
index 8f9360d..1526b4b 100644
--- a/manager/satellite/satellite.py
+++ b/manager/satellite/satellite.py
@@ -43,21 +43,23 @@ class Satellite(Manager):
self.options = options
def _connect(self):
- if not self.options.server.startswith("http://") and not
self.options.server.startswith("https://"):
- self.options.server = "https://%s" % self.options.server
- if not self.options.server.endswith("XMLRPC"):
- self.options.server = "%s/XMLRPC" % self.options.server
+ server = self.options.sat_server
+ self.username = self.options.sat_username
+ self.password = self.options.sat_password
+
+ if not server.startswith("http://") and not
server.startswith("https://"):
+ server = "https://%s" % server
+ if not server.endswith("XMLRPC"):
+ server = "%s/XMLRPC" % server
- self.username = self.options.username
- self.password = self.options.password
try:
self.force_register = self.options.force_register
except AttributeError:
self.force_register = False
- self.logger.debug("Initializing satellite connection to %s" %
self.options.server)
+ self.logger.debug("Initializing satellite connection to %s" % server)
try:
- self.server = xmlrpclib.Server(self.options.server, verbose=0)
+ self.server = xmlrpclib.Server(server, verbose=0)
except Exception:
self.logger.exception("Unable to connect to the Satellite server")
raise SatelliteError("Unable to connect to the Satellite server")
diff --git a/tests/test_satellite.py b/tests/test_satellite.py
index bb781e7..a0344af 100644
--- a/tests/test_satellite.py
+++ b/tests/test_satellite.py
@@ -85,9 +85,9 @@ class FakeSatellite(SimpleXMLRPCServer):
class Options(object):
def __init__(self, server, username, password):
- self.server = server
- self.username = username
- self.password = password
+ self.sat_server = server
+ self.sat_username = username
+ self.sat_password = password
class TestSatellite(TestBase):
Show replies by date