X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fvnfd.py;h=606fe64b4b72f464147a10217f48df8e66dc1538;hb=70a202f07cc014070a1a31708366ef2f165d0eb8;hp=8bf3552b8013765d021f95ddc5333593053e1650;hpb=bd39b09580560307a1ac23be4984783d1bea9238;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/vnfd.py b/osmclient/sol005/vnfd.py
index 8bf3552..606fe64 100644
--- a/osmclient/sol005/vnfd.py
+++ b/osmclient/sol005/vnfd.py
@@ -25,6 +25,7 @@ import json
 import magic
 from os.path import basename
 import logging
+import os.path
 #from os import stat
 
 
@@ -136,62 +137,70 @@ class Vnfd(object):
             #         msg = resp
             raise ClientException("failed to delete vnfd {} - {}".format(name, msg))
 
-    def create(self, filename, overwrite=None, update_endpoint=None):
+    def create(self, filename, overwrite=None, update_endpoint=None, skip_charm_build=False):
         self._logger.debug("")
-        self._client.get_token()
-        mime_type = magic.from_file(filename, mime=True)
-        if mime_type is None:
-            raise ClientException(
-                     "failed to guess MIME type for file '{}'".format(filename))
-        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)
-                  )
-        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)
-        if update_endpoint:
-            http_code, resp = self._http.put_cmd(endpoint=update_endpoint, filename=filename)
+        if os.path.isdir(filename):
+            filename = filename.rstrip('/')
+            filename = self._client.package_tool.build(filename, skip_validation=False, skip_charm_build=skip_charm_build)
+            print('Uploading package {}'.format(filename))
+            self.create(filename, overwrite=overwrite, update_endpoint=update_endpoint)
         else:
-            ow_string = ''
-            if overwrite:
-                ow_string = '?{}'.format(overwrite)
-            self._apiResource = '/vnf_packages_content'
-            self._apiBase = '{}{}{}'.format(self._apiName,
-                                            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):
-            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:
-        #         try:
-        #             msg = "{} - {}".format(msg, json.loads(resp))
-        #         except ValueError:
-        #             msg = "{} - {}".format(msg, resp)
-        #     raise ClientException("failed to create/update vnfd - {}".format(msg))
+            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
+            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)
+                      )
+            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)
+            if update_endpoint:
+                http_code, resp = self._http.put_cmd(endpoint=update_endpoint, filename=filename)
+            else:
+                ow_string = ''
+                if overwrite:
+                    ow_string = '?{}'.format(overwrite)
+                self._apiResource = '/vnf_packages_content'
+                self._apiBase = '{}{}{}'.format(self._apiName,
+                                                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):
+                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:
+            #         try:
+            #             msg = "{} - {}".format(msg, json.loads(resp))
+            #         except ValueError:
+            #             msg = "{} - {}".format(msg, resp)
+            #     raise ClientException("failed to create/update vnfd - {}".format(msg))
 
     def update(self, name, filename):
         self._logger.debug("")