diff --git a/shade/_tasks.py b/shade/_tasks.py index 0ee5d9ee5..a9cab011a 100644 --- a/shade/_tasks.py +++ b/shade/_tasks.py @@ -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() diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py index b8220b628..336105ba1 100644 --- a/shade/openstackcloud.py +++ b/shade/openstackcloud.py @@ -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()