X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=instancehandler%2Fviews.py;h=d835de68110dac05cb4bb87ac0b1f5602a843206;hb=74acf7dfb8b5f6f94a14394a73f997f18121496b;hp=534579a8697063cf706bff7f5c27338dfcbbc2d0;hpb=1a6af28f66d2686ad53368095c9143279bf54ec3;p=osm%2FLW-UI.git

diff --git a/instancehandler/views.py b/instancehandler/views.py
index 534579a..d835de6 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
@@ -68,6 +72,17 @@ def create(request, project_id=None):
     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):
@@ -84,14 +99,15 @@ 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)
 
@@ -100,10 +116,54 @@ 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)
 
+@login_required
+def export_metric(request, project_id=None, instance_id=None, type=None):
+
+    metric_data = request.POST.dict()
+
+    client = Client()
+    keys = ["collection_period",
+            "vnf_member_index",
+            "metric_name",
+            "correlation_id",
+            "vdu_name",
+            "collection_unit"]
+    metric_data = dict(filter(lambda i: i[0] in keys and len(i[1]) > 0, metric_data.items()))
+
+    response = client.ns_metric_export(instance_id, metric_data)
+
+    return __response_handler(request, {}, None, to_redirect=False,
+                              status=response.status_code)
+
+@login_required
+def create_alarm(request, project_id=None, instance_id=None, type=None):
+    metric_data = request.POST.dict()
+    print metric_data
+    client = Client()
+
+
+    keys = ["threshold_value",
+            "vnf_member_index",
+            "metric_name",
+            "vdu_name",
+            "alarm_name",
+            "correlation_id",
+            "statistic",
+            "operation",
+            "severity"]
+    metric_data = dict(filter(lambda i: i[0] in keys and len(i[1]) > 0, metric_data.items()))
+
+    result = client.ns_alarm_create(instance_id, metric_data)
+    return __response_handler(request, {}, None, to_redirect=False,
+                              status=result['status'] if 'status' in result else None)
+
 
 def __response_handler(request, data_res, url=None, to_redirect=None, *args, **kwargs):
     raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',')
@@ -113,3 +173,5 @@ def __response_handler(request, data_res, url=None, to_redirect=None, *args, **k
         return redirect(url, *args, **kwargs)
     else:
         return render(request, url, data_res)
+
+