From 3c3840524ee11c1385045e9801918bcb05b71fb5 Mon Sep 17 00:00:00 2001 From: cyuamber Date: Tue, 3 Sep 2019 10:17:22 +0800 Subject: feat: delete useless modules and update tomcat version Change-Id: I38d0c0b65cf210074c7222a535f1b3d7c150f53d Issue-ID: USECASEUI-307 Signed-off-by: cyuamber --- .../scripts/controller/ServiceTemplateService.js | 538 -------------- .../uui/fusion/scripts/controller/lcmController.js | 822 --------------------- .../scripts/view-models/create-service-dialog.html | 132 ---- .../scripts/view-models/lifecyclemanagement.html | 111 --- .../scripts/view-models/progress-dialog.html | 31 - .../scripts/view-models/scale-service-dialog.html | 84 --- .../scripts/view-models/update-service-dialog.html | 132 ---- .../scripts/view-models/vnf-ns-onboard-dialog.html | 48 -- 8 files changed, 1898 deletions(-) delete mode 100644 usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js delete mode 100644 usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js delete mode 100644 usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/create-service-dialog.html delete mode 100644 usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/lifecyclemanagement.html delete mode 100644 usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/progress-dialog.html delete mode 100644 usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/scale-service-dialog.html delete mode 100644 usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/update-service-dialog.html delete mode 100644 usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/vnf-ns-onboard-dialog.html (limited to 'usecaseui-lcm/src/main/webapp/app') 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 deleted file mode 100644 index 9f813a36..00000000 --- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js +++ /dev/null @@ -1,538 +0,0 @@ -/* - * Copyright 2016-2017 ZTE Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - app.factory("ServiceTemplateService", function($http, $log) { - var url = '/api/usecaseui-server/v1/uui-lcm'; - var uuiHeaders = JSON.stringify({ - 'Content-Type': 'application/json' - // 'Authorization':'Basic dXNlY2FzZTp1c2VjYXNl' - }); - return { - getAllCustomers: function (processFun) { - console.log("customers") - return $http({ - url: url+'/customers', - method: 'GET', - data: null, - headers: uuiHeaders - }).then(function(response){ - console.log(response) - var customers = response.data; - var result = customers.map(function (customer) { - return { - name: customer['subscriber-name'], - id: customer['global-customer-id'], - }; - }); - processFun(result); - }); - }, - - getAllServiceTypes: function (customerId, processFun) { - return $http({ - url: url+'/customers/' + customerId + '/service-subscriptions', - method: 'GET', - data: null, - headers: uuiHeaders - }).then(function(response){ - var serviceSubscriptions = response.data; - var result = serviceSubscriptions.map(function (serviceSubscription) { - return { - name: serviceSubscription['service-type'], - value: serviceSubscription['service-type'] - }; - }); - processFun(result); - }); - }, - - getServiceInstances: function (customerId, serviceType, processFun) { - return $http({ - url: url+'/service-instances?customerId='+customerId+'&serviceType='+serviceType, - method: 'GET', - data: null, - headers: uuiHeaders - }).then(function(response){ - var serviceInstances = response.data; - console.log(serviceInstances); - var result = serviceInstances.map(function (serviceInstance) { - return { - serviceInstanceId: serviceInstance['service-instance-id'], - serviceInstanceName: serviceInstance['service-instance-name'], - serviceType: serviceInstance['service-type'], - }; - }); - processFun(result); - }); - }, - - getAllServiceTemplates: function (processFun) { - return $http({ - url: url+'/service-templates', - method: 'GET', - data: null, - headers: uuiHeaders - }).then(function(response){ - var templates = response.data; - var result = templates.map(function (template) { - return { - name: template.name, - id: template.uuid, - invariantUUID: template.invariantUUID, - version: template.version, - toscaModelURL: template.toscaModelURL - }; - }); - processFun(result); - }) - }, - - getupdateServiceTemplate:function(serviceInstanceId,processFun){ - return $http({ - url: url+'/xxxxxxx/'+ serviceInstanceId, - method: 'GET', - data: null, - headers: uuiHeaders - }).then(function(response){ - var template = response.data; - - processFun(template); - }) - }, - - getTemplateParameters: function (template, processFun) { - console.log(url+'/service-templates/' + template.id+'?toscaModelPath='+ template.toscaModelURL); - return $http({ - url: url+'/service-templates/' + template.id+'?toscaModelPath='+ template.toscaModelURL, - method: 'GET', - data: null, - headers: uuiHeaders - }).then(function(response){ - var inputRsp = response.data; - console.log(inputRsp); - processFun(inputRsp); - }); - }, - - getComparedTemplateParameters: function (serviceInstanceId,template, processFun) { - var requestBody = { - "model-invariant-id-target": template.invariantUUID, - "model-version-id-target": template.id - } - return $http({ - url: url+'/xxxxxxxxx/' + serviceInstanceId, - method: 'POST', - data: JSON.stringify(requestBody), - headers: uuiHeaders - }).then(function(response){ - var inputRsp = response.data; - console.log(inputRsp); - processFun(inputRsp); - }); - }, - - getAllVimInfo: function (processFun) { - return $http({ - url: url+'/locations/', - method: 'GET', - data: null, - headers: uuiHeaders - }).then(function(response){ - var vimInfos = response.data; - console.log(vimInfos); - var result = vimInfos.map(function (vim) { - return { - name: vim['cloud-owner'], //complex-name - value: vim['cloud-owner'] + '_' + vim['cloud-region-id'] - }; - }); - processFun(result); - }); - }, - - getAllSdnControllers: function (processFun) { - return $http({ - url: url+'/sdnc-controllers/', - method: 'GET', - data: null, - headers: uuiHeaders - }).then(function(response){ - var sdnControllers = response.data; - console.log(sdnControllers); - var result = sdnControllers.map(function (sdn) { - return { - name: sdn['thirdparty-sdnc-id'], - value: sdn['thirdparty-sdnc-id'] - }; - }); - processFun(result); - }); - }, - - createService: function (customer, serviceType, service, template, successFun, failedFun) { - var reqPara = []; - var newreqParas = {}; - service.segments.forEach(function (segment) { - var reqParas = {}; - var vfLocations = []; - segment.parameters.forEach(function (parameter) { - if(parameter.type === 'vf_location') { - // name is uuid for vf_location - var loc = { - vnfProfileId: parameter.name, - locationConstraints : { - vimId: parameter.value.value - } - }; - vfLocations.push(loc); - } else if(parameter.type === 'sdn_controller') { - if(parameter.value === undefined || parameter.value === null) { - reqParas[parameter.name] = ''; - } else { - reqParas[parameter.name] = parameter.value.value; - } - } else { - reqParas[parameter.name] = parameter.value; - } - }); - - var para = { - resourceName: segment.nodeTemplateName, - resourceInvariantUuid: segment.invariantUUID,//resourceDefId - resourceUuid: segment.uuid, - resourceCustomizationUuid: segment.customizationUuid, - parameters: { //nsParameters - locationConstraints: vfLocations, - // additionalParamForNs: reqParas, - resources:[], - requestInputs:reqParas - } - }; - reqPara.push(para); - }); - - var templateName = template.name; - if( template.version !== undefined && template.version !== null && template.version !== '' ) { - templateName = templateName + ":" + template.version; - } - - service.parameters.forEach(function(item){ - newreqParas[item.name] = item.value; - }) - - var requestBody = { - service: { - name: service.serviceName, - description: service.serviceDescription, - serviceInvariantUuid: template.invariantUUID, //serviceDefId - serviceUuid: template.uuid, // uuid ?? templateId - globalSubscriberId: customer.id, - serviceType: serviceType.value, - parameters: { - // globalSubscriberId: customer.id, - // subscriberName: customer.name, - // serviceType: serviceType.value, - // templateName: templateName, - locationConstraints:[], - resources: reqPara, - requestInputs:newreqParas - } - } - }; - - console.log(requestBody); - // console.log(JSON.stringify(requestBody)); - // return false; - return $http({ - url: url+'/services', - method: 'POST', - data: JSON.stringify(requestBody), - headers: uuiHeaders - }).then(function(response){ - console.log('create response...'); - console.log(response.data); - - var serviceId = response.data.service.serviceId; - var operationId = response.data.service.operationId; - successFun(serviceId, operationId); - }); - }, - - updateService: function (customer, serviceType,serviceInstanceId, service, template, successFun, failedFun) { - var reqPara = []; - var newreqParas = {}; - service.segments.forEach(function (segment) { - var reqParas = {}; - var vfLocations = []; - segment.parameters.forEach(function (parameter) { - if(parameter.type === 'vf_location') { - // name is uuid for vf_location - var loc = { - vnfProfileId: parameter.name, - locationConstraints : { - vimId: parameter.value.value - } - }; - vfLocations.push(loc); - } else if(parameter.type === 'sdn_controller') { - if(parameter.value === undefined || parameter.value === null) { - reqParas[parameter.name] = ''; - } else { - reqParas[parameter.name] = parameter.value.value; - } - } else { - reqParas[parameter.name] = parameter.value; - } - }); - - var para = { - resourceName: segment.nodeTemplateName, - resourceInvariantUuid: segment.invariantUUID,//resourceDefId - resourceUuid: segment.uuid, - resourceCustomizationUuid: segment.customizationUuid, - parameters: { //nsParameters - locationConstraints: vfLocations, - // additionalParamForNs: reqParas, - resources:[], - requestInputs:reqParas - } - }; - reqPara.push(para); - }); - - var templateName = template.name; - if( template.version !== undefined && template.version !== null && template.version !== '' ) { - templateName = templateName + ":" + template.version; - } - - service.parameters.forEach(function(item){ - newreqParas[item.name] = item.value; - }) - - var requestBody = { - service: { - name: service.serviceName, - description: service.serviceDescription, - serviceInvariantUuid: template.invariantUUID, //serviceDefId - serviceUuid: template.uuid, // uuid ?? templateId - globalSubscriberId: customer.id, - serviceType: serviceType.value, - parameters: { - // globalSubscriberId: customer.id, - // subscriberName: customer.name, - // serviceType: serviceType.value, - // templateName: templateName, - locationConstraints:[], - resources: reqPara, - requestInputs:newreqParas - } - } - }; - - console.log(requestBody); - // console.log(JSON.stringify(requestBody)); - return false; - return $http({ - url: url+ '/services/updateService/' + serviceInstanceId, - method: 'POST', - data: JSON.stringify(requestBody), - headers: uuiHeaders - }).then(function(response){ - console.log('update response...'); - console.log(response.data); - // var serviceId = response.data.service.serviceId; - var operationId = response.data.service.operationId; - successFun(operationId); - }); - }, - - getScaleServiceDialog:function(customer,serviceType,serviceInstanceId,successFun){ - return $http({ - url:url+'/getServiceInstanceById?customerId=' + customer + '&serviceType=' + serviceType + '&serviceId=' + serviceInstanceId, - method:'GET' - }).then(function(response){ - successFun(response); - }) - }, - - scaleService: function (requestBody, successFun, failedFun) { - - console.log(requestBody); - console.log(JSON.stringify(requestBody)); - - return $http({ - url: url+'/services/scaleServices/'+requestBody.service.globalSubscriberId, - method: 'POST', - data: JSON.stringify(requestBody), - headers: uuiHeaders - }).then(function(response){ - // console.log('create response...'); - console.log(response); - var operationId = response.data.operationId; - if(operationId == null){ - console.log('error: operationId is null'); - return false; - } - successFun( operationId); - }); - }, - - deleteService: function (serviceId, customer, serviceType, successFun) { - var requestBody = { - globalSubscriberId: customer.id, - serviceType: serviceType.value - }; - return $http({ - url: url+'/services/' + serviceId, - method: 'DELETE', - data: JSON.stringify(requestBody), - headers: uuiHeaders - }).then(function(response){ - console.log('delete response...'); - console.log(response.data); - successFun(serviceId, response.data.operationId); - }); - }, - - queryServiceProgress: function (serviceId, operationId, progressFun) { - return $http({ - url: url+'/services/' + serviceId + '/operations/' + operationId, - method: 'GET', - data: null, - headers: uuiHeaders - }).then(function(response){ - console.log('get progress response...'); - console.log(response.data); - var op = response.data.operationStatus; - progressFun({ - result: op.result, - progress : op.progress, - operationContent: op.operationContent, - reason: op.reason - }); - }); - }, - - getPackages: function (processFun) { - return $http({ - url: url+'/vf-ns-packages', - method: 'GET', - data: null, - headers: uuiHeaders - }).then(function(response){ - var packageRsp = response.data; - var packages = []; - packageRsp.nsPackage.forEach(function (ns) { - packages.push({ - uuid: ns.uuid, - invariantUUID: ns.invariantUUID, - name: ns.name, - version: ns.version, - type: 'NS' - }) - }); - packageRsp.vnfPackages.forEach(function (vnf) { - packages.push({ - uuid: vnf.uuid, - invariantUUID: vnf.invariantUUID, - name: vnf.name, - version: vnf.version, - type: 'VF' - }) - }); - processFun(packages); - }); - }, - - nsPackageOnboard: function (onboardPackage, processFun) { - console.log('onboard...'); - console.log(onboardPackage); - var requestBody = { - csarId: onboardPackage.uuid - }; - return $http({ - url: url+'/ns-packages', - method: 'POST', - data: JSON.stringify(requestBody), - headers: uuiHeaders - }).then(function(response){ - console.log('onboard ns package response...'); - console.log(response.data); - processFun(response.data); - }); - }, - - vfPackageOnboard: function (onboardPackage, processFun) { - console.log('onboard...'); - console.log(onboardPackage); - var requestBody = { - csarId: onboardPackage.uuid - }; - return $http({ - url: url+'/vf-packages', - method: 'POST', - data: JSON.stringify(requestBody), - headers: uuiHeaders - }).then(function(response){ - console.log('onboard vf package response...'); - console.log(response.data); - processFun(response.data); - }); - }, - - queryVfOnboardProgress: function (jobId, responseId, progressFun) { - return $http({ - url: url+'/jobs/' + jobId + '?responseId=' + responseId, - method: 'GET', - data: null, - headers: uuiHeaders - }).then(function(response){ - console.log('get progress response...'); - console.log(response.data); - progressFun(response.data.responseDescriptor); - }); - }, - - nsPackageDelete: function (deletePackage, processFun) { - console.log('delete package...'); - console.log(deletePackage); - return $http({ - url: url+'/ns-packages/' + deletePackage.uuid, - method: 'DELETE', - data: null, - headers: uuiHeaders - }).then(function(response){ - console.log('delete ns package response...'); - console.log(response.data); - processFun(response.data); - }); - }, - - vfPackageDelete: function (deletePackage, processFun) { - console.log('delete package...'); - console.log(deletePackage); - return $http({ - url: url+'/vf-packages/' + deletePackage.uuid, - method: 'DELETE', - data: null, - headers: uuiHeaders - }).then(function(response){ - console.log('delete vf package response...'); - console.log(response.data); - processFun(response.data); - }); - } - }; - }); 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 deleted file mode 100644 index 73dc6edb..00000000 --- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js +++ /dev/null @@ -1,822 +0,0 @@ -/* - * Copyright 2016-2017 ZTE Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -app.controller('lcmCtrl', ['$scope', '$uibModal', '$log', '$http', '$timeout', '$interval', 'ServiceTemplateService', - function ($scope, $uibModal, $log, $http, $timeout, $interval, ServiceTemplateService) { - var ctrl = this; - ctrl.alerts = []; - ctrl.closeAlert = function (index) { - ctrl.alerts.splice(index, 1); - }; - var openServiceProgressDialog = function (serviceId, operationId, title, successFun, failFun) { - var serviceProgressInstance = $uibModal.open({ - ariaLabelledBy: 'modal-title', - ariaDescribedBy: 'modal-body', - templateUrl: 'app/uui/fusion/scripts/view-models/progress-dialog.html', - controller: 'ServiceProgressCtrl', - controllerAs: 'ctrl', - resolve: { - serviceId: function () { - return serviceId; - }, - operationId: function () { - return operationId; - }, - operationTitle: function () { - return title; - } - } - }); - serviceProgressInstance.result.then( - function (result) { - successFun(result); - }, - function (reason) { - failFun(reason); - } - ); - }; - ctrl.openCreateServiceDialog = function () { - var modalInstance = $uibModal.open({ - ariaLabelledBy: 'modal-title', - ariaDescribedBy: 'modal-body', - templateUrl: 'app/uui/fusion/scripts/view-models/create-service-dialog.html', - controller: 'createServiceCtrl', - controllerAs: 'ctrl', - resolve: { - customer: function () { - return ctrl.customer; - }, - serviceType: function () { - return ctrl.serviceType; - } - } - }); - modalInstance.result.then( - function (result) { - console.log('receive ok button clicked!'); - console.log(result); - var successFun = function (result) { - ctrl.alerts.push({ - type: 'success', - msg: result - }); - ServiceTemplateService.getServiceInstances(ctrl.customer.id, ctrl.serviceType.value, function (instances) { - ctrl.serviceInstances = instances; - }); - } - var failFun = function (reason) { - ctrl.alerts.push({ - type: 'danger', - msg: reason - }); - } - openServiceProgressDialog(result.serviceId, result.operationId, 'Create Service', successFun, failFun); - }, - function (reason) { - console.log('receive cancel button clicked!'); - console.log(reason); - $log.info('Modal dismissed at: ' + new Date()); - } - ); - }; - - ctrl.init = function () { - ctrl.canCreateService = "true"; - ServiceTemplateService.getAllCustomers(function (customers) { - ctrl.customers = customers; - }); - ServiceTemplateService.getPackages(function (packages) { - ctrl.packages = packages; - }); - }; - - ctrl.customerChanged = function () { - if (ctrl.customer === undefined || ctrl.customer === null) { - ctrl.serviceTypes = []; - } else { - ServiceTemplateService.getAllServiceTypes(ctrl.customer.id, function (serviceTypes) { - ctrl.serviceTypes = serviceTypes; - }); - } - ctrl.serviceType = undefined; - ctrl.canCreateService = "true"; - }; - - ctrl.serviceTypeChanged = function () { - if (ctrl.serviceType === undefined || ctrl.serviceType === null || ctrl.customer === undefined || ctrl.customer === null) { - ctrl.canCreateService = "true"; - return; - } - ctrl.canCreateService = "false"; - ServiceTemplateService.getServiceInstances(ctrl.customer.id, ctrl.serviceType.value, function (instances) { - ctrl.serviceInstances = instances; - }); - }; - - ctrl.scaleService = function (serviceInstance) { - - var modalInstance = $uibModal.open({ - ariaLabelledBy: 'modal-title', - ariaDescribedBy: 'modal-body', - templateUrl: 'app/uui/fusion/scripts/view-models/scale-service-dialog.html', - controller: 'scaleServiceCtrl', - controllerAs: 'ctrl', - resolve: { - customer: function () { - return ctrl.customer; - }, - serviceType: function () { - return ctrl.serviceType; - }, - serviceInstance: serviceInstance - } - }); - modalInstance.result.then( - function (result) { - console.log(result); - console.log(serviceInstance); - var successFun = function (result) { - ctrl.alerts.push({ - type: 'success', - msg: result - }); - ServiceTemplateService.getServiceInstances(ctrl.customer.id, ctrl.serviceType.value, function (instances) { - ctrl.serviceInstances = instances; - }); - } - var failFun = function (reason) { - console.log(reason) - ctrl.alerts.push({ - type: 'danger', - msg: reason - }); - } - openServiceProgressDialog(result.serviceId, result.operationId, 'Scale Service', successFun, failFun); - }, - function (reason) { - console.log('receive cancel button clicked!'); - console.log(reason); - $log.info('Modal dismissed at: ' + new Date()); - } - ); - - }; - - ctrl.deleteService = function (serviceInstance) { - console.log(serviceInstance); - var deleteServiceName = serviceInstance.serviceInstanceName; - var modalInstance = $uibModal.open({ - ariaLabelledBy: 'modal-title', - ariaDescribedBy: 'modal-body', - template:(function(deleteServiceName){ - var strtemplate = - '
'+ - ''+ - '
'+ - '
'+ - '

Are you sure you want to delete '+ deleteServiceName + '?

'+ - '
'+ - '
'+ - ''+ - ''+ - '
'; - return strtemplate; - })(deleteServiceName), - - controller: function($uibModalInstance){ - this.ok = function(){ - $uibModalInstance.close('delete implement'); - }; - this.cancel = function(){ - $uibModalInstance.dismiss('delete cancel'); - } - } , - controllerAs: 'ctrl', - }); - modalInstance.result.then( - function(res){ - console.log(res); - var successFun = function (serviceId, operationId) { - var successFun = function (result) { - ctrl.alerts.push({ - type: 'success', - msg: result - }); - ServiceTemplateService.getServiceInstances(ctrl.customer.id, ctrl.serviceType.value, function (instances) { - ctrl.serviceInstances = instances; - }); - } - var failFun = function (reason) { - ctrl.alerts.push({ - type: 'danger', - msg: reason - }); - } - openServiceProgressDialog(serviceId, operationId, 'Delete Service', successFun, failFun); - } - ServiceTemplateService.deleteService(serviceInstance.serviceInstanceId, ctrl.customer, ctrl.serviceType, successFun); - }, - function(reason){ - console.log(reason); - } - ) - }; - - ctrl.upDateService = function (serviceInstance) { - - var modalInstance = $uibModal.open({ - ariaLabelledBy: 'modal-title', - ariaDescribedBy: 'modal-body', - templateUrl: 'app/uui/fusion/scripts/view-models/update-service-dialog.html', - controller: 'updateServiceCtrl', - controllerAs: 'ctrl', - resolve: { - customer: function () { - return ctrl.customer; - }, - serviceType: function () { - return ctrl.serviceType; - }, - serviceInstance: serviceInstance - } - }); - modalInstance.result.then( - function (result) { - console.log(result); - console.log(serviceInstance); - var successFun = function (result) { - ctrl.alerts.push({ - type: 'success', - msg: result - }); - ServiceTemplateService.getServiceInstances(ctrl.customer.id, ctrl.serviceType.value, function (instances) { - ctrl.serviceInstances = instances; - }); - } - var failFun = function (reason) { - console.log(reason) - ctrl.alerts.push({ - type: 'danger', - msg: reason - }); - } - openServiceProgressDialog(result.serviceId, result.operationId, 'upDate Service', successFun, failFun); - }, - function (reason) { - console.log('receive cancel button clicked!'); - console.log(reason); - $log.info('Modal dismissed at: ' + new Date()); - } - ); - - }; - - ctrl.packageOnboard = function (onboardPackage) { - if (onboardPackage.type === 'NS') { - var processFun = function (response) { - if ('failed' === response.status) { - ctrl.alerts.push({ - type: 'danger', - msg: 'Operation failed! ' + response.statusDescription - }); - } else { - ctrl.alerts.push({ - type: 'success', - msg: 'Operation is finished!' - }); - } - }; - ServiceTemplateService.nsPackageOnboard(onboardPackage, processFun); - } else { - var openOnboardProgressDialog = function (jobId, title, successFun, failFun) { - var onboardProgressInstance = $uibModal.open({ - ariaLabelledBy: 'modal-title', - ariaDescribedBy: 'modal-body', - templateUrl: 'app/uui/fusion/scripts/view-models/progress-dialog.html', - controller: 'VfOnboardProgressCtrl', - controllerAs: 'ctrl', - resolve: { - jobId: function () { - return jobId; - }, - operationTitle: function () { - return title; - } - } - }); - onboardProgressInstance.result.then( - function (result) { - successFun(result); - }, - function (reason) { - failFun(reason); - } - ); - }; - var successFun = function (result) { - ctrl.alerts.push({ - type: 'success', - msg: 'Operation is finished!' - }); - }; - var failFun = function (reason) { - ctrl.alerts.push({ - type: 'danger', - msg: 'Operation is failed! ' + reason - }); - }; - var processFun = function (response) { - openOnboardProgressDialog(response.jobId, 'VF Onboarding', successFun, failFun); - }; - ServiceTemplateService.vfPackageOnboard(onboardPackage, processFun); - } - }; - - ctrl.packageDelete = function (deletePackage) { - if (deletePackage.type === 'NS') { - var processFun = function (response) { - if ('failed' === response.status) { - ctrl.alerts.push({ - type: 'danger', - msg: 'Operation failed! ' + response.statusDescription - }); - } else { - ctrl.alerts.push({ - type: 'success', - msg: 'Operation is finished!' - }); - } - }; - ServiceTemplateService.nsPackageDelete(deletePackage, processFun); - } else { - var openOnboardProgressDialog = function (jobId, title, successFun, failFun) { - var onboardProgressInstance = $uibModal.open({ - ariaLabelledBy: 'modal-title', - ariaDescribedBy: 'modal-body', - templateUrl: 'app/uui/fusion/scripts/view-models/progress-dialog.html', - controller: 'VfOnboardProgressCtrl', - controllerAs: 'ctrl', - resolve: { - jobId: function () { - return jobId; - }, - operationTitle: function () { - return title; - } - } - }); - onboardProgressInstance.result.then( - function (result) { - successFun(result); - }, - function (reason) { - failFun(reason); - } - ); - }; - var successFun = function (result) { - ctrl.alerts.push({ - type: 'success', - msg: 'Operation is finished!' - }); - }; - var failFun = function (reason) { - ctrl.alerts.push({ - type: 'danger', - msg: 'Operation is failed! ' + reason - }); - }; - var processFun = function (response) { - openOnboardProgressDialog(response.jobId, 'Delete VF package', successFun, failFun); - }; - ServiceTemplateService.vfPackageDelete(deletePackage, processFun); - } - }; - - ctrl.jumpToUrl = function () { - var obj = $("#lm"); - angular.element(obj).scope().currentTab = "app/uui/fusion/scripts/view-models/device-topological.html"; - } - - } - ]) - .controller('createServiceCtrl', ['$scope', '$uibModal', '$uibModalInstance', 'ServiceTemplateService', 'customer', 'serviceType', - function ($scope, $uibModal, $uibModalInstance, ServiceTemplateService, customer, serviceType) { - var ctrl = this; - - ServiceTemplateService.getAllServiceTemplates(function (t) { - ctrl.templates = t; - }); - - ctrl.changeInput = function (serviceTemplate) { - var paras = serviceTemplate.inputs.map(function (input) { - return { - name: input.name, - type: input.type, - description: input.description, - defaultValue: input.defaultValue, - isRequired: input.isRequired, - readonly: "" - }; - }); - - var segmentsPara = serviceTemplate.nestedTemplates.map(function (nestedTemplate) { - var nestedParas = nestedTemplate.inputs.map(function (input) { - return { - name: input.name, - type: input.type, - description: input.description, - defaultValue: input.defaultValue, - isRequired: input.isRequired, - readonly: "" - }; - }); - return { - nodeTemplateName: nestedTemplate.name, - customizationUuid:nestedTemplate.customizationUuid, - invariantUUID: nestedTemplate.invariantUUID, - uuid: nestedTemplate.uuid, - type: nestedTemplate.type, - parameters: nestedParas - }; - }); - - var service = { - serviceName: ctrl.service.serviceName, - serviceDescription: ctrl.service.serviceDescription, - parameters: paras, - segments: segmentsPara - }; - ctrl.service = service; - console.log(service); - }; - ctrl.service = { - serviceName: '', - serviceDescription: '', - parameters: [], - segments: [] - }; - ctrl.sdnControllers = []; - ctrl.locations = []; - - ctrl.serviceTemplateChanged = function (template) { - console.log(template); - if (template === undefined || template === null) { - ctrl.service = undefined; - ctrl.realTemplate = undefined; - } else { - ServiceTemplateService.getTemplateParameters(template, function (templateRsp) { - ctrl.realTemplate = templateRsp; - ctrl.changeInput(ctrl.realTemplate); - }); - } - }; - - ctrl.ok = function () { - console.log('ok button clicked!'); - console.log('service: '); - console.log(customer); - console.log(serviceType); - console.log(ctrl.service); - console.log(ctrl.realTemplate); - - - var errorMessage = function () { - - }; - var successFun = function (serviceId, operationId) { - $uibModalInstance.close({ - serviceId: serviceId, - operationId: operationId - }); - } - ServiceTemplateService.createService(customer, serviceType, ctrl.service, ctrl.realTemplate, successFun, errorMessage); - }; - // cancel click - ctrl.cancel = function () { - $uibModalInstance.dismiss('cancel'); - }; - - ServiceTemplateService.getAllVimInfo(function (vims) { - ctrl.locations = vims; - }); - - ServiceTemplateService.getAllSdnControllers(function (sdnControllers) { - ctrl.sdnControllers = sdnControllers; - }); - } - ]) - .controller('scaleServiceCtrl', ['$scope', '$uibModal', '$uibModalInstance', 'ServiceTemplateService', 'customer', 'serviceType','serviceInstance', - function ($scope, $uibModal, $uibModalInstance, ServiceTemplateService, customer, serviceType, serviceInstance) { - var ctrl = this; - console.log(ctrl); - console.log(customer); - console.log(serviceType); - console.log(serviceInstance); - - ServiceTemplateService.getScaleServiceDialog(customer.name,serviceType.name,serviceInstance.serviceInstanceId,function(data){ - console.log(data.data); - ctrl.nsData = data.data; - // console.log(ctrl) - }) - ctrl.scaleTypes = ["SCALE_NS","SCALE_VNF"]; - ctrl.scalingDirections = ["SCALE_IN","SCALE_OUT"]; - - ctrl.ok = function () { - - let resources = []; - ctrl.nsData.forEach(function(item){ - resources.push({ - "resourceInstanceId": item.netWorkServiceId, - "scaleType": item.scaleType, - "scaleNsData": { - "scaleNsByStepsData": { - "aspectId": item.aspectId, - "numberOfSteps": item.numberOfStep, - "scalingDirection": item.scalingDirection - } - } - }) - }) - var requestBody = { - "service":{ - "serviceInstanceName": serviceInstance.serviceInstanceName, - "serviceType": serviceType.value, - "globalSubscriberId": serviceInstance.serviceInstanceId, - "resources": resources - } - }; - var errorMessage = function () { - - }; - var successFun = function ( operationId) { - $uibModalInstance.close({ - serviceId:serviceInstance.serviceInstanceId, - operationId: operationId - }); - } - ServiceTemplateService.scaleService(requestBody, successFun, errorMessage); - - }; - // cancel click - ctrl.cancel = function () { - // $uibModalInstance.close("ok关闭效果"); - $uibModalInstance.dismiss('cancel'); - }; - - } - ]) - .controller('updateServiceCtrl', ['$scope', '$uibModal', '$uibModalInstance', 'ServiceTemplateService', 'customer', 'serviceType','serviceInstance', - function ($scope, $uibModal, $uibModalInstance, ServiceTemplateService, customer, serviceType,serviceInstance) { - var ctrl = this; - console.log(serviceInstance) - var serviceInstanceId = serviceInstance.serviceInstanceId; - ServiceTemplateService.getupdateServiceTemplate(serviceInstanceId,function(template){ - console.log(template); - ServiceTemplateService.getAllServiceTemplates(function (res) { - console.log(res) - var slectTemplates = []; - res.forEach(function(item){ - if(item.id === template.model-version-id && itme.invariantUUID !== template.model-invariant-id){ - slectTemplates.push(item); - } - }) - ctrl.templates = slectTemplates; - }); - }) - - - ctrl.changeInput = function (serviceTemplate) { - var paras = serviceTemplate.inputs.map(function (input) { - return { - name: input.name, - type: input.type, - description: input.description, - defaultValue: input.defaultValue, - isRequired: input.isRequired, - readonly: "" - }; - }); - - var segmentsPara = serviceTemplate.nestedTemplates.map(function (nestedTemplate) { - var nestedParas = nestedTemplate.inputs.map(function (input) { - return { - name: input.name, - type: input.type, - description: input.description, - defaultValue: input.defaultValue, - isRequired: input.isRequired, - readonly: "" - }; - }); - return { - nodeTemplateName: nestedTemplate.name, - customizationUuid:nestedTemplate.customizationUuid, - invariantUUID: nestedTemplate.invariantUUID, - uuid: nestedTemplate.uuid, - type: nestedTemplate.type, - parameters: nestedParas - }; - }); - - var service = { - serviceName: ctrl.service.serviceName, - serviceDescription: ctrl.service.serviceDescription, - parameters: paras, - segments: segmentsPara - }; - ctrl.service = service; - console.log(service); - }; - ctrl.service = { - serviceName: '', - serviceDescription: '', - parameters: [], - segments: [] - }; - ctrl.sdnControllers = []; - ctrl.locations = []; - - ctrl.serviceTemplateChanged = function (template) { - console.log('serviceTemplateChanged invoked... ' + template); - if (template === undefined || template === null) { - ctrl.service = undefined; - ctrl.realTemplate = undefined; - } else { - ServiceTemplateService.getComparedTemplateParameters(serviceInstanceId,template, function (templateRsp) { - ctrl.realTemplate = templateRsp; - ctrl.changeInput(ctrl.realTemplate); - }); - } - }; - - ctrl.ok = function () { - console.log('ok button clicked!'); - console.log('service: '); - console.log(customer); - console.log(serviceType); - console.log(ctrl.service); - console.log(ctrl.realTemplate); - - - var errorMessage = function () { - - }; - var successFun = function (operationId) { - $uibModalInstance.close({ - serviceId: serviceInstanceId, - operationId: operationId - }); - } - ServiceTemplateService.updateService(customer, serviceType,serviceInstanceId, ctrl.service, ctrl.realTemplate, successFun, errorMessage); - }; - // cancel click - ctrl.cancel = function () { - $uibModalInstance.dismiss('cancel'); - }; - - ServiceTemplateService.getAllVimInfo(function (vims) { - ctrl.locations = vims; - }); - - ServiceTemplateService.getAllSdnControllers(function (sdnControllers) { - ctrl.sdnControllers = sdnControllers; - }); - } - ]) - .controller('packageOnboardCtrl', ['$scope', '$uibModalInstance', 'ServiceTemplateService', 'onboardPackage', - function ($scope, $uibModalInstance, ServiceTemplateService, onboardPackage) { - var ctrl = this; - - ServiceTemplateService.getAllVimInfo(function (vims) { - ctrl.packageLocations = vims; - }); - - ctrl.ok = function () { - var proVims = []; - ctrl.packageLocations.forEach(function (location) { - if (location.productenv) { - proVims.push(location.name); - } - }); - ServiceTemplateService.packageOnboard(onboardPackage, { - testenv: ctrl.testenv, - productenv: proVims - }); - $uibModalInstance.close('successfully'); - }; - // cancel click - ctrl.cancel = function () { - $uibModalInstance.dismiss('cancel'); - }; - - } - ]) - .controller('ServiceProgressCtrl', ['$uibModalInstance', 'ServiceTemplateService', 'serviceId', 'operationId', 'operationTitle', '$q', '$interval', - function ($uibModalInstance, ServiceTemplateService, serviceId, operationId, operationTitle, $q, $interval) { - var ctrl = this; - ctrl.title = operationTitle; - ctrl.operation = ''; - ctrl.max = 100; - ctrl.dynamic = 0; - - var timerDeferred = $q.defer(); - var timerPromise = timerDeferred.promise; - - var progressFun = function (serviceProgress) { - if ('finished' === serviceProgress.result || 'error' === serviceProgress.result) { - ctrl.dynamic = 100; - timerDeferred.resolve(); - if ('finished' === serviceProgress.result) { - $uibModalInstance.close(operationTitle + ' finished!'); - } else if ('error' === serviceProgress.result) { - $uibModalInstance.dismiss(operationTitle + ' failed! ' + serviceProgress.reason); - } - console.log('timer finished!'); - } else if ('processing' === serviceProgress.result) { - if(serviceProgress.progress > ctrl.dynamic){ - ctrl.dynamic = serviceProgress.progress; - } - ctrl.operation = serviceProgress.operationContent; - console.log('timer processing ......'); - } - }; - - var timer = $interval(function () { - ServiceTemplateService.queryServiceProgress(serviceId, operationId, progressFun); - }, 5000); - - timerPromise.then(function () { - $interval.cancel(timer); - console.log('timer cancel ---- '); - }, function () { - $interval.cancel(timer); - }); - } - ]) - .controller('VfOnboardProgressCtrl', ['$uibModalInstance', 'ServiceTemplateService', 'jobId', 'operationTitle', '$q', '$interval', - function ($uibModalInstance, ServiceTemplateService, jobId, operationTitle, $q, $interval) { - var ctrl = this; - ctrl.title = operationTitle; - ctrl.operation = ''; - ctrl.max = 100; - ctrl.dynamic = 0; - - var timerDeferred = $q.defer(); - var timerPromise = timerDeferred.promise; - - var responseId = '0'; - var progressFun = function (responseDescriptor) { - if ('finished' === responseDescriptor.status || 'error' === responseDescriptor.status) { - ctrl.dynamic = 100; - timerDeferred.resolve(); - if ('finished' === responseDescriptor.status) { - $uibModalInstance.close(''); - } else if ('error' === responseDescriptor.status) { - $uibModalInstance.dismiss(responseDescriptor.statusDescription); - } - console.log('timer finished!'); - } else if ('processing' === responseDescriptor.status) { - ctrl.dynamic = responseDescriptor.progress; - ctrl.operation = responseDescriptor.statusDescription; - console.log('timer processing ......'); - responseId = responseDescriptor.responseId; - if (responseId === undefined) { - console.log('Cannot get responseId...'); - $uibModalInstance.close(''); - timerDeferred.resolve(); - } - } - }; - - var timer = $interval(function () { - ServiceTemplateService.queryVfOnboardProgress(jobId, responseId, progressFun); - }, 1000); - - timerPromise.then(function () { - $interval.cancel(timer); - console.log('timer cancel ---- '); - }, function () { - $interval.cancel(timer); - }); - } - ]); \ No newline at end of file diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/create-service-dialog.html b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/create-service-dialog.html deleted file mode 100644 index 810fe81f..00000000 --- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/create-service-dialog.html +++ /dev/null @@ -1,132 +0,0 @@ - -
- -
- -
-
- - - -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- - -
- -
- {{segment.nodeTemplateName}} - -
- - -
- -
-
- -
-
- -
-
-
- Service Inputs -
- -
- -
-
- -
-
- -
-
- -
- - - -
-
- -
- - -
diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/lifecyclemanagement.html b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/lifecyclemanagement.html deleted file mode 100644 index 4f50651b..00000000 --- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/lifecyclemanagement.html +++ /dev/null @@ -1,111 +0,0 @@ - -
-
-
{{alert.msg}}
-

Life Cycle Manager

- - - -
- - - - - - - - - - - - - - - - - - - - - - -
Service Instance IdService NameService TypeAction
{{serviceInstance.serviceInstanceId}}{{serviceInstance.serviceInstanceName}}{{serviceInstance.serviceType}} - - - -
-
- - -
- - - - - - - - - - - - - - - - - -
NameTypeVersionAction
{{package.name}}{{package.type}}{{package.version}} - - -
-
- - -
- - - diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/progress-dialog.html b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/progress-dialog.html deleted file mode 100644 index d89fa2be..00000000 --- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/progress-dialog.html +++ /dev/null @@ -1,31 +0,0 @@ - -
- -
- -
-
{{ctrl.operation}}
- {{ctrl.dynamic}}% -
- -
- -
diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/scale-service-dialog.html b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/scale-service-dialog.html deleted file mode 100644 index 19fa8edd..00000000 --- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/scale-service-dialog.html +++ /dev/null @@ -1,84 +0,0 @@ - -
- -
- -
-
-

{{nsdata.netWorkServiceName}}

-
-
- -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
- -
- - -
diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/update-service-dialog.html b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/update-service-dialog.html deleted file mode 100644 index a8a92d45..00000000 --- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/update-service-dialog.html +++ /dev/null @@ -1,132 +0,0 @@ - -
- -
- -
-
- - - -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- - -
- -
- {{segment.nodeTemplateName}} - -
- - -
- -
-
- -
-
- -
-
-
- Service Inputs -
- -
- -
-
- -
-
- -
-
- -
- - - -
-
- -
- - -
diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/vnf-ns-onboard-dialog.html b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/vnf-ns-onboard-dialog.html deleted file mode 100644 index b0ba9faa..00000000 --- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/vnf-ns-onboard-dialog.html +++ /dev/null @@ -1,48 +0,0 @@ - -
- -
- -
-
-
- - - - - - - - - -
VIM NameTest EnvironmentProduct Environment
{{location.name}}
-
-
-
- -
- - -
-- cgit 1.2.3-korg