From daced20042420005d4dbd60f362cfd26c9842c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Fern=C3=A1ndez=20=40PlanetaTIC?= Date: Mon, 18 Jun 2018 13:52:29 +0200 Subject: [PATCH] [FIX] saas.py: Fix port retrieval from config and servers/plans creation into a portal outside the current instance --- saas.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/saas.py b/saas.py index 529e00316..3c8ce28d0 100755 --- a/saas.py +++ b/saas.py @@ -52,8 +52,8 @@ def log(*args): settings_group.add_argument('--odoo-script', dest='odoo_script', help='Path to odoo-server', default='./odoo-server') settings_group.add_argument('--odoo-config', dest='odoo_config', help='Path to odoo configuration file') settings_group.add_argument('--odoo-data-dir', dest='odoo_data_dir', help='Path to odoo data dir', default=None) -settings_group.add_argument('--odoo-xmlrpc-port', dest='xmlrpc_port', default='8069', help='Port to run odoo temporarly') -settings_group.add_argument('--odoo-longpolling-port', dest='longpolling_port', default='8072', help='Port to run odoo temporarly') +settings_group.add_argument('--odoo-xmlrpc-port', dest='xmlrpc_port', default=None, help='Port to run odoo temporarly') +settings_group.add_argument('--odoo-longpolling-port', dest='longpolling_port', default=None, help='Port to run odoo temporarly') settings_group.add_argument('--use-existed-odoo', dest='use_existed_odoo', action='store_true', default=False, help='Wait infinitly for 8069 port. Usefull in docker environment.') settings_group.add_argument('--local-xmlrpc-port', dest='local_xmlrpc_port', default=None, help='Port to be used for server-wide requests') settings_group.add_argument('--local-portal-host', dest='local_portal_host', help='Address for internal connection to portal', default="localhost") @@ -134,8 +134,8 @@ def get_odoo_config(): odoo_config = get_odoo_config() datadir = args.get('odoo_data_dir') or odoo_config.get('data_dir') -xmlrpc_port = args.get('xmlrpc_port') or odoo_config.get('xmlrpc_port') or '8069' -local_xmlrpc_port = args.get('local_xmlrpc_port') or odoo_config.get('xmlrpc_port') or '8069' +xmlrpc_port = args.get('xmlrpc_port') or odoo_config.get('http_port') or '8069' +local_xmlrpc_port = args.get('local_xmlrpc_port') or odoo_config.get('http_port') or '8069' longpolling_port = args.get('longpolling_port') or odoo_config.get('longpolling_port') or '8072' master_password = args.get('master_password') or odoo_config.get('admin_passwd') or 'admin' @@ -273,8 +273,8 @@ def cleanup(): # ---------------------------------------------------------- # RPC Tools # ---------------------------------------------------------- -def rpc_auth(dbname, admin_username='admin', admin_password='admin', host='localhost'): - main_url = 'http://%s:%s' % (host, xmlrpc_port) +def rpc_auth(dbname, admin_username='admin', admin_password='admin', host='localhost', port=xmlrpc_port): + main_url = 'http://%s:%s' % (host, port) if args.get('simulate'): return None, None, None, None @@ -348,13 +348,13 @@ def rpc_add_server_to_portal(portal_db_name): # * set Database Name, e.g. **s1.odoo.local** # * fix autogenerated Database UUID to actual one (see previous section) # * click [Save] - auth = rpc_auth(portal_db_name, admin_password=args.get('admin_password'), host=args.get('local_portal_host')) + auth = rpc_auth(portal_db_name, admin_password=args.get('admin_password'), host=args.get('local_portal_host'), port=local_xmlrpc_port) server_db_name = args.get('server_db_name') uuid = rpc_get_uuid(server_db_name) vals = { 'name': server_db_name, 'client_id': uuid, - 'local_port': local_xmlrpc_port, + 'local_port': xmlrpc_port, 'local_host': args.get('local_server_host'), 'password': args.get('admin_password'), } @@ -416,7 +416,7 @@ def rpc_create_plan(portal_db_name): plan_template_db_name = args.get('plan_template_db_name') plan_clients = args.get('plan_clients') - auth = rpc_auth(portal_db_name, admin_password=args.get('admin_password')) + auth = rpc_auth(portal_db_name, admin_password=args.get('admin_password'), host=args.get('local_portal_host'), port=local_xmlrpc_port) # 6. Create Plan # * open Saas/SaaS/Plans