From a97277b67b8378c87e45bc19810b404336ded723 Mon Sep 17 00:00:00 2001
From: seshukm <seshu.kumar.m@huawei.com>
Date: Tue, 4 Apr 2017 10:04:38 +0530
Subject: [PATCH] Integration issues

IssueID : CLIENT-189

Change-Id: I6db264acceb67e19c15cdfc332ba3ad40e0e9577
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
---
 lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js | 12 ++++++------
 resmgr/src/main/webapp/resmgr/js/app.js             |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
index 6c3dac4e..78233c77 100644
--- 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) {
                     console.log("Data Template :: ");
                     $log.info(tmplatesResponse);
-                   // var templatesInfo = translateToTemplatesInfo(tmplatesResponse);
-                  //  document.getElementById("svcTempl").innerHTML = templatesInfo;
-                    $scope.optionsValue = tmplatesResponse;
+                    var templatesInfo = translateToTemplatesInfo(tmplatesResponse);
+                    document.getElementById("svcTempl").innerHTML = templatesInfo;
+                   /* $scope.optionsValue = tmplatesResponse;
                     var dropSimple_data = {
                         "errmsg" : "Service template is required.",
                         "modalVar" : "lifecycleData.optSelect",
                         "labelField" : "templateName",
-                        "optionsValue" : JSON.stringify(tmplatesResponse),
+                        "optionsValue" : JSON.stringify(templatesInfo),
                         "errtag":"lcdropdownErr",
                         "errfunc":"validatedropdown",
                         "required":true
-                    }
-		    $('#myModal #plainDropDown').html($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));
+                    }*/
+		    //$('#myModal #plainDropDown').html($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));
                 }, function (reason) {
                     $scope.error = "Error ! " + reason;
                 });
diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index d3a351c3..62f78ab4 100644
--- 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) {
             if (!$scope.textboxErrName && $scope.textboxErrMe) {
 				var ports ={};
-				ports.port=$scope.port;
+				ports.logicalTerminationPoint=$scope.port;
                 if(id) {
 					
                     //edit data
@@ -726,7 +726,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             if (!$scope.textboxErrLocation && !$scope.textboxErrCountry && !$scope.textboxErrLatitude && !$scope.textboxErrLongitude) {
 				
 				var locs = {}
-					locs.loc = $scope.loc
+					locs.location = $scope.loc
                 if(id) {
 					
 					
@@ -971,7 +971,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             if (!$scope.textboxErr) {
 				
 			var links ={}
-			links.link= $scope.link;
+			links.topologicalLink= $scope.link;
 				
                 if(id) {
 					
@@ -1208,7 +1208,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             if (!$scope.textboxErrName && !$scope.textboxErrVersion) {
 				
 				var nes = {};
-				nes.ne = $scope.ne;
+				nes.managedElement = $scope.ne;
                 if(id) {
                     //edit data
                     console.log("Editing data.." + JSON.stringify(nes));
-- 
2.16.6