ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

bugfixes for openswitch shared module

Browse source 
This commit fixes two bugs in the openswitch shared module.  The first
bug was a wrong argument type for the use_ssl argument.  It was set
to int and should be bool.  The second changes the default ports for http
(was 80, now 8091) and https (was 443, now 18091).  This change aligns
the default port values with the OS
This commit is contained in:
Peter Sprygada 2016-02-26 23:12:54 -05:00
parent f99ed97c40
commit c2ce509aaf
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/ansible/module_utils/openswitch.py
View file

@ -35,7 +35,7 @@ NET_COMMON_ARGS = dict(
port=dict(type='int'),
username=dict(),
password=dict(no_log=True),
use_ssl=dict(default=True, type='int'),
use_ssl=dict(default=True, type='bool'),
transport=dict(default='ssh', choices=['ssh', 'cli', 'rest']),
provider=dict()
)
@ -48,35 +48,38 @@ def to_list(val):
else:
return list()
def get_idl():
def get_runconfig():
manager = OvsdbConnectionManager(settings.get('ovs_remote'),
settings.get('ovs_schema'))
manager.start()
idl = manager.idl
init_seq_no = 0
while (init_seq_no == idl.change_seqno):
idl.run()
timeout = 10
interval = 0
init_seq_no = manager.idl.change_seqno
while (init_seq_no == manager.idl.change_seqno):
if interval > timeout:
raise TypeError('timeout')
manager.idl.run()
interval += 1
time.sleep(1)
return idl
def get_schema():
return restparser.parseSchema(settings.get('ext_schema'))
def get_runconfig():
idl = get_idl()
schema = get_schema()
return runconfig.RunConfigUtil(idl, schema)
schema = restparser.parseSchema(settings.get('ext_schema'))
return runconfig.RunConfigUtil(manager.idl, schema)
class Response(object):
def __init__(self, resp, hdrs):
self.body = resp.read()
self.body = None
self.headers = hdrs
if resp:
self.body = resp.read()
@property
def json(self):
if not self.body:
return None
try:
return json.loads(self.body)
except ValueError:
@ -95,11 +98,11 @@ class Rest(object):
if self.module.params['use_ssl']:
proto = 'https'
if not port:
port = 443
port = 18091
else:
proto = 'http'
if not port:
port = 80
port = 8091
self.baseurl = '%s://%s:%s/rest/v1' % (proto, host, port)