Add support for neutronclient

The quantum_* modules will now try neutronclient first, and fall back
to quantumclient. If that fails, error out.

The code now references neutron instead of quantum in all internal
cases.
reviewable/pr18780/r1
Brad P. Crochet 11 years ago
parent 69c162f556
commit ded9d626e0

@ -18,11 +18,14 @@
try: try:
from novaclient.v1_1 import client as nova_client from novaclient.v1_1 import client as nova_client
from quantumclient.quantum import client try:
from neutronclient.neutron import client
except ImportError:
from quantumclient.quantum import client
from keystoneclient.v2_0 import client as ksclient from keystoneclient.v2_0 import client as ksclient
import time import time
except ImportError: except ImportError:
print("failed=True msg='glanceclient,keystoneclient and quantumclient client are required'") print("failed=True msg='novaclient,keystoneclient and quantumclient (or neutronclient) are required'")
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
@ -72,7 +75,7 @@ options:
- The name of the instance to which the IP address should be assigned - The name of the instance to which the IP address should be assigned
required: true required: true
default: None default: None
requirements: ["novaclient", "quantumclient", "keystoneclient"] requirements: ["novaclient", "quantumclient", "neutronclient", "keystoneclient"]
''' '''
EXAMPLES = ''' EXAMPLES = '''
@ -99,10 +102,10 @@ def _get_endpoint(module, ksclient):
try: try:
endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL') endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL')
except Exception as e: except Exception as e:
module.fail_json(msg = "Error getting endpoint for glance: %s" % e.message) module.fail_json(msg = "Error getting network endpoint: %s" % e.message)
return endpoint return endpoint
def _get_quantum_client(module, kwargs): def _get_neutron_client(module, kwargs):
_ksclient = _get_ksclient(module, kwargs) _ksclient = _get_ksclient(module, kwargs)
token = _ksclient.auth_token token = _ksclient.auth_token
endpoint = _get_endpoint(module, _ksclient) endpoint = _get_endpoint(module, _ksclient)
@ -111,10 +114,10 @@ def _get_quantum_client(module, kwargs):
'endpoint_url': endpoint 'endpoint_url': endpoint
} }
try: try:
quantum = client.Client('2.0', **kwargs) neutron = client.Client('2.0', **kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in connecting to quantum: %s " % e.message) module.fail_json(msg = "Error in connecting to neutron: %s " % e.message)
return quantum return neutron
def _get_server_state(module, nova): def _get_server_state(module, nova):
server_info = None server_info = None
@ -132,59 +135,59 @@ def _get_server_state(module, nova):
module.fail_json(msg = "Error in getting the server list: %s" % e.message) module.fail_json(msg = "Error in getting the server list: %s" % e.message)
return server_info, server return server_info, server
def _get_port_info(quantum, module, instance_id): def _get_port_info(neutron, module, instance_id):
kwargs = { kwargs = {
'device_id': instance_id, 'device_id': instance_id,
} }
try: try:
ports = quantum.list_ports(**kwargs) ports = neutron.list_ports(**kwargs)
except Exception as e: 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']: if not ports['ports']:
return None, None return None, None
return ports['ports'][0]['fixed_ips'][0]['ip_address'], ports['ports'][0]['id'] return ports['ports'][0]['fixed_ips'][0]['ip_address'], ports['ports'][0]['id']
def _get_floating_ip(module, quantum, fixed_ip_address): def _get_floating_ip(module, neutron, fixed_ip_address):
kwargs = { kwargs = {
'fixed_ip_address': fixed_ip_address 'fixed_ip_address': fixed_ip_address
} }
try: try:
ips = quantum.list_floatingips(**kwargs) ips = neutron.list_floatingips(**kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = "error in fetching the floatingips's %s" % e.message) module.fail_json(msg = "error in fetching the floatingips's %s" % e.message)
if not ips['floatingips']: if not ips['floatingips']:
return None, None return None, None
return ips['floatingips'][0]['id'], ips['floatingips'][0]['floating_ip_address'] return ips['floatingips'][0]['id'], ips['floatingips'][0]['floating_ip_address']
def _create_floating_ip(quantum, module, port_id, net_id): def _create_floating_ip(neutron, module, port_id, net_id):
kwargs = { kwargs = {
'port_id': port_id, 'port_id': port_id,
'floating_network_id': net_id 'floating_network_id': net_id
} }
try: try:
result = quantum.create_floatingip({'floatingip': kwargs}) result = neutron.create_floatingip({'floatingip': kwargs})
except Exception as e: except Exception as e:
module.fail_json(msg="There was an error in updating the floating ip address: %s" % e.message) module.fail_json(msg="There was an error in updating the floating ip address: %s" % e.message)
module.exit_json(changed=True, result=result, public_ip=result['floatingip']['floating_ip_address']) module.exit_json(changed=True, result=result, public_ip=result['floatingip']['floating_ip_address'])
def _get_net_id(quantum, module): def _get_net_id(neutron, module):
kwargs = { kwargs = {
'name': module.params['network_name'], 'name': module.params['network_name'],
} }
try: try:
networks = quantum.list_networks(**kwargs) networks = neutron.list_networks(**kwargs)
except Exception as e: except Exception as e:
module.fail_json("Error in listing quantum networks: %s" % e.message) module.fail_json("Error in listing neutron networks: %s" % e.message)
if not networks['networks']: if not networks['networks']:
return None return None
return networks['networks'][0]['id'] return networks['networks'][0]['id']
def _update_floating_ip(quantum, module, port_id, floating_ip_id): def _update_floating_ip(neutron, module, port_id, floating_ip_id):
kwargs = { kwargs = {
'port_id': port_id 'port_id': port_id
} }
try: try:
result = quantum.update_floatingip(floating_ip_id, {'floatingip': kwargs}) result = neutron.update_floatingip(floating_ip_id, {'floatingip': kwargs})
except Exception as e: except Exception as e:
module.fail_json(msg="There was an error in updating the floating ip address: %s" % e.message) module.fail_json(msg="There was an error in updating the floating ip address: %s" % e.message)
module.exit_json(changed=True, result=result) module.exit_json(changed=True, result=result)
@ -208,7 +211,7 @@ def main():
try: try:
nova = nova_client.Client(module.params['login_username'], module.params['login_password'], nova = nova_client.Client(module.params['login_username'], module.params['login_password'],
module.params['login_tenant_name'], module.params['auth_url'], service_type='compute') module.params['login_tenant_name'], module.params['auth_url'], service_type='compute')
quantum = _get_quantum_client(module, module.params) neutron = _get_neutron_client(module, module.params)
except Exception as e: except Exception as e:
module.fail_json(msg="Error in authenticating to nova: %s" % e.message) module.fail_json(msg="Error in authenticating to nova: %s" % e.message)
@ -216,23 +219,23 @@ def main():
if not server_info: if not server_info:
module.fail_json(msg="The instance name provided cannot be found") module.fail_json(msg="The instance name provided cannot be found")
fixed_ip, port_id = _get_port_info(quantum, module, server_info['id']) fixed_ip, port_id = _get_port_info(neutron, module, server_info['id'])
if not port_id: if not port_id:
module.fail_json(msg="Cannot find a port for this instance, maybe fixed ip is not assigned") module.fail_json(msg="Cannot find a port for this instance, maybe fixed ip is not assigned")
floating_id, floating_ip = _get_floating_ip(module, quantum, fixed_ip) floating_id, floating_ip = _get_floating_ip(module, neutron, fixed_ip)
if module.params['state'] == 'present': if module.params['state'] == 'present':
if floating_ip: if floating_ip:
module.exit_json(changed = False, public_ip=floating_ip) module.exit_json(changed = False, public_ip=floating_ip)
net_id = _get_net_id(quantum, module) net_id = _get_net_id(neutron, module)
if not net_id: if not net_id:
module.fail_json(msg = "cannot find the network specified, please check") module.fail_json(msg = "cannot find the network specified, please check")
_create_floating_ip(quantum, module, port_id, net_id) _create_floating_ip(neutron, module, port_id, net_id)
if module.params['state'] == 'absent': if module.params['state'] == 'absent':
if floating_ip: if floating_ip:
_update_floating_ip(quantum, module, None, floating_id) _update_floating_ip(neutron, module, None, floating_id)
module.exit_json(changed=False) module.exit_json(changed=False)
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py

@ -18,11 +18,14 @@
try: try:
from novaclient.v1_1 import client as nova_client from novaclient.v1_1 import client as nova_client
from quantumclient.quantum import client try:
from neutronclient.neutron import client
except ImportError:
from quantumclient.quantum import client
from keystoneclient.v2_0 import client as ksclient from keystoneclient.v2_0 import client as ksclient
import time import time
except ImportError: except ImportError:
print "failed=True msg='glanceclient,novaclient and keystone client are required'" print "failed=True msg='novaclient, keystone, and quantumclient (or neutronclient) client are required'"
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
@ -72,7 +75,7 @@ options:
- floating ip that should be assigned to the instance - floating ip that should be assigned to the instance
required: true required: true
default: None default: None
requirements: ["quantumclient", "keystoneclient"] requirements: ["quantumclient", "neutronclient", "keystoneclient"]
''' '''
EXAMPLES = ''' EXAMPLES = '''
@ -103,10 +106,10 @@ def _get_endpoint(module, ksclient):
try: try:
endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL') endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL')
except Exception as e: except Exception as e:
module.fail_json(msg = "Error getting endpoint for glance: %s" % e.message) module.fail_json(msg = "Error getting network endpoint: %s" % e.message)
return endpoint return endpoint
def _get_quantum_client(module, kwargs): def _get_neutron_client(module, kwargs):
_ksclient = _get_ksclient(module, kwargs) _ksclient = _get_ksclient(module, kwargs)
token = _ksclient.auth_token token = _ksclient.auth_token
endpoint = _get_endpoint(module, _ksclient) endpoint = _get_endpoint(module, _ksclient)
@ -115,10 +118,10 @@ def _get_quantum_client(module, kwargs):
'endpoint_url': endpoint 'endpoint_url': endpoint
} }
try: try:
quantum = client.Client('2.0', **kwargs) neutron = client.Client('2.0', **kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in connecting to quantum: %s " % e.message) module.fail_json(msg = "Error in connecting to neutron: %s " % e.message)
return quantum return neutron
def _get_server_state(module, nova): def _get_server_state(module, nova):
server_info = None server_info = None
@ -136,22 +139,22 @@ def _get_server_state(module, nova):
module.fail_json(msg = "Error in getting the server list: %s" % e.message) module.fail_json(msg = "Error in getting the server list: %s" % e.message)
return server_info, server return server_info, server
def _get_port_id(quantum, module, instance_id): def _get_port_id(neutron, module, instance_id):
kwargs = dict(device_id = instance_id) kwargs = dict(device_id = instance_id)
try: try:
ports = quantum.list_ports(**kwargs) ports = neutron.list_ports(**kwargs)
except Exception as e: 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']: if not ports['ports']:
return None return None
return ports['ports'][0]['id'] return ports['ports'][0]['id']
def _get_floating_ip_id(module, quantum): def _get_floating_ip_id(module, neutron):
kwargs = { kwargs = {
'floating_ip_address': module.params['ip_address'] 'floating_ip_address': module.params['ip_address']
} }
try: try:
ips = quantum.list_floatingips(**kwargs) ips = neutron.list_floatingips(**kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = "error in fetching the floatingips's %s" % e.message) module.fail_json(msg = "error in fetching the floatingips's %s" % e.message)
if not ips['floatingips']: if not ips['floatingips']:
@ -163,12 +166,12 @@ def _get_floating_ip_id(module, quantum):
state = "attached" state = "attached"
return state, ip return state, ip
def _update_floating_ip(quantum, module, port_id, floating_ip_id): def _update_floating_ip(neutron, module, port_id, floating_ip_id):
kwargs = { kwargs = {
'port_id': port_id 'port_id': port_id
} }
try: try:
result = quantum.update_floatingip(floating_ip_id, {'floatingip': kwargs}) result = neutron.update_floatingip(floating_ip_id, {'floatingip': kwargs})
except Exception as e: except Exception as e:
module.fail_json(msg = "There was an error in updating the floating ip address: %s" % e.message) module.fail_json(msg = "There was an error in updating the floating ip address: %s" % e.message)
module.exit_json(changed = True, result = result, public_ip=module.params['ip_address']) module.exit_json(changed = True, result = result, public_ip=module.params['ip_address'])
@ -189,27 +192,28 @@ def main():
) )
try: try:
nova = nova_client.Client(module.params['login_username'], module.params['login_password'], module.params['login_tenant_name'], module.params['auth_url'], service_type='compute') nova = nova_client.Client(module.params['login_username'], module.params['login_password'],
module.params['login_tenant_name'], module.params['auth_url'], service_type='compute')
except Exception as e: except Exception as e:
module.fail_json( msg = " Error in authenticating to nova: %s" % e.message) module.fail_json( msg = " Error in authenticating to nova: %s" % e.message)
quantum = _get_quantum_client(module, module.params) neutron = _get_neutron_client(module, module.params)
state, floating_ip_id = _get_floating_ip_id(module, quantum) state, floating_ip_id = _get_floating_ip_id(module, neutron)
if module.params['state'] == 'present': if module.params['state'] == 'present':
if state == 'attached': if state == 'attached':
module.exit_json(changed = False, result = 'attached', public_ip=module.params['ip_address']) module.exit_json(changed = False, result = 'attached', public_ip=module.params['ip_address'])
server_info, server_obj = _get_server_state(module, nova) server_info, server_obj = _get_server_state(module, nova)
if not server_info: if not server_info:
module.fail_json(msg = " The instance name provided cannot be found") module.fail_json(msg = " The instance name provided cannot be found")
port_id = _get_port_id(quantum, module, server_info['id']) port_id = _get_port_id(neutron, module, server_info['id'])
if not port_id: if not port_id:
module.fail_json(msg = "Cannot find a port for this instance, maybe fixed ip is not assigned") module.fail_json(msg = "Cannot find a port for this instance, maybe fixed ip is not assigned")
_update_floating_ip(quantum, module, port_id, floating_ip_id) _update_floating_ip(neutron, module, port_id, floating_ip_id)
if module.params['state'] == 'absent': if module.params['state'] == 'absent':
if state == 'detached': if state == 'detached':
module.exit_json(changed = False, result = 'detached') module.exit_json(changed = False, result = 'detached')
if state == 'attached': if state == 'attached':
_update_floating_ip(quantum, module, None, floating_ip_id) _update_floating_ip(neutron, module, None, floating_ip_id)
module.exit_json(changed = True, result = "detached") module.exit_json(changed = True, result = "detached")
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py

