Fix tabs and spaces in OpenStack modules.

This commit is contained in:
Michael DeHaan 2013-05-24 23:34:48 -04:00
parent e5c2d0b247
commit 9c5d6f11f0
11 changed files with 472 additions and 471 deletions

82
library/cloud/quantum_router_interface Executable file → Normal file
View file

@ -109,10 +109,10 @@ def _get_quantum_client(module, kwargs):
endpoint = _get_endpoint(module, _ksclient)
kwargs = {
'token': token,
'endpoint_url': endpoint
'endpoint_url': endpoint
}
try:
quantum = client.Client('2.0', **kwargs)
quantum = client.Client('2.0', **kwargs)
except Exception as e:
module.fail_json(msg = "Error in connecting to quantum: %s " % e.message)
return quantum
@ -158,34 +158,34 @@ def _get_subnet_id(module, quantum):
if not subnets['subnets']:
return None
return subnets['subnets'][0]['id']
def _get_port_id(quantum, module, router_id, subnet_id):
kwargs = {
'tenant_id': _os_tenant_id,
'device_id': router_id,
'tenant_id': _os_tenant_id,
'device_id': router_id,
}
try:
ports = quantum.list_ports(**kwargs)
ports = quantum.list_ports(**kwargs)
except Exception as e:
module.fail_json( msg = "Error in listing ports: %s" % e.message)
module.fail_json( msg = "Error in listing ports: %s" % e.message)
if not ports['ports']:
return None
return None
for port in ports['ports']:
for subnet in port['fixed_ips']:
if subnet['subnet_id'] == subnet_id:
return port['id']
for subnet in port['fixed_ips']:
if subnet['subnet_id'] == subnet_id:
return port['id']
return None
def _add_interface_router(quantum, module, router_id, subnet_id):
kwargs = {
'subnet_id': subnet_id
'subnet_id': subnet_id
}
try:
quantum.add_interface_router(router_id, kwargs)
quantum.add_interface_router(router_id, kwargs)
except Exception as e:
module.fail_json(msg = "Error in adding interface to router: %s" % e.message)
module.fail_json(msg = "Error in adding interface to router: %s" % e.message)
return True
def _remove_interface_router(quantum, module, router_id, subnet_id):
kwargs = {
'subnet_id': subnet_id
@ -195,44 +195,44 @@ def _remove_interface_router(quantum, module, router_id, subnet_id):
except Exception as e:
module.fail_json(msg = "Error in removing interface from router: %s" % e.message)
return True
def main():
module = AnsibleModule(
argument_spec = dict(
login_username = dict(default='admin'),
login_password = dict(required=True),
login_tenant_name = dict(required='True'),
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None),
router_name = dict(required=True),
subnet_name = dict(required=True),
argument_spec = dict(
login_username = dict(default='admin'),
login_password = dict(required=True),
login_tenant_name = dict(required='True'),
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None),
router_name = dict(required=True),
subnet_name = dict(required=True),
tenant_name = dict(default=None),
state = dict(default='present', choices=['absent', 'present']),
state = dict(default='present', choices=['absent', 'present']),
),
)
quantum = _get_quantum_client(module, module.params)
_set_tenant_id(module)
router_id = _get_router_id(module, quantum)
if not router_id:
module.fail_json(msg = "failed to get the router id, please check the router name")
subnet_id = _get_subnet_id(module, quantum)
module.fail_json(msg = "failed to get the router id, please check the router name")
subnet_id = _get_subnet_id(module, quantum)
if not subnet_id:
module.fail_json(msg = "failed to get the subnet id, please check the subnet name")
module.fail_json(msg = "failed to get the subnet id, please check the subnet name")
if module.params['state'] == 'present':
port_id = _get_port_id(quantum, module, router_id, subnet_id)
if not port_id:
_add_interface_router(quantum, module, router_id, subnet_id)
module.exit_json(changed = True, result = "created", id = port_id)
module.exit_json(changed = False, result = "success", id = port_id)
port_id = _get_port_id(quantum, module, router_id, subnet_id)
if not port_id:
_add_interface_router(quantum, module, router_id, subnet_id)
module.exit_json(changed = True, result = "created", id = port_id)
module.exit_json(changed = False, result = "success", id = port_id)
if module.params['state'] == 'absent':
port_id = _get_port_id(quantum, module, router_id, subnet_id)
if not port_id:
module.exit_json(changed = False, result = "Sucess")
_remove_interface_router(quantum, module, router_id, subnet_id)
module.exit_json(changed = True, result = "Deleted")
port_id = _get_port_id(quantum, module, router_id, subnet_id)
if not port_id:
module.exit_json(changed = False, result = "Sucess")
_remove_interface_router(quantum, module, router_id, subnet_id)
module.exit_json(changed = True, result = "Deleted")
# this is magic, see lib/ansible/module.params['common.py