from osmclient.common import utils
import json
import magic
+from os.path import basename
#from os import stat
-#from os.path import basename
+
class Vnfd(object):
# It is redundant, since the previous one already gets the whole vnfpkginfo
# The only difference is that a different primitive is exercised
resp = self._http.get_cmd('{}/{}'.format(self._apiBase, vnfd['_id']))
- #print yaml.safe_dump(resp)
+ #print(yaml.safe_dump(resp))
if resp:
return resp
raise NotFound("vnfd {} not found".format(name))
headers = self._client._headers
headers['Accept'] = 'application/binary'
http_code, resp = self._http.get2_cmd('{}/{}/{}'.format(self._apiBase, vnfd['_id'], thing))
- #print 'HTTP CODE: {}'.format(http_code)
- #print 'RESP: {}'.format(resp)
+ #print('HTTP CODE: {}'.format(http_code))
+ #print('RESP: {}'.format(resp))
if http_code in (200, 201, 202, 204):
if resp:
#store in a file
querystring = '?FORCE=True'
http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase,
vnfd['_id'], querystring))
- #print 'HTTP CODE: {}'.format(http_code)
- #print 'RESP: {}'.format(resp)
+ #print('HTTP CODE: {}'.format(http_code))
+ #print('RESP: {}'.format(resp))
if http_code == 202:
print('Deletion in progress')
elif http_code == 204:
raise ClientException(
"failed to guess MIME type for file '{}'".format(filename))
headers= self._client._headers
- if mime_type in ['application/yaml', 'text/plain']:
- headers['Content-Type'] = 'application/yaml'
- elif mime_type == 'application/gzip':
+ headers['Content-Filename'] = basename(filename)
+ if mime_type in ['application/yaml', 'text/plain', 'application/json']:
+ headers['Content-Type'] = 'text/plain'
+ elif mime_type in ['application/gzip', 'application/x-gzip']:
headers['Content-Type'] = 'application/gzip'
#headers['Content-Type'] = 'application/binary'
# Next three lines are to be removed in next version
self._apiVersion, self._apiResource)
endpoint = '{}{}'.format(self._apiBase,ow_string)
http_code, resp = self._http.post_cmd(endpoint=endpoint, filename=filename)
- #print 'HTTP CODE: {}'.format(http_code)
- #print 'RESP: {}'.format(resp)
- if http_code in (200, 201, 202, 204):
+ #print('HTTP CODE: {}'.format(http_code))
+ #print('RESP: {}'.format(resp))
+ if http_code in (200, 201, 202):
if resp:
resp = json.loads(resp)
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server: '.format(
resp))
print(resp['id'])
+ elif http_code == 204:
+ print('Updated')
else:
msg = "Error {}".format(http_code)
if resp:
def update(self, name, filename):
vnfd = self.get(name)
- endpoint = '{}/{}/vnfd_content'.format(self._apiBase, vnfd['_id'])
+ endpoint = '{}/{}/package_content'.format(self._apiBase, vnfd['_id'])
self.create(filename=filename, update_endpoint=endpoint)