from os.path import basename
import logging
import os.path
-#from os import stat
class Nsd(object):
self._apiResource = '/ns_descriptors'
self._apiBase = '{}{}{}'.format(self._apiName,
self._apiVersion, self._apiResource)
- #self._apiBase='/nsds'
def list(self, filter=None):
self._logger.debug("")
if filter:
filter_string = '?{}'.format(filter)
_, resp = self._http.get2_cmd('{}{}'.format(self._apiBase, filter_string))
- #print(yaml.safe_dump(resp))
+
if resp:
return json.loads(resp)
return list()
# It is redundant, since the previous one already gets the whole nsdinfo
# The only difference is that a different primitive is exercised
_, resp = self._http.get2_cmd('{}/{}'.format(self._apiBase, nsd['_id']))
- #print(yaml.safe_dump(resp))
if resp:
return json.loads(resp)
except NotFound:
headers = self._client._headers
headers['Accept'] = 'application/binary'
http_code, resp = self._http.get2_cmd('{}/{}/{}'.format(self._apiBase, nsd['_id'], thing))
- #print('HTTP CODE: {}'.format(http_code))
- #print('RESP: {}'.format(resp))
- #if http_code in (200, 201, 202, 204):
+
if resp:
- #store in a file
return json.loads(resp)
else:
msg = resp or ""
- # if resp:
- # try:
- # msg = json.loads(resp)
- # except ValueError:
- # msg = resp
raise ClientException("failed to get {} from {} - {}".format(thing, name, msg))
def get_descriptor(self, name, filename):
if force:
querystring = '?FORCE=True'
http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase,
- nsd['_id'], querystring))
- #print('HTTP CODE: {}'.format(http_code))
- #print('RESP: {}'.format(resp))
+ nsd['_id'], querystring))
+
if http_code == 202:
print('Deletion in progress')
elif http_code == 204:
print('Deleted')
else:
msg = resp or ""
- # if resp:
- # try:
- # msg = json.loads(resp)
- # except ValueError:
- # msg = resp
raise ClientException("failed to delete nsd {} - {}".format(name, msg))
def create(self, filename, overwrite=None, update_endpoint=None, skip_charm_build=False):
self._logger.debug("")
if os.path.isdir(filename):
filename = filename.rstrip('/')
- filename = self._client.package_tool.build(filename, skip_validation=False, skip_charm_build=skip_charm_build)
+ filename = self._client.package_tool.build(filename, skip_validation=False,
+ skip_charm_build=skip_charm_build)
self.create(filename, overwrite=overwrite, update_endpoint=update_endpoint)
else:
self._client.get_token()
mime_type = magic.from_file(filename, mime=True)
if mime_type is None:
raise ClientException(
- "Unexpected MIME type for file {}: MIME type {}".format(
- filename, mime_type)
- )
- headers= self._client._headers
+ "Unexpected MIME type for file {}: MIME type {}".format(
+ filename, mime_type)
+ )
+ headers = self._client._headers
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
- #headers['Content-Filename'] = basename(filename)
- #file_size = stat(filename).st_size
- #headers['Content-Range'] = 'bytes 0-{}/{}'.format(file_size - 1, file_size)
else:
raise ClientException(
- "Unexpected MIME type for file {}: MIME type {}".format(
- filename, mime_type)
- )
+ "Unexpected MIME type for file {}: MIME type {}".format(
+ filename, mime_type)
+ )
headers["Content-File-MD5"] = utils.md5(filename)
- http_header = ['{}: {}'.format(key,val)
- for (key,val) in list(headers.items())]
+ http_header = ['{}: {}'.format(key, val)
+ for (key, val) in list(headers.items())]
self._http.set_http_header(http_header)
if update_endpoint:
http_code, resp = self._http.put_cmd(endpoint=update_endpoint, filename=filename)
self._apiResource = '/ns_descriptors_content'
self._apiBase = '{}{}{}'.format(self._apiName,
self._apiVersion, self._apiResource)
- endpoint = '{}{}'.format(self._apiBase,ow_string)
+ 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):
if resp:
resp = json.loads(resp)
print(resp['id'])
elif http_code == 204:
print('Updated')
- # else:
- # msg = "Error {}".format(http_code)
- # if resp:
- # try:
- # msg = "{} - {}".format(msg, json.loads(resp))
- # except ValueError:
- # msg = "{} - {}".format(msg, resp)
- # raise ClientException("failed to create/update nsd - {}".format(msg))
def update(self, name, filename):
self._logger.debug("")
nsd = self.get(name)
endpoint = '{}/{}/nsd_content'.format(self._apiBase, nsd['_id'])
self.create(filename=filename, update_endpoint=endpoint)
-