The Python 3 compatibility of osmclient was
completely broken, e.g., print statements without ().
This fixes are mostly done with the automated 2to3
conversion tool.
Some fixes (mixed tabs and spaces) were fixed by hand.
Change-Id: Idea46a4b07e55eaa5bcf5defff64af3f751d740f
Signed-off-by: peusterm <manuel.peuster@upb.de>
13 files changed:
dict = yaml.load(tar.extractfile(yamlfile))
result = {}
dict = yaml.load(tar.extractfile(yamlfile))
result = {}
- for k1, v1 in dict.items():
+ for k1, v1 in list(dict.items()):
if not k1.endswith('-catalog'):
continue
if not k1.endswith('-catalog'):
continue
- for k2, v2 in v1.items():
+ for k2, v2 in list(v1.items()):
if not k2.endswith('nsd') and not k2.endswith('vnfd'):
continue
if not k2.endswith('nsd') and not k2.endswith('vnfd'):
continue
result['type'] = 'vnfd'
for entry in v2:
result['type'] = 'vnfd'
for entry in v2:
- for k3, v3 in entry.items():
+ for k3, v3 in list(entry.items()):
# strip off preceeding chars before :
key_name = k3.split(':').pop()
# strip off preceeding chars before :
key_name = k3.split(':').pop()
@click.pass_context
def cli(ctx, hostname, so_port, so_project, ro_hostname, ro_port, sol005):
if hostname is None:
@click.pass_context
def cli(ctx, hostname, so_port, so_project, ro_hostname, ro_port, sol005):
if hostname is None:
"either hostname option or OSM_HOSTNAME " +
"either hostname option or OSM_HOSTNAME " +
- "environment variable needs to be specified")
+ "environment variable needs to be specified"))
exit(1)
kwargs={}
if so_port is not None:
exit(1)
kwargs={}
if so_port is not None:
else:
resp = ctx.obj.vnf.list()
except ClientException as inst:
else:
resp = ctx.obj.vnf.list()
except ClientException as inst:
exit(1)
fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
if fullclassname == 'osmclient.sol005.client.Client':
exit(1)
fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
if fullclassname == 'osmclient.sol005.client.Client':
check_client_version(ctx.obj, ctx.command.name)
resp = ctx.obj.ns.list_op(name)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
resp = ctx.obj.ns.list_op(name)
except ClientException as inst:
exit(1)
table = PrettyTable(['id', 'operation', 'status'])
exit(1)
table = PrettyTable(['id', 'operation', 'status'])
resp = ctx.obj.nsd.get(name)
#resp = ctx.obj.nsd.get_individual(name)
except ClientException as inst:
resp = ctx.obj.nsd.get(name)
#resp = ctx.obj.nsd.get_individual(name)
except ClientException as inst:
- print yaml.safe_dump(resp)
+ print(yaml.safe_dump(resp))
return
table = PrettyTable(['field', 'value'])
return
table = PrettyTable(['field', 'value'])
- for k, v in resp.items():
+ for k, v in list(resp.items()):
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
print(table)
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
print(table)
resp = ctx.obj.vnfd.get(name)
#resp = ctx.obj.vnfd.get_individual(name)
except ClientException as inst:
resp = ctx.obj.vnfd.get(name)
#resp = ctx.obj.vnfd.get_individual(name)
except ClientException as inst:
- print yaml.safe_dump(resp)
+ print(yaml.safe_dump(resp))
return
table = PrettyTable(['field', 'value'])
return
table = PrettyTable(['field', 'value'])
- for k, v in resp.items():
+ for k, v in list(resp.items()):
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
print(table)
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
print(table)
try:
ns = ctx.obj.ns.get(name)
except ClientException as inst:
try:
ns = ctx.obj.ns.get(name)
except ClientException as inst:
- print yaml.safe_dump(resp)
+ print(yaml.safe_dump(ns))
return
table = PrettyTable(['field', 'value'])
return
table = PrettyTable(['field', 'value'])
- for k, v in ns.items():
+ for k, v in list(ns.items()):
if filter is None or filter in k:
table.add_row([k, json.dumps(v, indent=2)])
if filter is None or filter in k:
table.add_row([k, json.dumps(v, indent=2)])
if fullclassname != 'osmclient.sol005.client.Client':
nsopdata = ctx.obj.ns.get_opdata(ns['id'])
nsr_optdata = nsopdata['nsr:nsr']
if fullclassname != 'osmclient.sol005.client.Client':
nsopdata = ctx.obj.ns.get_opdata(ns['id'])
nsr_optdata = nsopdata['nsr:nsr']
- for k, v in nsr_optdata.items():
+ for k, v in list(nsr_optdata.items()):
if filter is None or filter in k:
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
if filter is None or filter in k:
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
check_client_version(ctx.obj, ctx.command.name)
resp = ctx.obj.vnf.get(name)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
resp = ctx.obj.vnf.get(name)
except ClientException as inst:
- print yaml.safe_dump(resp)
+ print(yaml.safe_dump(resp))
return
table = PrettyTable(['field', 'value'])
return
table = PrettyTable(['field', 'value'])
- for k, v in resp.items():
+ for k, v in list(resp.items()):
if filter is None or filter in k:
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
if filter is None or filter in k:
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
check_client_version(ctx.obj, ctx.command.name, 'v1')
resp = ctx.obj.vnf.get_monitoring(vnf_name)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name, 'v1')
resp = ctx.obj.vnf.get_monitoring(vnf_name)
except ClientException as inst:
exit(1)
table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units'])
exit(1)
table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units'])
check_client_version(ctx.obj, ctx.command.name, 'v1')
resp = ctx.obj.ns.get_monitoring(ns_name)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name, 'v1')
resp = ctx.obj.ns.get_monitoring(ns_name)
except ClientException as inst:
exit(1)
table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units'])
exit(1)
table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units'])
- for key, val in resp.items():
+ for key, val in list(resp.items()):
for monitor in val:
table.add_row(
[key,
for monitor in val:
table.add_row(
[key,
check_client_version(ctx.obj, ctx.command.name)
op_info = ctx.obj.ns.get_op(id)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
op_info = ctx.obj.ns.get_op(id)
except ClientException as inst:
exit(1)
table = PrettyTable(['field', 'value'])
exit(1)
table = PrettyTable(['field', 'value'])
- for k, v in op_info.items():
+ for k, v in list(op_info.items()):
if filter is None or filter in k:
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
if filter is None or filter in k:
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.nsd.create(filename, overwrite)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.nsd.create(filename, overwrite)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.vnfd.create(filename, overwrite)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.vnfd.create(filename, overwrite)
except ClientException as inst:
ssh_keys=ssh_keys,
account=vim_account)
except ClientException as inst:
ssh_keys=ssh_keys,
account=vim_account)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.nsd.update(name, content)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.nsd.update(name, content)
except ClientException as inst:
exit(1)
@cli.command(name='nsd-update', short_help='updates a NSD/NSpkg')
exit(1)
@cli.command(name='nsd-update', short_help='updates a NSD/NSpkg')
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.vnfd.update(name, content)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.vnfd.update(name, content)
except ClientException as inst:
check_client_version(ctx.obj, '--force')
ctx.obj.nsd.delete(name, force)
except ClientException as inst:
check_client_version(ctx.obj, '--force')
ctx.obj.nsd.delete(name, force)
except ClientException as inst:
check_client_version(ctx.obj, '--force')
ctx.obj.vnfd.delete(name, force)
except ClientException as inst:
check_client_version(ctx.obj, '--force')
ctx.obj.vnfd.delete(name, force)
except ClientException as inst:
check_client_version(ctx.obj, '--force')
ctx.obj.ns.delete(name, force)
except ClientException as inst:
check_client_version(ctx.obj, '--force')
ctx.obj.ns.delete(name, force)
except ClientException as inst:
else:
ctx.obj.vim.create(name, vim)
except ClientException as inst:
else:
ctx.obj.vim.create(name, vim)
except ClientException as inst:
if config: vim['config'] = config
ctx.obj.vim.update(name, vim, sdn_controller, sdn_port_mapping)
except ClientException as inst:
if config: vim['config'] = config
ctx.obj.vim.update(name, vim, sdn_controller, sdn_port_mapping)
except ClientException as inst:
check_client_version(ctx.obj, '--force')
ctx.obj.vim.delete(name, force)
except ClientException as inst:
check_client_version(ctx.obj, '--force')
ctx.obj.vim.delete(name, force)
except ClientException as inst:
if 'vim_password' in resp:
resp['vim_password']='********'
except ClientException as inst:
if 'vim_password' in resp:
resp['vim_password']='********'
except ClientException as inst:
exit(1)
table = PrettyTable(['key', 'attribute'])
exit(1)
table = PrettyTable(['key', 'attribute'])
- for k, v in resp.items():
+ for k, v in list(resp.items()):
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
print(table)
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
print(table)
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.sdnc.create(name, sdncontroller)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.sdnc.create(name, sdncontroller)
except ClientException as inst:
@cli.command(name='sdnc-update', short_help='updates an SDN controller')
@cli.command(name='sdnc-update', short_help='updates an SDN controller')
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.sdnc.update(name, sdncontroller)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.sdnc.update(name, sdncontroller)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.sdnc.delete(name, force)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.sdnc.delete(name, force)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
resp = ctx.obj.sdnc.list(filter)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
resp = ctx.obj.sdnc.list(filter)
except ClientException as inst:
exit(1)
table = PrettyTable(['name', 'id'])
for sdnc in resp:
exit(1)
table = PrettyTable(['name', 'id'])
for sdnc in resp:
check_client_version(ctx.obj, ctx.command.name)
resp = ctx.obj.sdnc.get(name)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
resp = ctx.obj.sdnc.get(name)
except ClientException as inst:
exit(1)
table = PrettyTable(['key', 'attribute'])
exit(1)
table = PrettyTable(['key', 'attribute'])
- for k, v in resp.items():
+ for k, v in list(resp.items()):
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
print(table)
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
print(table)
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.ns.create_alarm(alarm)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.ns.create_alarm(alarm)
except ClientException as inst:
try:
check_client_version(ctx.obj, ctx.command.name)
if not interval:
try:
check_client_version(ctx.obj, ctx.command.name)
if not interval:
- print '{}'.format(ctx.obj.ns.export_metric(metric_data))
+ print('{}'.format(ctx.obj.ns.export_metric(metric_data)))
- print '{} {}'.format(ctx.obj.ns.export_metric(metric_data),i)
+ print('{} {}'.format(ctx.obj.ns.export_metric(metric_data),i))
time.sleep(int(interval))
i+=1
except ClientException as inst:
time.sleep(int(interval))
i+=1
except ClientException as inst:
if fullclassname != 'osmclient.sol005.client.Client':
ctx.obj.package.wait_for_upload(filename)
except ClientException as inst:
if fullclassname != 'osmclient.sol005.client.Client':
ctx.obj.package.wait_for_upload(filename)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name, 'v1')
resp = ctx.obj.ns.list()
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name, 'v1')
resp = ctx.obj.ns.list()
except ClientException as inst:
exit(1)
table = PrettyTable(
exit(1)
table = PrettyTable(
check_client_version(ctx.obj, ctx.command.name, 'v1')
ctx.obj.ns.scale(ns_name, ns_scale_group, index)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name, 'v1')
ctx.obj.ns.scale(ns_name, ns_scale_group, index)
except ClientException as inst:
try:
check_client_version(ctx.obj, ctx.command.name, 'v1')
except ClientException as inst:
try:
check_client_version(ctx.obj, ctx.command.name, 'v1')
except ClientException as inst:
exit(1)
table = PrettyTable(['name', 'account-type', 'details'])
for account in ctx.obj.vca.list():
exit(1)
table = PrettyTable(['name', 'account-type', 'details'])
for account in ctx.obj.vca.list():
check_client_version(ctx.obj, ctx.command.name, 'v1')
ctx.obj.vca.delete(name)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name, 'v1')
ctx.obj.vca.delete(name)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name, 'v1')
ctx.obj.vca.create(name, account_type, server, user, secret)
except ClientException as inst:
check_client_version(ctx.obj, ctx.command.name, 'v1')
ctx.obj.vca.create(name, account_type, server, user, secret)
except ClientException as inst:
exit(1)
@cli.command(name='ro-dump')
exit(1)
@cli.command(name='ro-dump')
check_client_version(ctx.obj, ctx.command.name, 'v1')
resp = ctx.obj.vim.get_resource_orchestrator()
table = PrettyTable(['key', 'attribute'])
check_client_version(ctx.obj, ctx.command.name, 'v1')
resp = ctx.obj.vim.get_resource_orchestrator()
table = PrettyTable(['key', 'attribute'])
- for k, v in resp.items():
+ for k, v in list(resp.items()):
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
print(table)
table.add_row([k, json.dumps(v, indent=2)])
table.align = 'l'
print(table)
ctx.obj.ns.exec_op(ns_name, op_name='action', op_data=op_data)
except ClientException as inst:
ctx.obj.ns.exec_op(ns_name, op_name='action', op_data=op_data)
except ClientException as inst:
self._headers['Accept'] = 'application/json'
self._headers['Content-Type'] = 'application/yaml'
http_header = ['{}: {}'.format(key,val)
self._headers['Accept'] = 'application/json'
self._headers['Content-Type'] = 'application/yaml'
http_header = ['{}: {}'.format(key,val)
- for (key,val) in self._headers.items()]
+ for (key,val) in list(self._headers.items())]
self._http_client.set_http_header(http_header)
token = self.get_token()
self._http_client.set_http_header(http_header)
token = self.get_token()
from io import BytesIO
import pycurl
import json
from io import BytesIO
import pycurl
import json
from osmclient.common import http
from osmclient.common import http
-from osmclient.common.exceptions import ClientException
#print 'HTTP CODE: {}'.format(http_code)
#print 'RESP: {}'.format(resp)
if http_code == 202:
#print 'HTTP CODE: {}'.format(http_code)
#print 'RESP: {}'.format(resp)
if http_code == 202:
- print 'Deletion in progress'
+ print('Deletion in progress')
if vld.get("vim-network-name"):
if isinstance(vld["vim-network-name"], dict):
vim_network_name_dict = {}
if vld.get("vim-network-name"):
if isinstance(vld["vim-network-name"], dict):
vim_network_name_dict = {}
- for vim_account, vim_net in vld["vim-network-name"].items():
+ for vim_account, vim_net in list(vld["vim-network-name"].items()):
vim_network_name_dict[get_vim_account_id(vim_account)] = vim_net
vld["vim-network-name"] = vim_network_name_dict
ns["vld"] = ns_config["vld"]
vim_network_name_dict[get_vim_account_id(vim_account)] = vim_net
vld["vim-network-name"] = vim_network_name_dict
ns["vld"] = ns_config["vld"]
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {} '.format(
resp))
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {} '.format(
resp))
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
#print 'RESP: {}'.format(resp)
if http_code in (200, 201, 202, 204):
#resp = json.loads(resp)
#print 'RESP: {}'.format(resp)
if http_code in (200, 201, 202, 204):
#resp = json.loads(resp)
#print 'RESP: {}'.format(resp)
if http_code in (200, 201, 202, 204):
#resp = json.loads(resp)
#print 'RESP: {}'.format(resp)
if http_code in (200, 201, 202, 204):
#resp = json.loads(resp)
http_code, msg))
except ClientException as exc:
message="failed to delete alarm: alarm {}\n{}".format(
http_code, msg))
except ClientException as exc:
message="failed to delete alarm: alarm {}\n{}".format(
exc.message)
raise ClientException(message)
exc.message)
raise ClientException(message)
from osmclient.common.exceptions import NotFound
from osmclient.common.exceptions import ClientException
from osmclient.common import utils
from osmclient.common.exceptions import NotFound
from osmclient.common.exceptions import ClientException
from osmclient.common import utils
import json
import magic
#from os import stat
import json
import magic
#from os import stat
#print 'HTTP CODE: {}'.format(http_code)
#print 'RESP: {}'.format(resp)
if http_code == 202:
#print 'HTTP CODE: {}'.format(http_code)
#print 'RESP: {}'.format(resp)
if http_code == 202:
- print 'Deletion in progress'
+ print('Deletion in progress')
)
headers["Content-File-MD5"] = utils.md5(filename)
http_header = ['{}: {}'.format(key,val)
)
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)
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))
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
else:
msg = "Error {}".format(http_code)
if resp:
else:
msg = "Error {}".format(http_code)
if resp:
OSM package API handling
"""
OSM package API handling
"""
-import tarfile
-import re
-import yaml
#from os import stat
#from os.path import basename
from osmclient.common.exceptions import ClientException
#from os import stat
#from os.path import basename
from osmclient.common.exceptions import ClientException
-from osmclient.common.exceptions import NotFound
from osmclient.common import utils
import json
from osmclient.common import utils
import json
#headers['Content-Range'] = 'bytes 0-{}/{}'.format(file_size - 1, file_size)
headers["Content-File-MD5"] = utils.md5(filename)
http_header = ['{}: {}'.format(key,val)
#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 headers.items()]
+ for (key,val) in list(headers.items())]
self._http.set_http_header(http_header)
http_code, resp = self._http.post_cmd(endpoint=endpoint, filename=filename)
#print 'HTTP CODE: {}'.format(http_code)
self._http.set_http_header(http_header)
http_code, resp = self._http.post_cmd(endpoint=endpoint, filename=filename)
#print 'HTTP CODE: {}'.format(http_code)
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
msg = json.loads(resp)
except ValueError:
msg = resp
msg = json.loads(resp)
except ValueError:
msg = resp
- raise ClientException("failed to delete ns {} - {}".format(name, msg))
+ raise ClientException("failed to upload package - {}".format(msg))
from osmclient.common import utils
from osmclient.common.exceptions import ClientException
from osmclient.common.exceptions import NotFound
from osmclient.common import utils
from osmclient.common.exceptions import ClientException
from osmclient.common.exceptions import NotFound
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
#print 'HTTP CODE: {}'.format(http_code)
#print 'RESP: {}'.format(resp)
if http_code == 202:
#print 'HTTP CODE: {}'.format(http_code)
#print 'RESP: {}'.format(resp)
if http_code == 202:
- print 'Deletion in progress'
+ print('Deletion in progress')
elif resp and 'result' in resp:
elif resp and 'result' in resp:
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
vim_config = {}
if 'config' in vim_account:
vim_config = {}
if 'config' in vim_account:
- if config=="" and (sdncontroller or sdn_port_mapping):
+ if vim_account.get('config')=="" and (sdn_controller or sdn_port_mapping):
raise ClientException("clearing config is incompatible with updating SDN info")
raise ClientException("clearing config is incompatible with updating SDN info")
+ if vim_account.get('config')=="":
vim_config = None
else:
vim_config = yaml.safe_load(vim_account['config'])
vim_config = None
else:
vim_config = yaml.safe_load(vim_account['config'])
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
#print 'HTTP CODE: {}'.format(http_code)
#print 'RESP: {}'.format(resp)
if http_code == 202:
#print 'HTTP CODE: {}'.format(http_code)
#print 'RESP: {}'.format(resp)
if http_code == 202:
- print 'Deletion in progress'
+ print('Deletion in progress')
from osmclient.common.exceptions import NotFound
from osmclient.common.exceptions import ClientException
from osmclient.common import utils
from osmclient.common.exceptions import NotFound
from osmclient.common.exceptions import ClientException
from osmclient.common import utils
import json
import magic
#from os import stat
import json
import magic
#from os import stat
#print 'HTTP CODE: {}'.format(http_code)
#print 'RESP: {}'.format(resp)
if http_code == 202:
#print 'HTTP CODE: {}'.format(http_code)
#print 'RESP: {}'.format(resp)
if http_code == 202:
- print 'Deletion in progress'
+ print('Deletion in progress')
raise ClientException("failed to delete vnfd {} - {}".format(name, msg))
def create(self, filename, overwrite=None, update_endpoint=None):
raise ClientException("failed to delete vnfd {} - {}".format(name, msg))
def create(self, filename, overwrite=None, update_endpoint=None):
- mime_type = magic.from_file(filename, mime=True)
+ mime_type = magic.from_file(filename, mime=True)
if mime_type is None:
raise ClientException(
"failed to guess MIME type for file '{}'".format(filename))
if mime_type is None:
raise ClientException(
"failed to guess MIME type for file '{}'".format(filename))
)
headers["Content-File-MD5"] = utils.md5(filename)
http_header = ['{}: {}'.format(key,val)
)
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)
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))
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server: '.format(
resp))
else:
msg = "Error {}".format(http_code)
if resp:
else:
msg = "Error {}".format(http_code)
if resp:
# SO Version 5.x.x.x.x translates to OSM V3
return 'v3'
return 'v2'
# SO Version 5.x.x.x.x translates to OSM V3
return 'v3'
return 'v2'
for network in ns_config['vim-network-name']:
# now find this network
vld_name = network['name']
for network in ns_config['vim-network-name']:
# now find this network
vld_name = network['name']
- vim_vld_name = network['vim-network-name']
+ # vim_vld_name = network['vim-network-name']
for index, vld in enumerate(nsr['nsd']['vld']):
if vld['name'] == vld_name:
for index, vld in enumerate(nsr['nsd']['vld']):
if vld['name'] == vld_name:
-envlist = py27,py3,flake8
+envlist = py27,py3,flake8,pyflakes
toxworkdir={homedir}/.tox
[testenv]
toxworkdir={homedir}/.tox
[testenv]
commands =
flake8 setup.py
commands =
flake8 setup.py
+[testenv:pyflakes]
+basepython = python3
+deps = pyflakes
+commands =
+ pyflakes osmclient
+
[testenv:build]
basepython = python
deps = stdeb
[testenv:build]
basepython = python
deps = stdeb