Change content-type header to text/plain for yaml and json files 94/6794/3
authorgcalvino <guillermo.calvinosanchez@altran.com>
Tue, 30 Oct 2018 11:16:43 +0000 (12:16 +0100)
committergcalvino <guillermo.calvinosanchez@altran.com>
Tue, 30 Oct 2018 12:39:01 +0000 (13:39 +0100)
Signed-off-by: gcalvino <guillermo.calvinosanchez@altran.com>
Change-Id: I5ff3d95d34780410e233f31b8e8a52e198912457

osmclient/sol005/nsd.py
osmclient/sol005/vnfd.py

index 63308d6..6a18828 100644 (file)
@@ -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 Nsd(object):
 
@@ -126,8 +127,9 @@ 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'
+        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'
index b239d57..e939efc 100644 (file)
@@ -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,8 +126,9 @@ 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'
+        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'