create NE is not updating the controller info in the DB and is so blocking the furthe...

SDNO-828

Change-Id: I18f37973df493df3c05ea7894ad1976fbe5c218d
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>

diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js
index 91fd0c5..83266af 100644 (file)
--- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js
+++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js
@@ -25,10 +25,7 @@ $('.siteDeleteImg').click(function () {
 });\r
 \r
 \r
-function hideFirstCol() {\r
-    //$('table tr').find('th:eq(0)').hide();\r
-    //$('table tr').find('td:eq(0)').hide();\r
-}\r
+\r
 function deleteSite(objectId) {\r
     var requestUrl = "/openoapi/sdnobrs/v1/sites/" + objectId;\r
     $\r
@@ -150,12 +147,18 @@ function loadNeData() {
             url: requestUrl,\r
             contentType: "application/json",\r
             success: function (jsonobj) {\r
+                       \r
                 var nedata = jsonobj.managedElements;\r
+                               var neMap = []; \r
+                               neMap = loadControllerData();\r
+                               /*$.each(nedata,function(k,v){\r
+                                       nedata[k];\r
+                               })*/;\r
+                       \r
                 $('#ne').bootstrapTable({\r
                     data: nedata\r
                 });\r
                 $('#ne').bootstrapTable('refresh');\r
-                hideFirstCol();\r
 \r
             },\r
             error: function (xhr, ajaxOptions, thrownError) {\r
@@ -181,18 +184,23 @@ function loadPortData() {
         });\r
 }\r
 function loadControllerData() {\r
+    var neMap = [];\r
     var requestUrl = "/openoapi/extsys/v1/sdncontrollers";\r
     $.ajax({\r
         type: "GET",\r
+               async: false,\r
         url: requestUrl,\r
         contentType: "application/json",\r
         success: function (jsonobj) {\r
-            fillSelect(jsonobj);\r
+               \r
+          neMap =  fillSelect(jsonobj);\r
+                 \r
         },\r
         error: function (xhr, ajaxOptions, thrownError) {\r
             alert("Error on getting controller data : " + xhr.responseText);\r
         }\r
     });\r
+       return neMap;\r
 }\r
 function fillSelect(str){\r
     var json;\r
@@ -204,9 +212,12 @@ function fillSelect(str){
     }\r
     var seleObj = $('#controller')\r
     seleObj.find("option").remove();\r
+       var neMap = [];\r
     for(var i=0;i < json.length;i++){\r
-        seleObj.append('<option value="'+json[i].name+'">'+json[i].name+'</option>');\r
+        seleObj.append('<option value="'+json[i].sdnControllerId+'">'+json[i].name+'</option>');\r
+               neMap[json[i].sdnControllerId] = json[i].name;\r
     }\r
+       return neMap;\r
 }\r
 $(function () {\r
     $('.creat-btn').click(function () {\r
@@ -300,6 +311,9 @@ $(function () {
     $('#createNe').click(function () {\r
         var formData = JSON.stringify($("#neForm").serializeObject());\r
         var jsonobj = JSON.parse(formData);\r
+               var controllerIDs = [] ;\r
+               controllerIDs[0]= jsonobj.controller;\r
+               jsonobj.controllerID = controllerIDs;\r
         var newJson = {"managedElement": jsonobj};\r
         formData = JSON.stringify(newJson);\r
         var requestUrl = "/openoapi/sdnobrs/v1/managed-elements";\r
@@ -338,7 +352,7 @@ $(function () {
                 data: formData,\r
                 success: function (jsonResp) {\r
                     alert("Port saved successfully!!!");\r
-                    //TODO : hide model data window.\r
+               \r
                     jsonobj["id"] = jsonResp.logicalTerminationPoint.id;\r
                     $('#port').bootstrapTable("append", jsonobj);\r
                     $('#vmAppDialog').removeClass('in').css('display', 'none');\r