@ -17,10 +17,13 @@
# along with this software. If not, see <http://www.gnu.org/licenses/>. # along with this software. If not, see <http://www.gnu.org/licenses/>.
try: try:
from quantumclient.quantum import client try:
from neutronclient.neutron import client
except ImportError:
from quantumclient.quantum import client
from keystoneclient.v2_0 import client as ksclient from keystoneclient.v2_0 import client as ksclient
except ImportError: except ImportError:
print("failed=True msg='quantumclient and keystone client are required'") print("failed=True msg='quantumclient (or neutronclient) and keystone client are required'")
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
@ -100,7 +103,7 @@ options:
- Whether the state should be marked as up or down - Whether the state should be marked as up or down
required: false required: false
default: true default: true
requirements: ["quantumclient", "keystoneclient"] requirements: ["quantumclient", "neutronclient", "keystoneclient"]
''' '''
@ -136,10 +139,10 @@ def _get_endpoint(module, ksclient):
try: try:
endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL') endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL')
except Exception as e: except Exception as e:
module.fail_json(msg = "Error getting endpoint for Quantum: %s " %e.message) module.fail_json(msg = "Error getting network endpoint: %s " %e.message)
return endpoint return endpoint
def _get_quantum_client(module, kwargs): def _get_neutron_client(module, kwargs):
_ksclient = _get_ksclient(module, kwargs) _ksclient = _get_ksclient(module, kwargs)
token = _ksclient.auth_token token = _ksclient.auth_token
endpoint = _get_endpoint(module, _ksclient) endpoint = _get_endpoint(module, _ksclient)
@ -148,10 +151,10 @@ def _get_quantum_client(module, kwargs):
'endpoint_url': endpoint 'endpoint_url': endpoint
} }
try: try:
quantum = client.Client('2.0', **kwargs) neutron = client.Client('2.0', **kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = " Error in connecting to quantum: %s " %e.message) module.fail_json(msg = " Error in connecting to neutron: %s " %e.message)
return quantum return neutron
def _set_tenant_id(module): def _set_tenant_id(module):
global _os_tenant_id global _os_tenant_id
@ -168,22 +171,22 @@ def _set_tenant_id(module):
module.fail_json(msg = "The tenant id cannot be found, please check the paramters") module.fail_json(msg = "The tenant id cannot be found, please check the paramters")
def _get_net_id(quantum, module): def _get_net_id(neutron, module):
kwargs = { kwargs = {
'tenant_id': _os_tenant_id, 'tenant_id': _os_tenant_id,
'name': module.params['name'], 'name': module.params['name'],
} }
try: try:
networks = quantum.list_networks(**kwargs) networks = neutron.list_networks(**kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in listing quantum networks: %s" % e.message) module.fail_json(msg = "Error in listing neutron networks: %s" % e.message)
if not networks['networks']: if not networks['networks']:
return None return None
return networks['networks'][0]['id'] return networks['networks'][0]['id']
def _create_network(module, quantum): def _create_network(module, neutron):
quantum.format = 'json' neutron.format = 'json'
network = { network = {
'name': module.params.get('name'), 'name': module.params.get('name'),
@ -212,15 +215,15 @@ def _create_network(module, quantum):
network.pop('provider:segmentation_id', None) network.pop('provider:segmentation_id', None)
try: try:
net = quantum.create_network({'network':network}) net = neutron.create_network({'network':network})
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in creating network: %s" % e.message) module.fail_json(msg = "Error in creating network: %s" % e.message)
return net['network']['id'] return net['network']['id']
def _delete_network(module, net_id, quantum): def _delete_network(module, net_id, neutron):
try: try:
id = quantum.delete_network(net_id) id = neutron.delete_network(net_id)
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in deleting the network: %s" % e.message) module.fail_json(msg = "Error in deleting the network: %s" % e.message)
return True return True
@ -254,24 +257,24 @@ def main():
if not module.params['provider_segmentation_id']: if not module.params['provider_segmentation_id']:
module.fail_json(msg = " for vlan & gre networks, variable provider_segmentation_id should be set.") module.fail_json(msg = " for vlan & gre networks, variable provider_segmentation_id should be set.")
quantum = _get_quantum_client(module, module.params) neutron = _get_neutron_client(module, module.params)
_set_tenant_id(module) _set_tenant_id(module)
if module.params['state'] == 'present': if module.params['state'] == 'present':
network_id = _get_net_id(quantum, module) network_id = _get_net_id(neutron, module)
if not network_id: if not network_id:
network_id = _create_network(module, quantum) network_id = _create_network(module, neutron)
module.exit_json(changed = True, result = "Created", id = network_id) module.exit_json(changed = True, result = "Created", id = network_id)
else: else:
module.exit_json(changed = False, result = "Success", id = network_id) module.exit_json(changed = False, result = "Success", id = network_id)
if module.params['state'] == 'absent': if module.params['state'] == 'absent':
network_id = _get_net_id(quantum, module) network_id = _get_net_id(neutron, module)
if not network_id: if not network_id:
module.exit_json(changed = False, result = "Success") module.exit_json(changed = False, result = "Success")
else: else:
_delete_network(module, network_id, quantum) _delete_network(module, network_id, neutron)
module.exit_json(changed = True, result = "Deleted") module.exit_json(changed = True, result = "Deleted")
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py

@ -17,10 +17,13 @@
# along with this software. If not, see <http://www.gnu.org/licenses/>. # along with this software. If not, see <http://www.gnu.org/licenses/>.
try: try:
from quantumclient.quantum import client try:
from neutronclient.neutron import client
except ImportError:
from quantumclient.quantum import client
from keystoneclient.v2_0 import client as ksclient from keystoneclient.v2_0 import client as ksclient
except ImportError: except ImportError:
print("failed=True msg='quantumclient and keystone client are required'") print("failed=True msg='quantumclient (or neutronclient) and keystone client are required'")
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
@ -75,7 +78,7 @@ options:
- desired admin state of the created router . - desired admin state of the created router .
required: false required: false
default: true default: true
requirements: ["quantumclient", "keystoneclient"] requirements: ["quantumclient", "neutronclient", "keystoneclient"]
''' '''
EXAMPLES = ''' EXAMPLES = '''
@ -107,10 +110,10 @@ def _get_endpoint(module, ksclient):
try: try:
endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL') endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL')
except Exception as e: except Exception as e:
module.fail_json(msg = "Error getting endpoint for glance: %s" % e.message) module.fail_json(msg = "Error getting network endpoint: %s" % e.message)
return endpoint return endpoint
def _get_quantum_client(module, kwargs): def _get_neutron_client(module, kwargs):
_ksclient = _get_ksclient(module, kwargs) _ksclient = _get_ksclient(module, kwargs)
token = _ksclient.auth_token token = _ksclient.auth_token
endpoint = _get_endpoint(module, _ksclient) endpoint = _get_endpoint(module, _ksclient)
@ -119,10 +122,10 @@ def _get_quantum_client(module, kwargs):
'endpoint_url': endpoint 'endpoint_url': endpoint
} }
try: try:
quantum = client.Client('2.0', **kwargs) neutron = client.Client('2.0', **kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in connecting to quantum: %s " % e.message) module.fail_json(msg = "Error in connecting to neutron: %s " % e.message)
return quantum return neutron
def _set_tenant_id(module): def _set_tenant_id(module):
global _os_tenant_id global _os_tenant_id
@ -139,34 +142,34 @@ def _set_tenant_id(module):
module.fail_json(msg = "The tenant id cannot be found, please check the paramters") module.fail_json(msg = "The tenant id cannot be found, please check the paramters")
def _get_router_id(module, quantum): def _get_router_id(module, neutron):
kwargs = { kwargs = {
'name': module.params['name'], 'name': module.params['name'],
'tenant_id': _os_tenant_id, 'tenant_id': _os_tenant_id,
} }
try: try:
routers = quantum.list_routers(**kwargs) routers = neutron.list_routers(**kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in getting the router list: %s " % e.message) module.fail_json(msg = "Error in getting the router list: %s " % e.message)
if not routers['routers']: if not routers['routers']:
return None return None
return routers['routers'][0]['id'] return routers['routers'][0]['id']
def _create_router(module, quantum): def _create_router(module, neutron):
router = { router = {
'name': module.params['name'], 'name': module.params['name'],
'tenant_id': _os_tenant_id, 'tenant_id': _os_tenant_id,
'admin_state_up': module.params['admin_state_up'], 'admin_state_up': module.params['admin_state_up'],
} }
try: try:
new_router = quantum.create_router(dict(router=router)) new_router = neutron.create_router(dict(router=router))
except Exception as e: except Exception as e:
module.fail_json( msg = "Error in creating router: %s" % e.message) module.fail_json( msg = "Error in creating router: %s" % e.message)
return new_router['router']['id'] return new_router['router']['id']
def _delete_router(module, quantum, router_id): def _delete_router(module, neutron, router_id):
try: try:
quantum.delete_router(router_id) neutron.delete_router(router_id)
except: except:
module.fail_json("Error in deleting the router") module.fail_json("Error in deleting the router")
return True return True
@ -186,23 +189,23 @@ def main():
), ),
) )
quantum = _get_quantum_client(module, module.params) neutron = _get_neutron_client(module, module.params)
_set_tenant_id(module) _set_tenant_id(module)
if module.params['state'] == 'present': if module.params['state'] == 'present':
router_id = _get_router_id(module, quantum) router_id = _get_router_id(module, neutron)
if not router_id: if not router_id:
router_id = _create_router(module, quantum) router_id = _create_router(module, neutron)
module.exit_json(changed=True, result="Created", id=router_id) module.exit_json(changed=True, result="Created", id=router_id)
else: else:
module.exit_json(changed=False, result="success" , id=router_id) module.exit_json(changed=False, result="success" , id=router_id)
else: else:
router_id = _get_router_id(module, quantum) router_id = _get_router_id(module, neutron)
if not router_id: if not router_id:
module.exit_json(changed=False, result="success") module.exit_json(changed=False, result="success")
else: else:
_delete_router(module, quantum, router_id) _delete_router(module, neutron, router_id)
module.exit_json(changed=True, result="deleted") module.exit_json(changed=True, result="deleted")
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py

