BRS issues

IssueID: CLIENT-189

Change-Id: I50a741bf79fae68122d2143c5146f297322126eb
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index fea0835..a1e63a7 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -152,8 +152,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                        var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
             document.getElementById("portdropdown").innerHTML = dropdownInfo;\r
 \r
-            var portType = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.logicalType"}};\r
-            $('#myModal #logicalType').append($compile(Mustache.to_html(text, portType.ErrMsg))($scope));\r
+           /* var portType = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.logicalType"}};\r
+            $('#myModal #logicalType').append($compile(Mustache.to_html(text, portType.ErrMsg))($scope));*/\r
 \r
             var portLayerRate = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.layerRate"}};\r
             $('#myModal #layerRate').append($compile(Mustache.to_html(text, portLayerRate.ErrMsg))($scope));\r
@@ -174,8 +174,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             document.getElementById("portEdropdown").innerHTML = dropdownInfo;\r
                        \r
 \r
-            var portEdgepoint = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.isEdgePoint"}};\r
-            $('#myModal #isEdgePoint').append($compile(Mustache.to_html(text, portEdgepoint.ErrMsg))($scope));\r
+           /* var portEdgepoint = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.isEdgePoint"}};\r
+            $('#myModal #isEdgePoint').append($compile(Mustache.to_html(text, portEdgepoint.ErrMsg))($scope));*/\r
 \r
             var portIndex = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.portIndex"}};\r
             $('#myModal #portIndex').append($compile(Mustache.to_html(text, portIndex.ErrMsg))($scope));\r
