Change variables from camel case to underscore

reviewable/pr18780/r1
Manuel Sousa 10 years ago
parent 4882f2bbbe
commit abab60208d

@ -72,14 +72,14 @@ options:
required: false required: false
choices: [ "yes", "no" ] choices: [ "yes", "no" ]
default: yes default: yes
exchangeType: exchange_type:
description: description:
- type for the exchange - type for the exchange
required: false required: false
choices: [ "fanout", "direct", "headers", "topic" ] choices: [ "fanout", "direct", "headers", "topic" ]
aliases: [ "type" ] aliases: [ "type" ]
default: direct default: direct
autoDelete: auto_delete:
description: description:
- if the exchange should delete itself after all queues/exchanges unbound from it - if the exchange should delete itself after all queues/exchanges unbound from it
required: false required: false
@ -120,9 +120,9 @@ def main():
login_port = dict(default='15672', type='str'), login_port = dict(default='15672', type='str'),
vhost = dict(default='/', type='str'), vhost = dict(default='/', type='str'),
durable = dict(default=True, choices=BOOLEANS, type='bool'), durable = dict(default=True, choices=BOOLEANS, type='bool'),
autoDelete = dict(default=False, choices=BOOLEANS, type='bool'), auto_delete = dict(default=False, choices=BOOLEANS, type='bool'),
internal = dict(default=False, choices=BOOLEANS, type='bool'), internal = dict(default=False, choices=BOOLEANS, type='bool'),
exchangeType = dict(default='direct', aliases=['type'], type='str'), exchange_type = dict(default='direct', aliases=['type'], type='str'),
arguments = dict(default=dict(), type='dict') arguments = dict(default=dict(), type='dict')
), ),
supports_check_mode = True supports_check_mode = True
@ -151,17 +151,17 @@ def main():
) )
if module.params['state']=='present': if module.params['state']=='present':
changeRequired = not exchangeExists change_required = not exchangeExists
else: else:
changeRequired = exchangeExists change_required = exchangeExists
# Check if attributes change on existing exchange # Check if attributes change on existing exchange
if not changeRequired and r.status_code==200 and module.params['state'] == 'present': if not change_required and r.status_code==200 and module.params['state'] == 'present':
if not ( if not (
response['durable'] == module.params['durable'] and response['durable'] == module.params['durable'] and
response['auto_delete'] == module.params['autoDelete'] and response['auto_delete'] == module.params['auto_delete'] and
response['internal'] == module.params['internal'] and response['internal'] == module.params['internal'] and
response['type'] == module.params['exchangeType'] response['type'] == module.params['exchange_type']
): ):
module.fail_json( module.fail_json(
msg = "RabbitMQ RESTAPI doesn't support attribute changes for existing exchanges" msg = "RabbitMQ RESTAPI doesn't support attribute changes for existing exchanges"
@ -170,14 +170,14 @@ def main():
# Exit if check_mode # Exit if check_mode
if module.check_mode: if module.check_mode:
module.exit_json( module.exit_json(
changed= changeRequired, changed= change_required,
name = module.params['name'], name = module.params['name'],
details = response, details = response,
arguments = module.params['arguments'] arguments = module.params['arguments']
) )
# Do changes # Do changes
if changeRequired: if change_required:
if module.params['state'] == 'present': if module.params['state'] == 'present':
r = requests.put( r = requests.put(
url, url,
@ -185,9 +185,9 @@ def main():
headers = { "content-type": "application/json"}, headers = { "content-type": "application/json"},
data = json.dumps({ data = json.dumps({
"durable": module.params['durable'], "durable": module.params['durable'],
"auto_delete": module.params['autoDelete'], "auto_delete": module.params['auto_delete'],
"internal": module.params['internal'], "internal": module.params['internal'],
"type": module.params['exchangeType'], "type": module.params['exchange_type'],
"arguments": module.params['arguments'] "arguments": module.params['arguments']
}) })
) )

Loading…
Cancel
Save