projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bug in vim-create with config
[osm/osmclient.git]
/
osmclient
/
sol005
/
vnfd.py
diff --git
a/osmclient/sol005/vnfd.py
b/osmclient/sol005/vnfd.py
index
6b09a1f
..
c903f93
100644
(file)
--- 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
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
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'
vnfd = self.get(name)
headers = self._client._headers
headers['Accept'] = 'application/binary'
- http_code, resp
2
= 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)
#print yaml.safe_dump(resp2)
- if resp
2
:
+ if resp:
#store in a file
#store in a file
- return resp
2
+ return resp
raise NotFound("vnfd {} not found".format(name))
def get_descriptor(self, name, filename):
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 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)
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'
#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:
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:
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)
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")
#print resp
if not resp or 'id' not in resp:
raise ClientException("failed to upload package")