From d0fc97abef13dbce379e4e779abd186ec0dc59f3 Mon Sep 17 00:00:00 2001
From: Luji7 <lu.ji3@zte.com.cn>
Date: Wed, 1 Nov 2017 14:55:19 +0800
Subject: Fix vimId format wrong.

Change-Id: I363e77e1a0cc5c8c5acbac3ddbb7b01ee67ddd2d
Issue-id: USECASEUI-53
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
---
 .../scripts/controller/ServiceTemplateService.js   |  7 +++----
 .../uui/fusion/scripts/controller/lcmController.js | 24 +---------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

(limited to 'usecaseui-lcm')

diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js
index 634cf7c7..c9357618 100644
--- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js
+++ b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js
@@ -118,8 +118,8 @@
          var vimInfos = response.data;
          var result = vimInfos.map(function (vim) {
            return {
-             name: vim['cloud-owner'] + '-' + vim['cloud-region-id'],
-             value: vim['cloud-owner'] + '-' + vim['cloud-region-id']
+             name: vim['cloud-owner'] + '_' + vim['cloud-region-id'],
+             value: vim['cloud-owner'] + '_' + vim['cloud-region-id']
            };
          });
          processFun(result);
@@ -257,10 +257,9 @@
        });
      },
 
-     packageOnboard: function (onboardPackage, vims) {
+     packageOnboard: function (onboardPackage) {
        console.log('onboard...');
        console.log(onboardPackage);
-       console.log(vims);
        var requestBody = {
          csarId: onboardPackage.uuid
        };
diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js
index f443f349..78e32aea 100644
--- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js
+++ b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js
@@ -83,29 +83,7 @@ app.controller('lcmCtrl', ['$scope', '$uibModal', '$log', '$http', '$timeout', '
       };
 
       ctrl.packageOnboard = function (onboardPackage) {
-        var modalInstance = $uibModal.open({
-          ariaLabelledBy: 'modal-title',
-          ariaDescribedBy: 'modal-body',
-          templateUrl : 'app/uui/fusion/scripts/view-models/vnf-ns-onboard-dialog.html',
-          controller : 'packageOnboardCtrl',
-          controllerAs : 'ctrl',
-          resolve: {
-            onboardPackage: function () {
-              return onboardPackage;
-            }
-          }
-        });
-        modalInstance.result.then(
-          function(result) {
-            console.log('receive ok button clicked!');
-            console.log(result);
-          },
-          function(reason) {
-            console.log('receive cancel button clicked!');
-            console.log(reason);
-            $log.info('Modal dismissed at: ' + new Date());
-          }
-        );
+        ServiceTemplateService.packageOnboard(onboardPackage);
       };
     }
   ]
-- 
cgit 1.2.3-korg