client = Client()
if type == 'ns':
result = client.ns_list()
+ elif type == 'vnf':
+ result = client.vnf_list()
- return __response_handler(request, {'instances': result, 'type': 'ns', 'project_id': project_id}, 'instance_list.html')
+ result = {'instances': result, 'type': type, 'project_id': project_id}
+
+ return __response_handler(request, result, 'instance_list.html')
@login_required
"nsdId": request.POST.get('nsdId', ''),
"vimAccountId": request.POST.get('vimAccountId', ''),
}
- if 'ssh_key' in request.POST:
+ if 'ssh_key' in request.POST and request.POST.get('ssh_key') != '':
ns_data["ssh-authorized-key"] = [request.POST.get('ssh_key')]
if 'config' in request.POST:
ns_config = yaml.load(request.POST.get('config'))
- if "vim-network-name" in ns_config:
- ns_config["vld"] = ns_config.pop("vim-network-name")
- if "vld" in ns_config:
- for vld in ns_config["vld"]:
- 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():
- vim_network_name_dict[ns_data["vimAccountId"]] = vim_net
- vld["vim-network-name"] = vim_network_name_dict
- ns_data["vld"] = ns_config["vld"]
- if "vnf" in ns_config:
- for vnf in ns_config["vnf"]:
- if vnf.get("vim_account"):
- vnf["vimAccountId"] = ns_data["vimAccountId"]
-
- ns_data["vnf"] = ns_config["vnf"]
+ if isinstance(ns_config, dict):
+ if "vim-network-name" in ns_config:
+ ns_config["vld"] = ns_config.pop("vim-network-name")
+ if "vld" in ns_config:
+ for vld in ns_config["vld"]:
+ 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():
+ vim_network_name_dict[ns_data["vimAccountId"]] = vim_net
+ vld["vim-network-name"] = vim_network_name_dict
+ ns_data["vld"] = ns_config["vld"]
+ if "vnf" in ns_config:
+ for vnf in ns_config["vnf"]:
+ if vnf.get("vim_account"):
+ vnf["vimAccountId"] = ns_data["vimAccountId"]
+
+ ns_data["vnf"] = ns_config["vnf"]
print ns_data
client = Client()
result = client.ns_create(ns_data)
return __response_handler(request, result, 'projects:instances:list', to_redirect=True, type='ns', project_id=project_id)
+@login_required
+def ns_operations(request, project_id=None, instance_id=None, type=None):
+ client = Client()
+ result = client.ns_op_list(instance_id)
+ return __response_handler(request, {'operations': result, 'type': 'ns', 'project_id': project_id}, 'instance_operations_list.html')
+
+@login_required
+def ns_operation(request, op_id, project_id=None, instance_id=None, type=None):
+ client = Client()
+ result = client.ns_op(op_id)
+ return __response_handler(request, result)
@login_required
def action(request, project_id=None, instance_id=None, type=None):
}
result = client.ns_action(instance_id, action_payload)
- return __response_handler(request, result, None, to_redirect=False, status=result['status'] )
+ return __response_handler(request, result, None, to_redirect=False, status=result['status'] if 'status' in result else None )
@login_required
def delete(request, project_id=None, instance_id=None, type=None):
+ force = bool(request.GET.get('force', False))
result = {}
client = Client()
- result = client.ns_delete(instance_id)
+ result = client.ns_delete(instance_id, force)
print result
return __response_handler(request, result, 'projects:instances:list', to_redirect=True, type='ns', project_id=project_id)
def show(request, project_id=None, instance_id=None, type=None):
# result = {}
client = Client()
- result = client.ns_get(instance_id)
+ if type == 'ns':
+ result = client.ns_get(instance_id)
+ elif type == 'vnf':
+ result = client.vnf_get(instance_id)
print result
return __response_handler(request, result)