X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fnsd.py;h=63308d6c5e63d1de0525a3bce3662f194ca1464b;hb=refs%2Fchanges%2F79%2F6279%2F1;hp=10ad38f46954496f8f2d896baedc18f53e238c8d;hpb=b3b96781b5e79b4db0217581216cd7bbb1509822;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/nsd.py b/osmclient/sol005/nsd.py index 10ad38f..63308d6 100644 --- a/osmclient/sol005/nsd.py +++ b/osmclient/sol005/nsd.py @@ -21,7 +21,6 @@ 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 import stat @@ -109,9 +108,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: @@ -129,7 +128,7 @@ class Nsd(object): headers= self._client._headers if mime_type in ['application/yaml', 'text/plain']: headers['Content-Type'] = 'application/yaml' - elif mime_type == 'application/gzip': + 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 +142,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,7 +163,7 @@ 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 = "Error {}".format(http_code) if resp: