Monitoring: ns export metric; ns new alarm

[osm/LW-UI.git] / instancehandler / views.py

diff --git a/instancehandler/views.py b/instancehandler/views.py
index a5118f6..d835de6 100644 (file)
--- a/instancehandler/views.py
+++ b/instancehandler/views.py
@@ -30,7 +30,9 @@ def list(request, project_id=None, type=None):
     elif type == 'vnf':
         result = client.vnf_list()
 
-    return __response_handler(request, {'instances': result, 'type': type, '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
@@ -102,9 +104,10 @@ def action(request, project_id=None, instance_id=None, type=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)
 
@@ -120,6 +123,47 @@ def show(request, project_id=None, instance_id=None, type=None):
     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(',')
@@ -129,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)
+
+