From: Tony Mack Date: Wed, 2 Apr 2008 23:02:31 +0000 (+0000) Subject: update api server settings X-Git-Tag: tests-4.2-4~100 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5e8ade9eb40d07ce6eb55ace58a5a13a2e5383b0;p=tests.git update api server settings --- diff --git a/qaapi/qa/Config.py b/qaapi/qa/Config.py index c7c4f2e..16a4eca 100644 --- a/qaapi/qa/Config.py +++ b/qaapi/qa/Config.py @@ -18,15 +18,16 @@ class Config: node_tests_path = tests_path + os.sep + 'node' + os.sep slice_tests_path = tests_path + os.sep + 'slice' + os.sep vserver_scripts_path = path + os.sep + 'vserver' + os.sep - qemu_scripts_path = path + os.sep + 'qemu' + os.sep def update_api(self, plc = None): # Set up API acccess # If plc is specified, find its configuration # and use its API if plc is not None: - host, path, port = plc['host'], plc['api_path'], plc['port'] - api_server = "https://%(host)s:%(port)s/%(path)s" % locals() + protocol, host, path, port = 'http', plc['host'], plc['api_path'], plc['port'] + if port in ['443']: + protocol = 'https' + api_server = "%(protocol)s://%(host)s:%(port)s/%(path)s" % locals() self.api = xmlrpclib.Server(api_server, allow_none = 1) self.api_type = 'xmlrpc' else: @@ -84,6 +85,7 @@ class Config: plc = PLC(self) if hasattr(self, 'plcs') and plc_name in self.plcs.keys(): plc.update(self.plcs[plc_name]) + plc.config.update_api(plc) return plc def get_node(self, hostname): @@ -106,7 +108,7 @@ class Config: if loadable in confdata and loadable in ['plcs']: setattr(self, loadable, PLCs(config, confdata[loadable]).dict('name')) elif loadable in confdata and loadable in ['nodes']: - setattr(self, loadable, Nodes(config, confdata[loadable]).dict('hostname')) + setattr(self, loadable, Nodes(config, confdata[loadable]).dict('hostname')) elif loadable in confdata and loadable in ['sites']: setattr(self, loadable, Sites(confdata[loadable]).dict('login_base')) elif loadable in confdata and loadable in ['slices']: