X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fpackage.py;h=1fa0e2484020c89a4dad43c38e01aea001b0aa22;hb=70208ca1de7ff0e91a17d8f918d5b6044e9fa388;hp=27b3ad48ed88c9511afaa0ffaa3ebd610d0dfbb2;hpb=70d6f1843686f323ced68a253127fedde86a1c25;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/package.py b/osmclient/sol005/package.py index 27b3ad4..1fa0e24 100644 --- a/osmclient/sol005/package.py +++ b/osmclient/sol005/package.py @@ -18,21 +18,21 @@ OSM package API handling """ -#from os import stat -#from os.path import basename -from osmclient.common.exceptions import OsmHttpException +# from os import stat +# from os.path import basename from osmclient.common.exceptions import ClientException from osmclient.common.exceptions import NotFound from osmclient.common import utils import json import logging +import os.path class Package(object): def __init__(self, http=None, client=None): self._client = client self._http = http - self._logger = logging.getLogger('osmclient') + self._logger = logging.getLogger("osmclient") def get_key_val_from_pkg(self, descriptor_file): self._logger.debug("") @@ -40,9 +40,9 @@ class Package(object): def _wait_for_package(self, pkg_type): self._logger.debug("") - if 'vnfd' in pkg_type['type']: + if "vnfd" in pkg_type["type"]: get_method = self._client.vnfd.get - elif 'nsd' in pkg_type['type']: + elif "nsd" in pkg_type["type"]: get_method = self._client.nsd.get else: raise ClientException("no valid package type found") @@ -56,13 +56,13 @@ class Package(object): return False return True - return utils.wait_for_value(lambda: - check_exists(lambda: - get_method(pkg_type['name']))) + return utils.wait_for_value( + lambda: check_exists(lambda: get_method(pkg_type["name"])) + ) def wait_for_upload(self, filename): """wait(block) for an upload to succeed. - The filename passed is assumed to be a descriptor tarball. + The filename passed is assumed to be a descriptor tarball. """ self._logger.debug("") self._client.get_token() @@ -72,47 +72,55 @@ class Package(object): raise ClientException("Cannot determine package type") if not self._wait_for_package(pkg_type): - raise ClientException("package {} failed to upload" - .format(filename)) + raise ClientException("package {} failed to upload".format(filename)) - def upload(self, filename): + def upload(self, filename, skip_charm_build=False): self._logger.debug("") - self._client.get_token() - pkg_type = utils.get_key_val_from_pkg(filename) - if pkg_type is None: - raise ClientException("Cannot determine package type") - if pkg_type['type'] == 'nsd': - endpoint = '/nsd/v1/ns_descriptors_content' + if os.path.isdir(filename): + filename = filename.rstrip("/") + filename = self._client.package_tool.build( + filename, skip_validation=False, skip_charm_build=skip_charm_build + ) + self.upload(filename) else: - endpoint = '/vnfpkgm/v1/vnf_packages_content' - #endpoint = '/nsds' if pkg_type['type'] == 'nsd' else '/vnfds' - #print('Endpoint: {}'.format(endpoint)) - headers = self._client._headers - 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) - headers["Content-File-MD5"] = utils.md5(filename) - http_header = ['{}: {}'.format(key,val) - for (key,val) in list(headers.items())] - self._http.set_http_header(http_header) - 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): - if resp: - resp = json.loads(resp) - if not resp or 'id' not in resp: - raise OsmHttpException('unexpected response from server - {}'.format( - resp)) - print(resp['id']) - # else: - # msg = "" - # if resp: - # try: - # msg = json.loads(resp) - # except ValueError: - # msg = resp - # raise ClientException("failed to upload package - {}".format(msg)) + self._client.get_token() + pkg_type = utils.get_key_val_from_pkg(filename) + if pkg_type is None: + raise ClientException("Cannot determine package type") + if pkg_type["type"] == "nsd": + endpoint = "/nsd/v1/ns_descriptors_content" + else: + endpoint = "/vnfpkgm/v1/vnf_packages_content" + # endpoint = '/nsds' if pkg_type['type'] == 'nsd' else '/vnfds' + # print('Endpoint: {}'.format(endpoint)) + headers = self._client._headers + 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) + headers["Content-File-MD5"] = utils.md5(filename) + http_header = [ + "{}: {}".format(key, val) for (key, val) in list(headers.items()) + ] + self._http.set_http_header(http_header) + 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): + 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"]) + # else: + # msg = "" + # if resp: + # try: + # msg = json.loads(resp) + # except ValueError: + # msg = resp + # raise ClientException("failed to upload package - {}".format(msg))