X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=instancehandler%2Fviews.py;h=a5118f639aba19338b8da9c7520002789e0c8cb0;hb=647aa2ede87d15576912cd590936ab796d2378c5;hp=e1938251d00088c5cd3bd8b0dbb4519527f0f5b1;hpb=74ed51abc7bbaee0474367fe9be134d47394889c;p=osm%2FLW-UI.git

diff --git a/instancehandler/views.py b/instancehandler/views.py
index e193825..a5118f6 100644
--- a/instancehandler/views.py
+++ b/instancehandler/views.py
@@ -27,8 +27,10 @@ def list(request, project_id=None, type=None):
     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')
+    return __response_handler(request, {'instances': result, 'type': type, 'project_id': project_id}, 'instance_list.html')
 
 
 @login_required
@@ -95,7 +97,7 @@ 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
@@ -111,7 +113,10 @@ def delete(request, project_id=None, instance_id=None, type=None):
 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)