Merge pull request #700 from markleehamilton/openvswitch-bridge-v1
Add support for external_id and fail_mode. Updated syntax to pass pep…
This commit is contained in:
Brian Coca
commit
9a771ce91a
1 changed files with 159 additions and 22 deletions
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
# (c) 2013, David Stygstra <david.stygstra@gmail.com>
|
||||
#
|
||||
# Portions copyright @ 2015 VMware, Inc.
|
||||
#
|
||||
# This file is part of Ansible
|
||||
#
|
||||
# This module is free software: you can redistribute it and/or modify
|
||||
|
|
@ -18,6 +20,8 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with this software. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# pylint: disable=C0111
|
||||
|
||||
DOCUMENTATION = '''
|
||||
---
|
||||
module: openvswitch_bridge
|
||||
|
|
@ -43,92 +47,225 @@ options:
|
|||
default: 5
|
||||
description:
|
||||
- How long to wait for ovs-vswitchd to respond
|
||||
external_ids:
|
||||
version_added: 2.0
|
||||
required: false
|
||||
default: None
|
||||
description:
|
||||
- A dictionary of external-ids. Omitting this parameter is a No-op.
|
||||
To clear all external-ids pass an empty value.
|
||||
fail_mode:
|
||||
version_added: 2.0
|
||||
default: None
|
||||
required: false
|
||||
choices : [secure, standalone]
|
||||
description:
|
||||
- Set bridge fail-mode. The default value (None) is a No-op.
|
||||
'''
|
||||
|
||||
EXAMPLES = '''
|
||||
# Create a bridge named br-int
|
||||
- openvswitch_bridge: bridge=br-int state=present
|
||||
|
||||
# Create an integration bridge
|
||||
- openvswitch_bridge: bridge=br-int state=present fail_mode=secure
|
||||
args:
|
||||
external_ids:
|
||||
bridge-id: "br-int"
|
||||
'''
|
||||
|
||||
|
||||
class OVSBridge(object):
|
||||
""" Interface to ovs-vsctl. """
|
||||
def __init__(self, module):
|
||||
self.module = module
|
||||
self.bridge = module.params['bridge']
|
||||
self.state = module.params['state']
|
||||
self.timeout = module.params['timeout']
|
||||
self.fail_mode = module.params['fail_mode']
|
||||
|
||||
def _vsctl(self, command):
|
||||
'''Run ovs-vsctl command'''
|
||||
return self.module.run_command(['ovs-vsctl', '-t', str(self.timeout)] + command)
|
||||
return self.module.run_command(['ovs-vsctl', '-t',
|
||||
str(self.timeout)] + command)
|
||||
|
||||
def exists(self):
|
||||
'''Check if the bridge already exists'''
|
||||
rc, _, err = self._vsctl(['br-exists', self.bridge])
|
||||
if rc == 0: # See ovs-vsctl(8) for status codes
|
||||
rtc, _, err = self._vsctl(['br-exists', self.bridge])
|
||||
if rtc == 0: # See ovs-vsctl(8) for status codes
|
||||
return True
|
||||
if rc == 2:
|
||||
if rtc == 2:
|
||||
return False
|
||||
raise Exception(err)
|
||||
self.module.fail_json(msg=err)
|
||||
|
||||
def add(self):
|
||||
'''Create the bridge'''
|
||||
rc, _, err = self._vsctl(['add-br', self.bridge])
|
||||
if rc != 0:
|
||||
raise Exception(err)
|
||||
rtc, _, err = self._vsctl(['add-br', self.bridge])
|
||||
if rtc != 0:
|
||||
self.module.fail_json(msg=err)
|
||||
if self.fail_mode:
|
||||
self.set_fail_mode()
|
||||
|
||||
def delete(self):
|
||||
'''Delete the bridge'''
|
||||
rc, _, err = self._vsctl(['del-br', self.bridge])
|
||||
if rc != 0:
|
||||
raise Exception(err)
|
||||
rtc, _, err = self._vsctl(['del-br', self.bridge])
|
||||
if rtc != 0:
|
||||
self.module.fail_json(msg=err)
|
||||
|
||||
def check(self):
|
||||
'''Run check mode'''
|
||||
changed = False
|
||||
|
||||
# pylint: disable=W0703
|
||||
try:
|
||||
if self.state == 'absent' and self.exists():
|
||||
if self.state == 'present' and self.exists():
|
||||
if (self.fail_mode and
|
||||
(self.fail_mode != self.get_fail_mode())):
|
||||
changed = True
|
||||
|
||||
##
|
||||
# Check if external ids would change.
|
||||
current_external_ids = self.get_external_ids()
|
||||
exp_external_ids = self.module.params['external_ids']
|
||||
if exp_external_ids is not None:
|
||||
for (key, value) in exp_external_ids:
|
||||
if ((key in current_external_ids) and
|
||||
(value != current_external_ids[key])):
|
||||
changed = True
|
||||
|
||||
##
|
||||
# Check if external ids would be removed.
|
||||
for (key, value) in current_external_ids.items():
|
||||
if key not in exp_external_ids:
|
||||
changed = True
|
||||
|
||||
elif self.state == 'absent' and self.exists():
|
||||
changed = True
|
||||
elif self.state == 'present' and not self.exists():
|
||||
changed = True
|
||||
else:
|
||||
changed = False
|
||||
except Exception, e:
|
||||
self.module.fail_json(msg=str(e))
|
||||
except Exception, earg:
|
||||
self.module.fail_json(msg=str(earg))
|
||||
|
||||
# pylint: enable=W0703
|
||||
self.module.exit_json(changed=changed)
|
||||
|
||||
def run(self):
|
||||
'''Make the necessary changes'''
|
||||
changed = False
|
||||
# pylint: disable=W0703
|
||||
|
||||
try:
|
||||
if self.state == 'absent':
|
||||
if self.exists():
|
||||
self.delete()
|
||||
changed = True
|
||||
elif self.state == 'present':
|
||||
|
||||
if not self.exists():
|
||||
self.add()
|
||||
changed = True
|
||||
except Exception, e:
|
||||
self.module.fail_json(msg=str(e))
|
||||
|
||||
current_fail_mode = self.get_fail_mode()
|
||||
if self.fail_mode and (self.fail_mode != current_fail_mode):
|
||||
syslog.syslog(syslog.LOG_NOTICE,
|
||||
"changing fail mode %s to %s" %
|
||||
(current_fail_mode, self.fail_mode))
|
||||
self.set_fail_mode()
|
||||
changed = True
|
||||
|
||||
current_external_ids = self.get_external_ids()
|
||||
|
||||
##
|
||||
# Change and add existing external ids.
|
||||
exp_external_ids = self.module.params['external_ids']
|
||||
if exp_external_ids is not None:
|
||||
for (key, value) in exp_external_ids.items():
|
||||
if ((value != current_external_ids.get(key, None)) and
|
||||
self.set_external_id(key, value)):
|
||||
changed = True
|
||||
|
||||
##
|
||||
# Remove current external ids that are not passed in.
|
||||
for (key, value) in current_external_ids.items():
|
||||
if ((key not in exp_external_ids) and
|
||||
self.set_external_id(key, None)):
|
||||
changed = True
|
||||
|
||||
except Exception, earg:
|
||||
self.module.fail_json(msg=str(earg))
|
||||
# pylint: enable=W0703
|
||||
self.module.exit_json(changed=changed)
|
||||
|
||||
def get_external_ids(self):
|
||||
""" Return the bridge's external ids as a dict. """
|
||||
results = {}
|
||||
if self.exists():
|
||||
rtc, out, err = self._vsctl(['br-get-external-id', self.bridge])
|
||||
if rtc != 0:
|
||||
self.module.fail_json(msg=err)
|
||||
lines = out.split("\n")
|
||||
lines = [item.split("=") for item in lines if len(item) > 0]
|
||||
for item in lines:
|
||||
results[item[0]] = item[1]
|
||||
|
||||
return results
|
||||
|
||||
def set_external_id(self, key, value):
|
||||
""" Set external id. """
|
||||
if self.exists():
|
||||
cmd = ['br-set-external-id', self.bridge, key]
|
||||
if value:
|
||||
cmd += [value]
|
||||
|
||||
(rtc, _, err) = self._vsctl(cmd)
|
||||
if rtc != 0:
|
||||
self.module.fail_json(msg=err)
|
||||
return True
|
||||
return False
|
||||
|
||||
def get_fail_mode(self):
|
||||
""" Get failure mode. """
|
||||
value = ''
|
||||
if self.exists():
|
||||
rtc, out, err = self._vsctl(['get-fail-mode', self.bridge])
|
||||
if rtc != 0:
|
||||
self.module.fail_json(msg=err)
|
||||
value = out.strip("\n")
|
||||
return value
|
||||
|
||||
def set_fail_mode(self):
|
||||
""" Set failure mode. """
|
||||
|
||||
if self.exists():
|
||||
(rtc, _, err) = self._vsctl(['set-fail-mode', self.bridge,
|
||||
self.fail_mode])
|
||||
if rtc != 0:
|
||||
self.module.fail_json(msg=err)
|
||||
|
||||
|
||||
# pylint: disable=E0602
|
||||
def main():
|
||||
""" Entry point. """
|
||||
module = AnsibleModule(
|
||||
argument_spec={
|
||||
'bridge': {'required': True},
|
||||
'state': {'default': 'present', 'choices': ['present', 'absent']},
|
||||
'timeout': {'default': 5, 'type': 'int'}
|
||||
'timeout': {'default': 5, 'type': 'int'},
|
||||
'external_ids': {'default': None},
|
||||
'fail_mode': {'default': None},
|
||||
},
|
||||
supports_check_mode=True,
|
||||
)
|
||||
|
||||
br = OVSBridge(module)
|
||||
bridge = OVSBridge(module)
|
||||
if module.check_mode:
|
||||
br.check()
|
||||
bridge.check()
|
||||
else:
|
||||
br.run()
|
||||
bridge.run()
|
||||
|
||||
# pylint: disable=W0614
|
||||
# pylint: disable=W0401
|
||||
# pylint: disable=W0622
|
||||
|
||||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
|
|
|
|||
Loading…
Reference in a new issue