@ -17,10 +17,13 @@
# along with this software. If not, see <http://www.gnu.org/licenses/>. # along with this software. If not, see <http://www.gnu.org/licenses/>.
try: try:
from quantumclient.quantum import client try:
from neutronclient.neutron import client
except ImportError:
from quantumclient.quantum import client
from keystoneclient.v2_0 import client as ksclient from keystoneclient.v2_0 import client as ksclient
except ImportError: except ImportError:
print("failed=True msg='quantumclient and keystone client are required'") print("failed=True msg='quantumclient (or neutronclient) and keystone client are required'")
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
module: quantum_router_gateway module: quantum_router_gateway
@ -69,7 +72,7 @@ options:
- Name of the external network which should be attached to the router. - Name of the external network which should be attached to the router.
required: true required: true
default: None default: None
requirements: ["quantumclient", "keystoneclient"] requirements: ["quantumclient", "neutronclient", "keystoneclient"]
''' '''
EXAMPLES = ''' EXAMPLES = '''
@ -97,10 +100,10 @@ def _get_endpoint(module, ksclient):
try: try:
endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL') endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL')
except Exception as e: except Exception as e:
module.fail_json(msg = "Error getting endpoint for glance: %s" % e.message) module.fail_json(msg = "Error getting network endpoint: %s" % e.message)
return endpoint return endpoint
def _get_quantum_client(module, kwargs): def _get_neutron_client(module, kwargs):
_ksclient = _get_ksclient(module, kwargs) _ksclient = _get_ksclient(module, kwargs)
token = _ksclient.auth_token token = _ksclient.auth_token
endpoint = _get_endpoint(module, _ksclient) endpoint = _get_endpoint(module, _ksclient)
@ -109,62 +112,62 @@ def _get_quantum_client(module, kwargs):
'endpoint_url': endpoint 'endpoint_url': endpoint
} }
try: try:
quantum = client.Client('2.0', **kwargs) neutron = client.Client('2.0', **kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in connecting to quantum: %s " % e.message) module.fail_json(msg = "Error in connecting to neutron: %s " % e.message)
return quantum return neutron
def _get_router_id(module, quantum): def _get_router_id(module, neutron):
kwargs = { kwargs = {
'name': module.params['router_name'], 'name': module.params['router_name'],
} }
try: try:
routers = quantum.list_routers(**kwargs) routers = neutron.list_routers(**kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in getting the router list: %s " % e.message) module.fail_json(msg = "Error in getting the router list: %s " % e.message)
if not routers['routers']: if not routers['routers']:
return None return None
return routers['routers'][0]['id'] return routers['routers'][0]['id']
def _get_net_id(quantum, module): def _get_net_id(neutron, module):
kwargs = { kwargs = {
'name': module.params['network_name'], 'name': module.params['network_name'],
'router:external': True 'router:external': True
} }
try: try:
networks = quantum.list_networks(**kwargs) networks = neutron.list_networks(**kwargs)
except Exception as e: except Exception as e:
module.fail_json("Error in listing quantum networks: %s" % e.message) module.fail_json("Error in listing neutron networks: %s" % e.message)
if not networks['networks']: if not networks['networks']:
return None return None
return networks['networks'][0]['id'] return networks['networks'][0]['id']
def _get_port_id(quantum, module, router_id, network_id): def _get_port_id(neutron, module, router_id, network_id):
kwargs = { kwargs = {
'device_id': router_id, 'device_id': router_id,
'network_id': network_id, 'network_id': network_id,
} }
try: try:
ports = quantum.list_ports(**kwargs) ports = neutron.list_ports(**kwargs)
except Exception as e: 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']: if not ports['ports']:
return None return None
return ports['ports'][0]['id'] return ports['ports'][0]['id']
def _add_gateway_router(quantum, module, router_id, network_id): def _add_gateway_router(neutron, module, router_id, network_id):
kwargs = { kwargs = {
'network_id': network_id 'network_id': network_id
} }
try: try:
quantum.add_gateway_router(router_id, kwargs) neutron.add_gateway_router(router_id, kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in adding gateway to router: %s" % e.message) module.fail_json(msg = "Error in adding gateway to router: %s" % e.message)
return True return True
def _remove_gateway_router(quantum, module, router_id): def _remove_gateway_router(neutron, module, router_id):
try: try:
quantum.remove_gateway_router(router_id) neutron.remove_gateway_router(router_id)
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in removing gateway to router: %s" % e.message) module.fail_json(msg = "Error in removing gateway to router: %s" % e.message)
return True return True
@ -184,28 +187,28 @@ def main():
), ),
) )
quantum = _get_quantum_client(module, module.params) neutron = _get_neutron_client(module, module.params)
router_id = _get_router_id(module, quantum) router_id = _get_router_id(module, neutron)
if not router_id: if not router_id:
module.fail_json(msg="failed to get the router id, please check the router name") module.fail_json(msg="failed to get the router id, please check the router name")
network_id = _get_net_id(quantum, module) network_id = _get_net_id(neutron, module)
if not network_id: if not network_id:
module.fail_json(msg="failed to get the network id, please check the network name and make sure it is external") module.fail_json(msg="failed to get the network id, please check the network name and make sure it is external")
if module.params['state'] == 'present': if module.params['state'] == 'present':
port_id = _get_port_id(quantum, module, router_id, network_id) port_id = _get_port_id(neutron, module, router_id, network_id)
if not port_id: if not port_id:
_add_gateway_router(quantum, module, router_id, network_id) _add_gateway_router(neutron, module, router_id, network_id)
module.exit_json(changed=True, result="created") module.exit_json(changed=True, result="created")
module.exit_json(changed=False, result="success") module.exit_json(changed=False, result="success")
if module.params['state'] == 'absent': if module.params['state'] == 'absent':
port_id = _get_port_id(quantum, module, router_id, network_id) port_id = _get_port_id(neutron, module, router_id, network_id)
if not port_id: if not port_id:
module.exit_json(changed=False, result="Success") module.exit_json(changed=False, result="Success")
_remove_gateway_router(quantum, module, router_id) _remove_gateway_router(neutron, module, router_id)
module.exit_json(changed=True, result="Deleted") module.exit_json(changed=True, result="Deleted")
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py

