X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fnsd.py;h=6a18828c12d22e53a19dcb095f6d9e4a1e15708d;hb=56202fc5897ddf9f58ddca0d1b9860b6b77765e8;hp=af1e2ef36cc91abb564e9e25b63c751922ed04d8;hpb=061856b26ecc63183378489fa7eb6ed5a6f0250f;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/nsd.py b/osmclient/sol005/nsd.py
index af1e2ef..6a18828 100644
--- a/osmclient/sol005/nsd.py
+++ b/osmclient/sol005/nsd.py
@@ -21,11 +21,11 @@ OSM nsd API handling
 from osmclient.common.exceptions import NotFound
 from osmclient.common.exceptions import ClientException
 from osmclient.common import utils
-import yaml
 import json
 import magic
+from os.path import basename
 #from os import stat
-#from os.path import basename
+
 
 class Nsd(object):
 
@@ -109,9 +109,9 @@ class Nsd(object):
         #print 'HTTP CODE: {}'.format(http_code)
         #print 'RESP: {}'.format(resp)
         if http_code == 202:
-            print 'Deletion in progress'
+            print('Deletion in progress')
         elif http_code == 204:
-            print 'Deleted'
+            print('Deleted')
         else:
             msg = ""
             if resp:
@@ -127,9 +127,10 @@ class Nsd(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
@@ -143,7 +144,7 @@ class Nsd(object):
                   )
         headers["Content-File-MD5"] = utils.md5(filename)
         http_header = ['{}: {}'.format(key,val)
-                      for (key,val) in headers.items()]
+                      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)
@@ -164,15 +165,15 @@ class Nsd(object):
             if not resp or 'id' not in resp:
                 raise ClientException('unexpected response from server - {}'.format(
                                       resp))
-            print resp['id']
+            print(resp['id'])
         else:
-            msg = ""
+            msg = "Error {}".format(http_code)
             if resp:
                 try:
-                    msg = json.loads(resp)
+                    msg = "{} - {}".format(msg, json.loads(resp))
                 except ValueError:
-                    msg = resp
-            raise ClientException("failed to create/update nsd - {}".format(name, msg))
+                    msg = "{} - {}".format(msg, resp)
+            raise ClientException("failed to create/update nsd - {}".format(msg))
 
     def update(self, name, filename):
         nsd = self.get(name)