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
}
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 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)