X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fvnfd.py;h=c903f93fea7ce85cf8499c1454837bf392bfae8e;hb=da765d5ec750a9de0e4123d60ff211ca86a2ad61;hp=6b09a1f0d01e8d95fd5ca1bb7ab8b1af8d3dadd8;hpb=ce093de18e01ebda56b54c36ab69074cf3761f50;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/vnfd.py b/osmclient/sol005/vnfd.py index 6b09a1f..c903f93 100644 --- a/osmclient/sol005/vnfd.py +++ b/osmclient/sol005/vnfd.py @@ -22,6 +22,7 @@ from osmclient.common.exceptions import NotFound from osmclient.common.exceptions import ClientException from osmclient.common import utils import yaml +import json import magic #from os import stat #from os.path import basename @@ -72,11 +73,11 @@ class Vnfd(object): vnfd = self.get(name) headers = self._client._headers headers['Accept'] = 'application/binary' - http_code, resp2 = self._http.get2_cmd('{}/{}/{}'.format(self._apiBase, vnfd['_id'], thing)) + http_code, resp = self._http.get2_cmd('{}/{}/{}'.format(self._apiBase, vnfd['_id'], thing)) #print yaml.safe_dump(resp2) - if resp2: + if resp: #store in a file - return resp2 + return resp raise NotFound("vnfd {} not found".format(name)) def get_descriptor(self, name, filename): @@ -88,9 +89,15 @@ class Vnfd(object): def get_artifact(self, name, artifact, filename): self.get_thing(name, 'artifacts/{}'.format(artifact), filename) - def delete(self, name): + def delete(self, name, force=False): vnfd = self.get(name) - http_code, resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,vnfd['_id'])) + querystring = '' + if force: + querystring = '?FORCE=True' + http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase, + vnfd['_id'], querystring)) + if resp: + resp = json.loads(resp) #print 'RESP: {}'.format(resp) if http_code == 202: print 'Deletion in progress' @@ -124,7 +131,7 @@ class Vnfd(object): for (key,val) in headers.items()] self._http.set_http_header(http_header) if update_endpoint: - resp = self._http.put_cmd(endpoint=update_endpoint, filename=filename) + http_code, resp = self._http.put_cmd(endpoint=update_endpoint, filename=filename) else: ow_string = '' if overwrite: @@ -133,7 +140,9 @@ class Vnfd(object): self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) endpoint = '{}{}'.format(self._apiBase,ow_string) - resp = self._http.post_cmd(endpoint=endpoint, filename=filename) + http_code, resp = self._http.post_cmd(endpoint=endpoint, filename=filename) + if resp: + resp = json.loads(resp) #print resp if not resp or 'id' not in resp: raise ClientException("failed to upload package")