X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=instancehandler%2Fviews.py;h=ea5528de745226e8099299102651dde8d9f0dffa;hb=a03da5e2aab552daa3e7ced70b3e90466c7c8b82;hp=9ace8ee61bab8088241330576358975211d50e13;hpb=35e62b05f16aa734dbcdac554c56030ee9812818;p=osm%2FLW-UI.git

diff --git a/instancehandler/views.py b/instancehandler/views.py
index 9ace8ee..ea5528d 100644
--- a/instancehandler/views.py
+++ b/instancehandler/views.py
@@ -27,8 +27,12 @@ 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')
+    result = {'instances': result, 'type': type, 'project_id': project_id}
+
+    return __response_handler(request, result, 'instance_list.html')
 
 
 @login_required
@@ -111,7 +115,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)