return http_code,data tuple in DELETE operations for sol005 client
Change-Id: I2fd4b6bbf03d2c87edb2133da29ea9fae3ccecd9
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/osmclient/sol005/http.py b/osmclient/sol005/http.py
index c89e91b..20593b8 100644
--- a/osmclient/sol005/http.py
+++ b/osmclient/sol005/http.py
@@ -50,13 +50,9 @@
curl_cmd.close()
# TODO 202 accepted should be returned somehow
if data.getvalue():
- return json.loads(data.getvalue().decode())
- elif http_code == 404:
- return "NOT FOUND"
- elif http_code >= 300:
- return "Failed"
+ return http_code, json.loads(data.getvalue().decode())
else:
- return
+ return http_code, None
def send_cmd(self, endpoint='', postfields_dict=None,
formfile=None, filename=None,
diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py
index 4b55cc2..590cdb1 100644
--- a/osmclient/sol005/ns.py
+++ b/osmclient/sol005/ns.py
@@ -75,9 +75,11 @@
def delete(self, name):
ns = self.get(name)
- resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,ns['_id']))
- # print 'RESP: {}'.format(resp)
- if resp is None:
+ http_code, resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,ns['_id']))
+ #print 'RESP: {}'.format(resp)
+ if http_code == 202:
+ print 'Deletion in progress'
+ elif http_code == 204:
print 'Deleted'
else:
raise ClientException("failed to delete ns {}: {}".format(name, resp))
diff --git a/osmclient/sol005/nsd.py b/osmclient/sol005/nsd.py
index 3288e95..dac0adc 100644
--- a/osmclient/sol005/nsd.py
+++ b/osmclient/sol005/nsd.py
@@ -91,9 +91,11 @@
def delete(self, name):
nsd = self.get(name)
- resp = self._http.delete_cmd('{}/{}'.format(self._apiBase, nsd['_id']))
- #print 'RESP: '.format(resp)
- if resp is None:
+ http_code, resp = self._http.delete_cmd('{}/{}'.format(self._apiBase, nsd['_id']))
+ #print 'RESP: {}'.format(resp)
+ if http_code == 202:
+ print 'Deletion in progress'
+ elif http_code == 204:
print 'Deleted'
else:
raise ClientException("failed to delete nsd {}: {}".format(name, resp))
diff --git a/osmclient/sol005/sdncontroller.py b/osmclient/sol005/sdncontroller.py
index bc1f962..a7b9a47 100644
--- a/osmclient/sol005/sdncontroller.py
+++ b/osmclient/sol005/sdncontroller.py
@@ -47,12 +47,16 @@
def delete(self, name):
sdn_controller = self.get(name)
- resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,sdn_controller['_id']))
- #print 'RESP: '.format(resp)
- if 'result' not in resp:
- raise ClientException("failed to delete vim {} - {}".format(name, resp))
- else:
+ http_code, resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,sdn_controller['_id']))
+ #print 'RESP: {}'.format(resp)
+ if http_code == 202:
+ print 'Deletion in progress'
+ elif http_code == 204:
print 'Deleted'
+ elif 'result' in resp:
+ print 'Deleted'
+ else:
+ raise ClientException("failed to delete vim {} - {}".format(name, resp))
def list(self, filter=None):
"""Returns a list of SDN controllers
diff --git a/osmclient/sol005/vim.py b/osmclient/sol005/vim.py
index 8a0b11a..0dcc4ad 100644
--- a/osmclient/sol005/vim.py
+++ b/osmclient/sol005/vim.py
@@ -88,8 +88,11 @@
vim_id = vim_name
if not utils.validate_uuid4(vim_name):
vim_id = self.get_id(vim_name)
- resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,vim_id))
- if resp is None:
+ http_code, resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,vim_id))
+ #print 'RESP: {}'.format(resp)
+ if http_code == 202:
+ print 'Deletion in progress'
+ elif http_code == 204:
print 'Deleted'
else:
raise ClientException("failed to delete vim {} - {}".format(vim_name, resp))
diff --git a/osmclient/sol005/vnfd.py b/osmclient/sol005/vnfd.py
index bc77a8d..28ded17 100644
--- a/osmclient/sol005/vnfd.py
+++ b/osmclient/sol005/vnfd.py
@@ -90,9 +90,11 @@
def delete(self, name):
vnfd = self.get(name)
- resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,vnfd['_id']))
- #print 'RESP: '.format(resp)
- if resp is None:
+ http_code, resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,vnfd['_id']))
+ #print 'RESP: {}'.format(resp)
+ if http_code == 202:
+ print 'Deletion in progress'
+ elif http_code == 204:
print 'Deleted'
else:
raise ClientException("failed to delete vnfd {}: {}".format(name, resp))