@@ -195,7 +195,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             }, { counts:[5, 10, 20, 50], dataset: $scope.data});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                                $scope.checkboxes.items = [];\r
+                $scope.checkboxes.items = {};\r
                 angular.forEach($scope.portTableParams.data, function(item) {\r
                     if (angular.isDefined(item.id)) {\r
                         $scope.checkboxes.items[item.id] = value;\r
@@ -425,7 +425,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             }, { counts:[5, 10, 20, 50], dataset: $scope.data});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                                $scope.checkboxes.items = [];\r
+                $scope.checkboxes.items = {};\r
                 angular.forEach($scope.siteTableParams.data, function(item) {\r
                     console.log(item.id);\r
                     if (angular.isDefined(item.id)) {\r
@@ -467,11 +467,11 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                        var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
             document.getElementById("sitedropdown").innerHTML = dropdownInfo;\r
 \r
-            var siteType = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"site.type"}};\r
+          /*  var siteType = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"site.type"}};\r
             $('#myModal #type').append($compile(Mustache.to_html(text, siteType.ErrMsg))($scope));\r
-\r
-            var siteTenantName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"site.tenantID"}};\r
-            $('#myModal #tenantID').append($compile(Mustache.to_html(text, siteTenantName.ErrMsg))($scope));\r
+*/\r
+     /*       var siteTenantName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"site.tenantID"}};\r
+            $('#myModal #tenantID').append($compile(Mustache.to_html(text, siteTenantName.ErrMsg))($scope));*/\r
 \r
             /*var siteTenantType = {"ErrMsg" :     {"errmsg" : "The tenanttype is required.", "modalVar":"site.tenanttype"}};\r
             $('#myModal #tenanttype').append($compile(Mustache.to_html(text, siteTenantType.ErrMsg))($scope));*/\r
@@ -701,7 +701,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             }, { counts:[5, 10, 20, 50], dataset: $scope.data.locationData});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                                $scope.checkboxes.items = [];\r
+                $scope.checkboxes.items = {};\r
                 angular.forEach($scope.neTableParams.data, function(item) {\r
                     if (angular.isDefined(item.Id)) {\r
                         $scope.checkboxes.items[item.Id] = value;\r
@@ -931,9 +931,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                        var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
             document.getElementById("linkdropdown").innerHTML = dropdownInfo;\r
 \r
-            var linkType = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.logicalType"}};\r
+        /*    var linkType = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.logicalType"}};\r
             $('#myModal #logicalType').append($compile(Mustache.to_html(text, linkType.ErrMsg))($scope));\r
-\r
+*/\r
             var linkLayerRate = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.layerRate"}};\r
             $('#myModal #layerRate').append($compile(Mustache.to_html(text, linkLayerRate.ErrMsg))($scope));\r
 \r
@@ -961,7 +961,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             }, { counts:[5, 10, 20, 50], dataset: $scope.data});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                                $scope.checkboxes.items = [];\r
+                $scope.checkboxes.items = {};\r
                 angular.forEach($scope.linkTableParams.data, function(item) {\r
                     console.log(item.id);\r
                     if (angular.isDefined(item.id)) {\r
@@ -1181,9 +1181,15 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var neName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.name", "errtag":"textboxErrName", "errfunc":"validatetextboxName","required":true}};\r
             $('#myModal #name').append($compile(Mustache.to_html(text, neName.ErrMsg))($scope));\r
 \r
-            var neVersion = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.version","errtag":"textboxErrVersion", "errfunc":"validatetextboxVersion","required":true}};\r
+            var neVersion = {"ErrMsg" :     {"errmsg" : "The version is required.", "modalVar":"ne.version","errtag":"textboxErrVersion", "errfunc":"validatetextboxVersion","required":true}};\r
             $('#myModal #version').append($compile(Mustache.to_html(text, neVersion.ErrMsg))($scope));\r
 \r
+            var neNERole = {"ErrMsg" :     {"errmsg" : "The role is required.", "modalVar":"ne.role","errtag":"textboxErrRole", "errfunc":"validatetextboxRole","required":true}};\r
+            $('#myModal #nerole').append($compile(Mustache.to_html(text, neNERole.ErrMsg))($scope));\r
+\r
+            var serialNumber = {"ErrMsg" :     {"errmsg" : "The serialNumber is required.", "modalVar":"ne.serialNumber","errtag":"textboxErrSerial", "errfunc":"validatetextboxSerial","required":true}};\r
+            $('#myModal #serialNumber').append($compile(Mustache.to_html(text, serialNumber.ErrMsg))($scope));\r
+\r
             var neProductName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.productName" }};\r
             $('#myModal #productName').append($compile(Mustache.to_html(text, neProductName.ErrMsg))($scope));\r
 \r
@@ -1200,14 +1206,13 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                        var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
             document.getElementById("medropdown").innerHTML = dropdownInfo;\r
 \r
-            var neController = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"ne.controller"}};\r
-            $('#myModal #controller').append($compile(Mustache.to_html(text, neController.ErrMsg))($scope));\r
+            /*var neController = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"ne.controller"}};\r
+            $('#myModal #controller').append($compile(Mustache.to_html(text, neController.ErrMsg))($scope));*/\r
 \r
             var neIPAddress = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"ne.ipAddress"}};\r
             $('#myModal #ipAddress').append($compile(Mustache.to_html(text, neIPAddress.ErrMsg))($scope));\r
 \r
-            var neNERole = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.nerole"}};\r
-            $('#myModal #nerole').append($compile(Mustache.to_html(text, neNERole.ErrMsg))($scope));\r
+\r
 \r
             var neAdminState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.adminState"}};\r
             $('#myModal #adminState').append($compile(Mustache.to_html(text, neAdminState.ErrMsg))($scope));\r
@@ -1215,13 +1220,25 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var neOperatingState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.operatingState"}};\r
             $('#myModal #operatingState').append($compile(Mustache.to_html(text, neOperatingState.ErrMsg))($scope));\r
 \r
+\r
+            neDataService.getNESiteDDList()\r
+                .then(function (data) {\r
+                    $scope.siteIDList = data.sites;\r
+                    var dropdownInfo = translateSiteIdToDropdownInfo($scope.siteIDList);\r
+                    $("#siteIdDropdown").html(dropdownInfo);\r
+                    console.log("Data: ");\r
+                    $log.info(data);\r
+                }, function (reason) {\r
+                    $scope.message = "Error is :" + JSON.stringify(reason);\r
+                });\r
+\r
             $scope.checkboxes = { 'checked': false, items: {} };\r
 \r
             $scope.neTableParams = new NgTableParams({count: 5, sorting: {name: 'asc'}    //{page: 1,count: 10,filter: {name: 'M'},sorting: {name: 'desc'}\r
             }, { counts:[5, 10, 20, 50], dataset: $scope.data});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                                $scope.checkboxes.items = [];\r
