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

diff --git a/instancehandler/views.py b/instancehandler/views.py
index 0c9a8a4..e193825 100644
--- a/instancehandler/views.py
+++ b/instancehandler/views.py
@@ -15,9 +15,9 @@
 #
 
 from django.shortcuts import render, redirect
-from django.contrib.auth.decorators import login_required, permission_required
+from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, JsonResponse
-import json
+import yaml
 import logging
 from lib.osm.osmclient.client import Client
 
@@ -39,21 +39,50 @@ def create(request, project_id=None):
         "nsDescription": request.POST.get('nsDescription', ''),
         "nsdId": request.POST.get('nsdId', ''),
         "vimAccountId": request.POST.get('vimAccountId', ''),
-        # "ssh-authorized-key": [
-        #     {
-        #         request.POST.get('key-pair-ref', ''): request.POST.get('keyValue', '')
-        #     }
-        # ]
     }
+    if 'ssh_key' in request.POST and request.POST.get('ssh_key') != '':
+        ns_data["ssh-authorized-key"] = [request.POST.get('ssh_key')]
+
+    if 'config' in request.POST:
+        ns_config = yaml.load(request.POST.get('config'))
+        if isinstance(ns_config, dict):
+            if "vim-network-name" in ns_config:
+                ns_config["vld"] = ns_config.pop("vim-network-name")
+            if "vld" in ns_config:
+                for vld in ns_config["vld"]:
+                    if vld.get("vim-network-name"):
+                        if isinstance(vld["vim-network-name"], dict):
+                            vim_network_name_dict = {}
+                            for vim_account, vim_net in vld["vim-network-name"].items():
+                                vim_network_name_dict[ns_data["vimAccountId"]] = vim_net
+                            vld["vim-network-name"] = vim_network_name_dict
+                ns_data["vld"] = ns_config["vld"]
+            if "vnf" in ns_config:
+                for vnf in ns_config["vnf"]:
+                    if vnf.get("vim_account"):
+                        vnf["vimAccountId"] = ns_data["vimAccountId"]
+
+                ns_data["vnf"] = ns_config["vnf"]
     print ns_data
     client = Client()
     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):
-    result = {}
+
     client = Client()
 
     # result = client.ns_action(instance_id, action_payload)