Integration issues

IssueID : CLIENT-189

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

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
index 6c3dac4..78233c7 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
@@ -286,19 +286,19 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
                 .then(function (tmplatesResponse) {\r
                     console.log("Data Template :: ");\r
                     $log.info(tmplatesResponse);\r
-                   // var templatesInfo = translateToTemplatesInfo(tmplatesResponse);\r
-                  //  document.getElementById("svcTempl").innerHTML = templatesInfo;\r
-                    $scope.optionsValue = tmplatesResponse;\r
+                    var templatesInfo = translateToTemplatesInfo(tmplatesResponse);\r
+                    document.getElementById("svcTempl").innerHTML = templatesInfo;\r
+                   /* $scope.optionsValue = tmplatesResponse;\r
                     var dropSimple_data = {\r
                         "errmsg" : "Service template is required.",\r
                         "modalVar" : "lifecycleData.optSelect",\r
                         "labelField" : "templateName",\r
-                        "optionsValue" : JSON.stringify(tmplatesResponse),\r
+                        "optionsValue" : JSON.stringify(templatesInfo),\r
                         "errtag":"lcdropdownErr",\r
                         "errfunc":"validatedropdown",\r
                         "required":true\r
-                    }\r
-                   $('#myModal #plainDropDown').html($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));\r
+                    }*/\r
+                   //$('#myModal #plainDropDown').html($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));\r
                 }, function (reason) {\r
                     $scope.error = "Error ! " + reason;\r
                 });\r

diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index d3a351c..62f78ab 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -263,7 +263,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         $scope.saveData = function(id) {\r
             if (!$scope.textboxErrName && $scope.textboxErrMe) {\r
                                var ports ={};\r
-                               ports.port=$scope.port;\r
+                               ports.logicalTerminationPoint=$scope.port;\r
                 if(id) {\r
                                        \r
                     //edit data\r
@@ -726,7 +726,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             if (!$scope.textboxErrLocation && !$scope.textboxErrCountry && !$scope.textboxErrLatitude && !$scope.textboxErrLongitude) {\r
                                \r
                                var locs = {}\r
-                                       locs.loc = $scope.loc\r
+                                       locs.location = $scope.loc\r
                 if(id) {\r
                                        \r
                                        \r
@@ -971,7 +971,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             if (!$scope.textboxErr) {\r
                                \r
                        var links ={}\r
-                       links.link= $scope.link;\r
+                       links.topologicalLink= $scope.link;\r
                                \r
                 if(id) {\r
                                        \r
@@ -1208,7 +1208,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             if (!$scope.textboxErrName && !$scope.textboxErrVersion) {\r
                                \r
                                var nes = {};\r
-                               nes.ne = $scope.ne;\r
+                               nes.managedElement = $scope.ne;\r
                 if(id) {\r
                     //edit data\r
                     console.log("Editing data.." + JSON.stringify(nes));\r