+                $scope.checkboxes.items = {};\r
                 angular.forEach($scope.neTableParams.data, function(item) {\r
                     if (angular.isDefined(item.id)) {\r
                         $scope.checkboxes.items[item.id] = value;\r
@@ -1241,8 +1258,19 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             }\r
 \r
             return options;\r
-        } \r
+        }\r
+\r
+        function translateSiteIdToDropdownInfo(dropdowndata) {\r
+            var options = '<option value="select">--select--</option>';\r
+            var i;\r
+            for (i = 0; i < dropdowndata.length; i += 1) {\r
+                var option = '<option value="' + dropdowndata[i].id + '">' + dropdowndata[i].name\r
+                    + '</option>';\r
+                options = options + option;\r
+            }\r
 \r
+            return options;\r
+        }\r
 \r
         $scope.validatetextboxName = function (value){\r
             if($scope.ne.name) {\r
@@ -1260,6 +1288,22 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 $scope.textboxErrVersion = true;\r
         }\r
 \r
+        $scope.validatetextboxRole = function (value){\r
+            if($scope.ne.role) {\r
+                $scope.textboxErrRole = false;\r
+            }\r
+            else\r
+                $scope.textboxErrRole = true;\r
+        }\r
+\r
+        $scope.validatetextboxSerial = function (value){\r
+            if($scope.ne.serialNumber) {\r
+                $scope.textboxErrSerial = false;\r
+            }\r
+            else\r
+                $scope.textboxErrSerial = true;\r
+        }\r
+\r
         $scope.closeModal = function() {\r
             console.log("Closing Modal...");\r
             $('#myModal').modal('hide');\r
@@ -1284,7 +1328,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $("#myModal").modal({}).draggable();\r
         }\r
         $scope.saveData = function(id) {\r
-            if (!$scope.textboxErrName && !$scope.textboxErrVersion) {\r
+            if (!$scope.textboxErrName && !$scope.textboxErrVersion && !$scope.textboxErrRole && !$scope.textboxErrSerial) {\r
                                \r
                                var nes = {};\r
                                nes.managedElement = $scope.ne;\r
@@ -1441,31 +1485,43 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $('#myModal #Status').append($compile(Mustache.to_html(text, dataStatus.ErrMsg))($scope));\r
 \r
             //$('#myModal #Country').append($compile(Mustache.to_html(dropDown, $scope.data.dropdowncountryData))($scope));\r
-            var dropSimple_data = {\r
+            /*var dropSimple_data = {\r
                 "modalVar" : "datacenter.Country",\r
                 "labelField" : "itemLabel",\r
                 "optionsValue" : $scope.data ? JSON.stringify($scope.data.dropdowncountryData.item) : ""\r
             };\r
 \r
-            $('#myModal #Country').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));\r
+            $('#myModal #Country').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
 \r
             //$('#myModal #Location').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownlocationData))($scope));\r
-            var dropSimple_data = {\r
+            /*var dropSimple_data = {\r
                 "modalVar" : "datacenter.Location",\r
                 "labelField" : "itemLabel",\r
                 "optionsValue" : $scope.data ? JSON.stringify($scope.data.dropdownlocationData.item) : ""\r
             };\r
 \r
-            $('#myModal #Location').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));\r
+            $('#myModal #Location').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
 \r
             //$('#myModal #ServiceName').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownserviceData))($scope));\r
-            var dropSimple_data = {\r
+            /*var dropSimple_data = {\r
                 "modalVar" : "datacenter.ServiceName",\r
                 "labelField" : "itemLabel",\r
                 "optionsValue" : $scope.data ? JSON.stringify($scope.data.dropdownlocationData.item) : ""\r
             };\r
 \r
-            $('#myModal #ServiceName').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));\r
+            $('#myModal #ServiceName').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
+                       \r
+                       var dropdownResponse=[{"serviceTemplateId":"Country1","templateName":"Country1"},{"serviceTemplateId":"Country2","templateName":"Country2"}];\r
+            var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
+            document.getElementById("countrydropdown").innerHTML = dropdownInfo;\r
+\r
+            var dropdownResponse=[{"serviceTemplateId":"Location1","templateName":"Location1"},{"serviceTemplateId":"Location2","templateName":"Location2"}];\r
+            var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
+            document.getElementById("locationdropdown").innerHTML = dropdownInfo;\r
+\r
+            var dropdownResponse=[{"serviceTemplateId":"ServiceName1","templateName":"ServiceName1"},{"serviceTemplateId":"ServiceName2","templateName":"ServiceName2"}];\r
+            var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
+            document.getElementById("servicenamedropdown").innerHTML = dropdownInfo;\r
 \r
             var dataCPU = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"datacenter.Cpu"}};\r
             $('#myModal #Cpu').append($compile(Mustache.to_html(text, dataCPU.ErrMsg))($scope));\r
@@ -1482,7 +1538,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             }, { counts:[5, 10, 20, 50], dataset: $scope.data.datacenterData});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                                 $scope.checkboxes.items = [];\r
+                $scope.checkboxes.items = {};\r
 \r
                 angular.forEach($scope.neTableParams.data, function(item) {\r
                                        \r
@@ -1492,24 +1548,26 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 });\r
             });\r
 \r
+        }\r
+               \r
+               function translateToDropdownInfo(dropdowndata) {\r
+            var options = '<option value="select">--select--</option>';\r
+            var i;\r
+            for (i = 0; i < dropdowndata.length; i += 1) {\r
+                var option = '<option value="' + dropdowndata[i].serviceTemplateId + '">' + dropdowndata[i].templateName+ '</option>';\r
+                options = options + option;\r
+            }\r
+            return options;\r
         }\r
 \r
         $scope.validatetextbox = function (value){\r
-            if($scope.data.Name) {\r
+            if($scope.datacenter.Name) {\r
                 $scope.textboxErr = false;\r
             }\r
             else\r
                 $scope.textboxErr = true;\r
         }\r
 \r
-        $scope.validatenumeric = function (value){\r
-            if($scope.data.cpu) {\r
-                $scope.numericErr = false;\r
-            }\r
-            else\r
-                $scope.numericErr = true;\r
-        }\r
-\r
         $scope.closeModal = function() {\r
             console.log("Closing Modal...");\r
             $('#myModal').modal('hide');\r
@@ -1529,10 +1587,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             //$("#myModal").modal();\r
             $("#myModal").modal({}).draggable();\r
             $scope.textboxErr = false;\r
-            $scope.numericErr = false;\r
         }\r
         $scope.saveData = function(id) {\r
-            if (!$scope.textboxErr && !$scope.numericErr) {\r
+            if (!$scope.textboxErr) {\r
                                \r
                                var dcs = {}\r
                                dcs.dc =        $scope.datacenter;\r

diff --git a/resmgr/src/main/webapp/resmgr/nfv-resmgr/datacenter/datacenter.html b/resmgr/src/main/webapp/resmgr/nfv-resmgr/datacenter/datacenter.html
index cd0c2c3..3d6c704 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/nfv-resmgr/datacenter/datacenter.html
+++ b/resmgr/src/main/webapp/resmgr/nfv-resmgr/datacenter/datacenter.html
@@ -85,9 +85,15 @@
                         <div id="Name" class="col-xs-8" >\r
                         </div>\r
                     </div>\r
-                    <div class="form-group row">\r
+                    <!--<div class="form-group row">\r
+                        <label class="col-xs-4 col-form-label">Country</label>\r
+                        <div id="Country" class="col-xs-8" >\r
+                        </div>\r
+                    </div>-->\r
+                                       <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">Country</label>\r
                         <div id="Country" class="col-xs-8" >\r
+                            <select id="countrydropdown" class="form-control inputfield" ng-model="datacenterData.optSelect" ng-options="item.templateName for item in optionsValue"></select>\r
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r
@@ -95,14 +101,26 @@
                         <div id="Status" class="col-xs-8" >\r
                         </div>\r
                     </div>\r
-                    <div class="form-group row">\r
+                    <!--<div class="form-group row">\r
+                        <label class="col-xs-4 col-form-label">Location</label>\r
+                        <div id="Location" class="col-xs-8" >\r
+                        </div>\r
+                    </div>-->\r
+                                       <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">Location</label>\r
                         <div id="Location" class="col-xs-8" >\r
+                            <select id="locationdropdown" class="form-control inputfield" ng-model="datacenterData.optSelect" ng-options="item.templateName for item in optionsValue"></select>\r
                         </div>\r
                     </div>\r
-                    <div class="form-group row">\r
+                    <!--<div class="form-group row">\r
+                        <label class="col-xs-4 col-form-label">ServiceName</label>\r
+                        <div id="ServiceName" class="col-xs-8" >\r
+                        </div>\r
+                    </div>-->\r
+                                       <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">ServiceName</label>\r
                         <div id="ServiceName" class="col-xs-8" >\r
+                            <select id="servicenamedropdown" class="form-control inputfield" ng-model="datacenterData.optSelect" ng-options="item.templateName for item in optionsValue"></select>\r
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
index a1422f0..5c9970a 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
@@ -96,6 +96,18 @@
                         <div id="version" class="col-xs-8" >\r
                         </div>\r
                     </div>\r
+                    <div class="form-group row">\r
+                        <label class="col-xs-4 col-form-label">NE Role</label>\r
+                        <div id="nerole" class="col-xs-8" >\r
+                        </div>\r
+                    </div>\r
+\r
+                    <div class="form-group row">\r
+                        <label class="col-xs-4 col-form-label">Serial Number</label>\r
+                        <div id="serialNumber" class="col-xs-8" >\r
+                        </div>\r
+                    </div>\r
+\r
                     <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">Product Name</label>\r
                         <div id="productName" class="col-xs-8" >\r
@@ -104,7 +116,7 @@
                     <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">Controller</label>\r
                         <div id="controller" class="col-xs-8" >\r
-                                               <select id="medropdown" class="form-control inputfield" ng-model="meData.optSelect" ng-options="item.templateName for item in optionsValue"></select>\r
+                            <select id="medropdown" class="form-control inputfield" ng-model="ne.optSelect"></select>\r
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r
@@ -113,8 +125,9 @@
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r
-                        <label class="col-xs-4 col-form-label">NE Role</label>\r
-                        <div id="nerole" class="col-xs-8" >\r
+                        <label class="col-xs-4 col-form-label">Site ID</label>\r
+                        <div id="siteId" class="col-xs-8" >\r
+                            <select id="siteIdDropdown" class="form-control inputfield" ng-model="ne.siteId"></select>\r
                         </div>\r
                     </div>\r
                 </div>\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/neRest.js b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/neRest.js
index f6fabb4..f67c0fe 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/neRest.js
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/neRest.js
@@ -13,10 +13,18 @@
  * limitations under the License.\r
  */\r
 \r
-app.factory("neDataService", function($http, DataService, $log){\r
+app.factory("neDataService", function($http, DataService, $log, siteDataService){\r
     var uri = '';\r
     uri += "/openoapi/sdnobrs/v1/managed-elements";\r
     return {\r
+        getNESiteDDList : function() {\r
+            return siteDataService.getAllSiteData()\r
+                .then(function(response){\r
+                    $log.info("in get data service data is  :"+response);\r
+                    console.log(response);\r
+                    return response;\r
+                });\r
+        },\r
         getAllNEData : function() {\r
             /*return $http({\r
                 url: 'http://localhost:3000/meAPI/getAllNEData',\r