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):
#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:
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
)
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)
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)