@ -17,10 +17,13 @@
# along with this software. If not, see <http://www.gnu.org/licenses/>. # along with this software. If not, see <http://www.gnu.org/licenses/>.
try: try:
from quantumclient.quantum import client try:
from neutronclient.neutron import client
except ImportError:
from quantumclient.quantum import client
from keystoneclient.v2_0 import client as ksclient from keystoneclient.v2_0 import client as ksclient
except ImportError: except ImportError:
print("failed=True msg='quantumclient and keystone client are required'") print("failed=True msg='quantumclient (or neutronclient) and keystone client are required'")
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
module: quantum_router_interface module: quantum_router_interface
@ -108,10 +111,10 @@ def _get_endpoint(module, ksclient):
try: try:
endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL') endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL')
except Exception as e: except Exception as e:
module.fail_json(msg = "Error getting endpoint for glance: %s" % e.message) module.fail_json(msg = "Error getting network endpoint: %s" % e.message)
return endpoint return endpoint
def _get_quantum_client(module, kwargs): def _get_neutron_client(module, kwargs):
_ksclient = _get_ksclient(module, kwargs) _ksclient = _get_ksclient(module, kwargs)
token = _ksclient.auth_token token = _ksclient.auth_token
endpoint = _get_endpoint(module, _ksclient) endpoint = _get_endpoint(module, _ksclient)
@ -120,10 +123,10 @@ def _get_quantum_client(module, kwargs):
'endpoint_url': endpoint 'endpoint_url': endpoint
} }
try: try:
quantum = client.Client('2.0', **kwargs) neutron = client.Client('2.0', **kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in connecting to quantum: %s " % e.message) module.fail_json(msg = "Error in connecting to neutron: %s " % e.message)
return quantum return neutron
def _set_tenant_id(module): def _set_tenant_id(module):
global _os_tenant_id global _os_tenant_id
@ -140,12 +143,12 @@ def _set_tenant_id(module):
module.fail_json(msg = "The tenant id cannot be found, please check the paramters") module.fail_json(msg = "The tenant id cannot be found, please check the paramters")
def _get_router_id(module, quantum): def _get_router_id(module, neutron):
kwargs = { kwargs = {
'name': module.params['router_name'], 'name': module.params['router_name'],
} }
try: try:
routers = quantum.list_routers(**kwargs) routers = neutron.list_routers(**kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = "Error in getting the router list: %s " % e.message) module.fail_json(msg = "Error in getting the router list: %s " % e.message)
if not routers['routers']: if not routers['routers']:
@ -153,27 +156,27 @@ def _get_router_id(module, quantum):
return routers['routers'][0]['id'] return routers['routers'][0]['id']
def _get_subnet_id(module, quantum): def _get_subnet_id(module, neutron):
subnet_id = None subnet_id = None
kwargs = { kwargs = {
'tenant_id': _os_tenant_id, 'tenant_id': _os_tenant_id,
'name': module.params['subnet_name'], 'name': module.params['subnet_name'],
} }
try: try:
subnets = quantum.list_subnets(**kwargs) subnets = neutron.list_subnets(**kwargs)
except Exception as e: except Exception as e:
module.fail_json( msg = " Error in getting the subnet list:%s " % e.message) module.fail_json( msg = " Error in getting the subnet list:%s " % e.message)
if not subnets['subnets']: if not subnets['subnets']:
return None return None
return subnets['subnets'][0]['id'] return subnets['subnets'][0]['id']
def _get_port_id(quantum, module, router_id, subnet_id): def _get_port_id(neutron, module, router_id, subnet_id):
kwargs = { kwargs = {
'tenant_id': _os_tenant_id, 'tenant_id': _os_tenant_id,
'device_id': router_id, 'device_id': router_id,
} }
try: try:
ports = quantum.list_ports(**kwargs) ports = neutron.list_ports(**kwargs)
except Exception as e: 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']: if not ports['ports']:
@ -184,22 +187,22 @@ def _get_port_id(quantum, module, router_id, subnet_id):
return port['id'] return port['id']
return None return None
def _add_interface_router(quantum, module, router_id, subnet_id): def _add_interface_router(neutron, module, router_id, subnet_id):
kwargs = { kwargs = {
'subnet_id': subnet_id 'subnet_id': subnet_id
} }
try: try:
quantum.add_interface_router(router_id, kwargs) neutron.add_interface_router(router_id, kwargs)
except Exception as e: 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 return True
def _remove_interface_router(quantum, module, router_id, subnet_id): def _remove_interface_router(neutron, module, router_id, subnet_id):
kwargs = { kwargs = {
'subnet_id': subnet_id 'subnet_id': subnet_id
} }
try: try:
quantum.remove_interface_router(router_id, kwargs) neutron.remove_interface_router(router_id, kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg="Error in removing interface from router: %s" % e.message) module.fail_json(msg="Error in removing interface from router: %s" % e.message)
return True return True
@ -219,29 +222,29 @@ def main():
), ),
) )
quantum = _get_quantum_client(module, module.params) neutron = _get_neutron_client(module, module.params)
_set_tenant_id(module) _set_tenant_id(module)
router_id = _get_router_id(module, quantum) router_id = _get_router_id(module, neutron)
if not router_id: if not router_id:
module.fail_json(msg="failed to get the router id, please check the router name") module.fail_json(msg="failed to get the router id, please check the router name")
subnet_id = _get_subnet_id(module, quantum) subnet_id = _get_subnet_id(module, neutron)
if not subnet_id: 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': if module.params['state'] == 'present':
port_id = _get_port_id(quantum, module, router_id, subnet_id) port_id = _get_port_id(neutron, module, router_id, subnet_id)
if not port_id: if not port_id:
_add_interface_router(quantum, module, router_id, subnet_id) _add_interface_router(neutron, module, router_id, subnet_id)
module.exit_json(changed=True, result="created", id=port_id) module.exit_json(changed=True, result="created", id=port_id)
module.exit_json(changed=False, result="success", id=port_id) module.exit_json(changed=False, result="success", id=port_id)
if module.params['state'] == 'absent': if module.params['state'] == 'absent':
port_id = _get_port_id(quantum, module, router_id, subnet_id) port_id = _get_port_id(neutron, module, router_id, subnet_id)
if not port_id: if not port_id:
module.exit_json(changed = False, result = "Success") module.exit_json(changed = False, result = "Success")
_remove_interface_router(quantum, module, router_id, subnet_id) _remove_interface_router(neutron, module, router_id, subnet_id)
module.exit_json(changed=True, result="Deleted") module.exit_json(changed=True, result="Deleted")
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py

