fix update vnfd and nsd

[osm/osmclient.git] / osmclient / sol005 / vnfd.py

diff --git a/osmclient/sol005/vnfd.py b/osmclient/sol005/vnfd.py
index c769d4c..965b999 100644 (file)
--- a/osmclient/sol005/vnfd.py
+++ b/osmclient/sol005/vnfd.py
@@ -23,8 +23,9 @@ from osmclient.common.exceptions import ClientException
 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):
 
@@ -125,9 +126,10 @@ class Vnfd(object):
             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
@@ -156,13 +158,15 @@ class Vnfd(object):
             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 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:
@@ -174,6 +178,6 @@ class Vnfd(object):
 
     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)