Fix bug 2373 - Remove old code from v1 client in ns_show

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

diff --git a/osmclient/sol005/package.py b/osmclient/sol005/package.py
index 1fa0e24..a083300 100644 (file)
--- a/osmclient/sol005/package.py
+++ b/osmclient/sol005/package.py
@@ -94,17 +94,18 @@ class Package(object):
             # endpoint = '/nsds' if pkg_type['type'] == 'nsd' else '/vnfds'
             # print('Endpoint: {}'.format(endpoint))
             headers = self._client._headers
-            headers["Content-Type"] = "application/gzip"
+
+            if filename.endswith(".tar.gz"):
+                headers["Content-Type"] = "application/gzip"
+            else:
+                headers["Content-Type"] = "application/zip"
             # 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)
+            self._http.set_http_header(headers)
             http_code, resp = self._http.post_cmd(endpoint=endpoint, filename=filename)
             # print('HTTP CODE: {}'.format(http_code))
             # print('RESP: {}'.format(resp))