@ -17,10 +17,13 @@
# along with this software. If not, see <http://www.gnu.org/licenses/>. # along with this software. If not, see <http://www.gnu.org/licenses/>.
try: try:
from quantumclient.quantum import client try:
from neutronclient.neutron import client
except ImportError:
from quantumclient.quantum import client
from keystoneclient.v2_0 import client as ksclient from keystoneclient.v2_0 import client as ksclient
except ImportError: except ImportError:
print("failed=True msg='quantum and keystone client are required'") print("failed=True msg='quantumclient (or neutronclient) and keystoneclient are required'")
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
@ -105,7 +108,7 @@ options:
- From the subnet pool the last IP that should be assigned to the virtual machines - From the subnet pool the last IP that should be assigned to the virtual machines
required: false required: false
default: None default: None
requirements: ["quantum", "keystoneclient"] requirements: ["quantumclient", "neutronclient", "keystoneclient"]
''' '''
EXAMPLES = ''' EXAMPLES = '''
@ -136,10 +139,10 @@ def _get_endpoint(module, ksclient):
try: try:
endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL') endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL')
except Exception as e: except Exception as e:
module.fail_json(msg = "Error getting endpoint for glance: %s" % e.message) module.fail_json(msg = "Error getting network endpoint: %s" % e.message)
return endpoint return endpoint
def _get_quantum_client(module, kwargs): def _get_neutron_client(module, kwargs):
_ksclient = _get_ksclient(module, kwargs) _ksclient = _get_ksclient(module, kwargs)
token = _ksclient.auth_token token = _ksclient.auth_token
endpoint = _get_endpoint(module, _ksclient) endpoint = _get_endpoint(module, _ksclient)
@ -148,10 +151,10 @@ def _get_quantum_client(module, kwargs):
'endpoint_url': endpoint 'endpoint_url': endpoint
} }
try: try:
quantum = client.Client('2.0', **kwargs) neutron = client.Client('2.0', **kwargs)
except Exception as e: except Exception as e:
module.fail_json(msg = " Error in connecting to quantum: %s" % e.message) module.fail_json(msg = " Error in connecting to neutron: %s" % e.message)
return quantum return neutron
def _set_tenant_id(module): def _set_tenant_id(module):
global _os_tenant_id global _os_tenant_id
@ -167,24 +170,24 @@ def _set_tenant_id(module):
if not _os_tenant_id: if not _os_tenant_id:
module.fail_json(msg = "The tenant id cannot be found, please check the paramters") module.fail_json(msg = "The tenant id cannot be found, please check the paramters")
def _get_net_id(quantum, module): def _get_net_id(neutron, module):
kwargs = { kwargs = {
'tenant_id': _os_tenant_id, 'tenant_id': _os_tenant_id,
'name': module.params['network_name'], 'name': module.params['network_name'],
} }
try: try:
networks = quantum.list_networks(**kwargs) networks = neutron.list_networks(**kwargs)
except Exception as e: except Exception as e:
module.fail_json("Error in listing quantum networks: %s" % e.message) module.fail_json("Error in listing neutron networks: %s" % e.message)
if not networks['networks']: if not networks['networks']:
return None return None
return networks['networks'][0]['id'] return networks['networks'][0]['id']
def _get_subnet_id(module, quantum): def _get_subnet_id(module, neutron):
global _os_network_id global _os_network_id
subnet_id = None subnet_id = None
_os_network_id = _get_net_id(quantum, module) _os_network_id = _get_net_id(neutron, module)
if not _os_network_id: if not _os_network_id:
module.fail_json(msg = "network id of network not found.") module.fail_json(msg = "network id of network not found.")
else: else:
@ -193,15 +196,15 @@ def _get_subnet_id(module, quantum):
'name': module.params['name'], 'name': module.params['name'],
} }
try: try:
subnets = quantum.list_subnets(**kwargs) subnets = neutron.list_subnets(**kwargs)
except Exception as e: except Exception as e:
module.fail_json( msg = " Error in getting the subnet list:%s " % e.message) module.fail_json( msg = " Error in getting the subnet list:%s " % e.message)
if not subnets['subnets']: if not subnets['subnets']:
return None return None
return subnets['subnets'][0]['id'] return subnets['subnets'][0]['id']
def _create_subnet(module, quantum): def _create_subnet(module, neutron):
quantum.format = 'json' neutron.format = 'json'
subnet = { subnet = {
'name': module.params['name'], 'name': module.params['name'],
'ip_version': module.params['ip_version'], 'ip_version': module.params['ip_version'],
@ -227,15 +230,15 @@ def _create_subnet(module, quantum):
else: else:
subnet.pop('dns_nameservers') subnet.pop('dns_nameservers')
try: try:
new_subnet = quantum.create_subnet(dict(subnet=subnet)) new_subnet = neutron.create_subnet(dict(subnet=subnet))
except Exception, e: except Exception, e:
module.fail_json(msg = "Failure in creating subnet: %s" % e.message) module.fail_json(msg = "Failure in creating subnet: %s" % e.message)
return new_subnet['subnet']['id'] return new_subnet['subnet']['id']
def _delete_subnet(module, quantum, subnet_id): def _delete_subnet(module, neutron, subnet_id):
try: try:
quantum.delete_subnet(subnet_id) neutron.delete_subnet(subnet_id)
except Exception as e: except Exception as e:
module.fail_json( msg = "Error in deleting subnet: %s" % e.message) module.fail_json( msg = "Error in deleting subnet: %s" % e.message)
return True return True
@ -263,21 +266,21 @@ def main():
allocation_pool_end = dict(default=None), allocation_pool_end = dict(default=None),
), ),
) )
quantum = _get_quantum_client(module, module.params) neutron = _get_neutron_client(module, module.params)
_set_tenant_id(module) _set_tenant_id(module)
if module.params['state'] == 'present': if module.params['state'] == 'present':
subnet_id = _get_subnet_id(module, quantum) subnet_id = _get_subnet_id(module, neutron)
if not subnet_id: if not subnet_id:
subnet_id = _create_subnet(module, quantum) subnet_id = _create_subnet(module, neutron)
module.exit_json(changed = True, result = "Created" , id = subnet_id) module.exit_json(changed = True, result = "Created" , id = subnet_id)
else: else:
module.exit_json(changed = False, result = "success" , id = subnet_id) module.exit_json(changed = False, result = "success" , id = subnet_id)
else: else:
subnet_id = _get_subnet_id(module, quantum) subnet_id = _get_subnet_id(module, neutron)
if not subnet_id: if not subnet_id:
module.exit_json(changed = False, result = "success") module.exit_json(changed = False, result = "success")
else: else:
_delete_subnet(module, quantum, subnet_id) _delete_subnet(module, neutron, subnet_id)
module.exit_json(changed = True, result = "deleted") module.exit_json(changed = True, result = "deleted")
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py

Loading…
Cancel
Save