fix conflicts

This commit is contained in:
Valentin Gurmeza 2018-01-31 10:15:55 -08:00
commit ea6de9712b
9 changed files with 156 additions and 626 deletions

View file

@ -9,7 +9,7 @@ short_description: Manage mikrotik interfaces
requirements:
- mt_api
description:
- manage settings on interfaces
- manage interfaces and settings
options:
hostname:
description:
@ -28,9 +28,12 @@ options:
- sub endpoint for mikrotik tool
required: True
options:
- ovpn-client
- ethernet
- vlan
- ovpn-client
- bridge
- bridge port
- bridge settings
settings:
description:
- All Mikrotik compatible parameters for this particular endpoint.
@ -39,6 +42,7 @@ options:
state:
description:
- absent or present
required: Flase
'''
EXAMPLES = '''
@ -65,12 +69,19 @@ def main():
username=dict(required=True),
password=dict(required=True, no_log=True),
settings=dict(required=True, type='dict'),
parameter = dict(
required = True,
choices = ['ethernet', 'vlan', 'ovpn-client'],
type = 'str'
parameter=dict(
required=True,
choices=[
'ethernet',
'vlan',
'ovpn-client',
'bridge',
'bridge port',
'bridge settings'
],
type='str'
),
state = dict(
state=dict(
required = False,
choices = ['present', 'absent'],
type = 'str'
@ -80,7 +91,14 @@ def main():
)
params = module.params
idempotent_parameter = 'name'
if params['parameter'] == 'bridge port':
params['parameter'] = 'bridge/port'
idempotent_parameter = "interface"
elif params['parameter'] == 'bridge settings':
params['parameter'] = 'bridge/settings'
idempotent_parameter = None
else:
idempotent_parameter = 'name'
mt_obj = MikrotikIdempotent(
hostname = params['hostname'],