openstack/shade
Code Issues Proposed changes

Replace neutronclient with REST API calls in network commands

Browse Source 
All network related commands to Neutron (list/create/delete)
are now made via keystoneauth

Change-Id: Ifa179c062c164d7e48e8a09c52e554dce5ddd1cb
This commit is contained in:
Sławek Kapłoński
2017-04-22 19:00:52 +00:00
parent ddf7859a81
commit 80ebf88bc2
2 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
shade/_tasks.py
View File

@@ -207,21 +207,6 @@ class KeypairDelete(task_manager.Task):
return client.nova_client.keypairs.delete(**self.args)
class NetworkList(task_manager.Task):
def main(self, client):
return client.neutron_client.list_networks(**self.args)
class NetworkCreate(task_manager.Task):
def main(self, client):
return client.neutron_client.create_network(**self.args)
class NetworkDelete(task_manager.Task):
def main(self, client):
return client.neutron_client.delete_network(**self.args)
class RouterList(task_manager.Task):
def main(self, client):
return client.neutron_client.list_routers()

18
shade/openstackcloud.py
View File

@@ -1639,9 +1639,7 @@ class OpenStackCloud(_normalize.Normalizer):
# Translate None from search interface to empty {} for kwargs below
if not filters:
filters = {}
with _utils.neutron_exceptions("Error fetching network list"):
return self.manager.submit_task(
_tasks.NetworkList(**filters))['networks']
return self._network_client.get("/networks.json", params=filters)
def list_routers(self, filters=None):
"""List all available routers.
@@ -2998,15 +2996,13 @@ class OpenStackCloud(_normalize.Normalizer):
if external:
network['router:external'] = True
with _utils.neutron_exceptions(
"Error creating network {0}".format(name)):
net = self.manager.submit_task(
_tasks.NetworkCreate(body=dict({'network': network})))
net = self._network_client.post("/networks.json",
json={'network': network})
# Reset cache so the new network is picked up
self._reset_network_caches()
return net['network']
return net
def delete_network(self, name_or_id):
"""Delete a network.
@@ -3022,10 +3018,8 @@ class OpenStackCloud(_normalize.Normalizer):
self.log.debug("Network %s not found for deleting", name_or_id)
return False
with _utils.neutron_exceptions(
"Error deleting network {0}".format(name_or_id)):
self.manager.submit_task(
_tasks.NetworkDelete(network=network['id']))
self._network_client.delete(
"/networks/{network_id}.json".format(network_id=network['id']))
# Reset cache so the deleted network is removed
self._reset_network_caches()