diff options
Diffstat (limited to 'openo-portal')
12 files changed, 179 insertions, 135 deletions
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js index 06479d49..96e23a0d 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js @@ -87,6 +87,8 @@ var vm = avalon vimId: "",
vimName: "",
domain: '',
+ domainVisable:true,
+ vimNameModify:false,
userName: "",
tenant: "",
password: "",
@@ -102,10 +104,12 @@ var vm = avalon if (vm.action.ADD == action) {
vm.addVim.vimId = "";
vm.addVim.vimName = "";
+ vm.addVim.vimNameModify=false;
vm.addVim.userName = "";
vm.addVim.password = "";
vm.addVim.url = "";
vm.addVim.domain = "";
+ vm.addVim.domainVisable = true;
vm.addVim.description = "";
vm.addVim.tenant = "";
vm.addVim.vendor = "";
@@ -116,12 +120,14 @@ var vm = avalon } else {
vm.addVim.vimId = el.vimId;
vm.addVim.vimName = el.name;
+ vm.addVim.vimNameModify=true;
vm.addVim.url = el.url;
vm.addVim.description = el.description;
vm.addVim.userName = el.userName;
vm.addVim.password = el.password;
vm.addVim.tenant = el.tenant;
vm.addVim.domain = el.domain;
+ vm.addVim.domainVisable=vm.$getdomainVisable(el.type);
vm.addVim.saveType = "update";
vm.addVim.titleName = $.i18n.prop('com_zte_ums_eco_roc_vim_modify_info');
vm.addVim.vimType = el.type;
@@ -148,16 +154,14 @@ var vm = avalon }
vm.executeWait.visible = true;
vm.executeError.visible = false;
- if (vm.addVim.saveType == "add") {
- /*
- for( var i = 0; i < vm.vimInfo.length; i ++ ){
- if(vm.addVim.url == vm.vimInfo[i].url){
- resUtil.growl($.i18n.prop("com_zte_ums_eco_roc_vim_growl_msg_title") + 'already exists',"info");
- $('#addVimDlg').modal('hide');
- return;
- }
- }
- */
+ if (vm.addVim.saveType == "add") {
+ for( var i = 0; i < vm.vimInfo.length; i ++ ){
+ if(vm.addVim.name == vm.vimInfo[i].name){
+ resUtil.growl($.i18n.prop("com_zte_ums_eco_roc_vim_growl_msg_title") + ' already exists',"info");
+ $('#addVimDlg').modal('hide');
+ return;
+ }
+ }
vm.persistVim();
} else if (vm.addVim.saveType == "update") {
vm.updateVim();
@@ -292,7 +296,20 @@ var vm = avalon },
gotoChartPage: function (oid, name, tenant) {
window.location.href = "vimChart.html?" + oid + "&" + name + "&" + tenant;
+ },
+ $getdomainVisable:function(vimType){
+ if ("openstack"==vimType){
+ return true;
+ }else{
+ return false;
+ }
+
+ },
+ vimTypeRendered:function(){
+ vm.addVim.domainVisable=vm.$getdomainVisable(vm.addVim.vimType);
}
+
+
});
avalon.scan();
vm.$initTable();
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html index 726883ff..28518381 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html @@ -63,7 +63,21 @@ <span class="required" aria-required="true">*</span>
</label>
<div class="col-sm-7">
- <input type="text" ms-duplex="addVim.vimName" name="vimName" class="form-control"/>
+ <input type="text" ms-duplex="addVim.vimName" name="vimName" class="form-control" ms-readonly="addVim.vimNameReadonly"/>
+ <span class="help-block"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-sm-3">
+ <span id_i18n="com_zte_ums_eco_roc_vim_type"
+ name_i18n="com_zte_conductor_ui_i18n"></span>
+ <span class="required" aria-required="true">*</span>
+ </label>
+ <div class="col-sm-7">
+ <select id="vimTypeSelect" ms-each="$vimType.selectItems"
+ ms-duplex="addVim.vimType" data-duplex-changed="vimTypeRendered">
+ <option ms-attr-value='el.cond_value'>{{el.name}}</option>
+ </select>
<span class="help-block"></span>
</div>
</div>
@@ -138,7 +152,7 @@ <span class="help-block"></span>
</div>
</div>
- <div class="form-group">
+ <div class="form-group" ms-visible="addVim.domainVisable">
<label class="control-label col-sm-3">
<span id_i18n="com_zte_ums_eco_roc_vim_domain"
name_i18n="com_zte_conductor_ui_i18n"></span>
@@ -147,21 +161,7 @@ <input type="text" ms-duplex="addVim.domain" name="domain" class="form-control"/>
<span class="help-block"></span>
</div>
- </div>
- <div class="form-group">
- <label class="control-label col-sm-3">
- <span id_i18n="com_zte_ums_eco_roc_vim_type"
- name_i18n="com_zte_conductor_ui_i18n"></span>
- <span class="required" aria-required="true">*</span>
- </label>
- <div class="col-sm-7">
- <select id="vimTypeSelect" ms-each="$vimType.selectItems"
- ms-duplex="addVim.vimType">
- <option ms-attr-value='el.cond_value'>{{el.name}}</option>
- </select>
- <span class="help-block"></span>
- </div>
- </div>
+ </div>
<div class="form-group">
<label class="control-label col-sm-3">
<span id_i18n="com_zte_ums_eco_roc_vim_description"
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties index 4690e7c3..a53d1bd9 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties @@ -20,6 +20,7 @@ nfv-vnfm-iui-message-title=vnfm info nfv-vnfm-iui-message-query-fail=Query vnfm failed. nfv-vnfm-iui-message-save-success=Save successfully. nfv-vnfm-iui-message-save-fail=Save failed. +nfv-vnfm-iui-message-vnfm-already-exists=vnfm already exists. nfv-vnfm-iui-message-update-success=Update successfully. nfv-vnfm-iui-message-update-fail=Update failed. nfv-vnfm-iui-message-delete-confirm=Do you want to delete the current vnfm? diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties index 29bfa7f8..8384a0b3 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties @@ -20,6 +20,7 @@ nfv-vnfm-iui-message-title=vnfm信息 nfv-vnfm-iui-message-query-fail=查询vnfm失败。 nfv-vnfm-iui-message-save-success=保存成功。 nfv-vnfm-iui-message-save-fail=保存失败。 +nfv-vnfm-iui-message-vnfm-already-exists=vnfm 已经存在 nfv-vnfm-iui-message-update-success=修改成功。 nfv-vnfm-iui-message-update-fail=修改失败。 nfv-vnfm-iui-message-delete-confirm=确定删除所选vnfm信息？ diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js index 0fc15bf3..ed5d74f8 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js @@ -42,6 +42,7 @@ var vm = avalon $htmlText: {
saveSuccess: $.i18n.prop("nfv-vnfm-iui-message-save-success"),
saveFail: $.i18n.prop("nfv-vnfm-iui-message-save-fail"),
+ alreadyExist: $.i18n.prop("nfv-vnfm-iui-message-vnfm-already-exists"),
updateSuccess: $.i18n.prop("nfv-vnfm-iui-message-update-success"),
updateFail: $.i18n.prop("nfv-vnfm-iui-message-update-fail")
},
@@ -99,7 +100,7 @@ var vm = avalon name: "",
type: "",
//moc : "",
- //mocDisabled : false,
+ nameReadonly : false,
vimId: "",
//vimVisiable : false,
vendor: "",
@@ -119,7 +120,7 @@ var vm = avalon vm.addVnfm.name = "";
vm.addVnfm.type = "";
//vm.addVnfm.moc = "";
- //vm.addVnfm.mocDisabled = false;
+ vm.addVnfm.nameReadonly = false;
vm.addVnfm.vimId = "";
//vm.addVnfm.vimVisiable = false;
vm.addVnfm.vendor = "";
@@ -177,7 +178,15 @@ var vm = avalon password: vm.addVnfm.password
}
//save VIM info
- if (vm.addVnfm.saveType == "add") {
+ if (vm.addVnfm.saveType == "add") {
+ // for( var i = 0; i < vm.vnfmInfo.length; i ++ ){
+ // if(vm.addVnfm.name == vm.vnfmInfo[i].name){
+ // vm.server_rtn.warning_block = true;
+ // vm.server_rtn.rtn_info = vm.$htmlText.alreadyExist;
+ // commonUtil.showMessage(vm.$htmlText.alreadyExist, "failed");
+ // return;
+ // }
+ // }
$.ajax({
type: "POST",
url: vm.$restUrl.addVnfmInfoUrl,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js index 2e5b5c6f..3438717b 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js @@ -55,6 +55,7 @@ vnfmUtil.updateVnfm = function (data) { vm.addVnfm.type = data.type;
vm.addVnfm.vimId = data.vimId;
vm.addVnfm.url = data.url;
+ vm.addVnfm.nameReadonly=true;
vm.addVnfm.userName = data.userName;
vm.addVnfm.password = data.password;
vm.addVnfm.saveType = "update";
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html index a4bd1d7e..0f034d78 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html @@ -56,7 +56,7 @@ <span class="required" aria-required="true">*</span>
</label>
<div class="col-sm-7">
- <input type="text" ms-duplex="addVnfm.name" name="name" class="form-control"/>
+ <input type="text" ms-duplex="addVnfm.name" name="name" class="form-control" ms-readonly="addVnfm.nameReadonly"/>
<span class="help-block"></span>
</div>
</div>
diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html index b373f3ae..4fabdaf7 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html @@ -96,10 +96,17 @@ function hideBasic() {
$("#basicInfoTab").hide();
+ initParameterTab();
+ $("#templateParameterTab").show();
}
function showBasic() {
$("#basicInfoTab").show();
+ $("#templateParameterTab").hide();
+ }
+
+ function serviceTemplateChanged() {
+ templateParameters.changed = true;
}
function showTopoCont() {
@@ -484,7 +491,7 @@ <span class="required">*</span>
</label>
<div class="col-sm-7">
- <input type="text" id="" name="" class="form-control"
+ <input type="text" id="svcDesc" name="" class="form-control"
placeholder="Service Description" maxlength="256"/>
</div>
</div>
@@ -497,7 +504,7 @@ </label>
<div class="col-sm-7">
<select class="form-control" style="padding-top: 0px;padding-bottom: 0px;"
- id="svcTempl" name="svcTempl">
+ id="svcTempl" name="svcTempl" onchange="serviceTemplateChanged();">
<option value="select">--select--</option>
<option value="1.1">1.1</option>
<option value="1.2">1.2</option>
@@ -506,6 +513,10 @@ </div>
</div>
+ <div id="templateParameterTab">
+
+ </div>
+
</div>
<div class="modal-footer">
<button type="button" style="width:80px;" class="btn SDBtn" data-dismiss="modal"
diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js index 42a5aa7f..fbab0100 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js @@ -14,31 +14,31 @@ * limitations under the License. */ var templateParameters = { - templateName: '', + changed: true, parameters: [] }; -var service_instance_insert_index = 0; - var lcmHandler = function () { this._addOwnEvents(); }; lcmHandler.prototype = { _addOwnEvents: function () { - $('a[data-toggle="tab"]').on('show.bs.tab', this.beforeParameterTabShow); $('#createNS').click(this.okAction); }, - beforeParameterTabShow: function (event) { - renderTemplateParametersTab(); - }, - okAction: function (event) { + okAction: function () { + var vimLocation = $('#vim_location').val(); + if(vimLocation == undefined || vimLocation == 'select') { + alert('Location must be selected in Template Parameters'); + return; + } + var serviceInstance = { - serviceTemplateId: $('#svcTempl').val(), + serviceTemplateId: $("#svcTempl").val(), serviceName: $('#svcName').val(), - serviceDescription: $('#svcDesc').val(), - serviceParameters: collectServiceParameters(templateParameters.parameters), - vimLocation: $('#vim_location').val() + description: $('#svcDesc').val(), + inputParameters: collectServiceParameters(templateParameters.parameters), + vimLocation: vimLocation }; var gatewayService = 'http://localhost:8080/openoapi/servicegateway/v1/services'; $.when( @@ -46,6 +46,7 @@ lcmHandler.prototype = { ).then( function(template) { serviceInstance.templateName = template.name; + serviceInstance.serviceType = template.serviceType; return createNetworkServiceInstance(template, serviceInstance, gatewayService); } ).then( @@ -57,17 +58,23 @@ lcmHandler.prototype = { } }; -function renderTemplateParametersTab() { +function initParameterTab() { + if (!templateParameters.changed) { + return; + } + var svcTempl = $("#svcTempl").val(); + if ('select' === svcTempl) { + document.getElementById("templateParameterTab").innerHTML = ''; + return; + } $.when( fetchTemplateParameterDefinitions(templateParameters), fetchVimInfo() - ).then(function(templateParameterResponse, vimsInfoResponse) { + ).then(function (templateParameterResponse, vimsInfoResponse) { templateParameters = translateToTemplateParameters(templateParameterResponse[0].inputs); var vims = translateToVimInfo(vimsInfoResponse[0]); - var components = transfromToComponents(templateParameters.parameters, vims); - - //TODO need to address the issue of the dynamic loading of parameter tab,,, - // document.getElementById("parameterTab").innerHTML = components; + var components = transformToComponents(templateParameters.parameters, vims); + document.getElementById("templateParameterTab").innerHTML = components; }); } @@ -102,7 +109,7 @@ function translateToTemplateParameters(inputs) { value: inputs[i].defaultValue }; } - return {name: $("#svcTempl").val(), parameters: inputParameters}; + return {changed: false, parameters: inputParameters}; } function translateToVimInfo(vims) { @@ -118,11 +125,11 @@ function translateToVimInfo(vims) { return result; } -function transfromToComponents(parameters, vims) { +function transformToComponents(parameters, vims) { var components = ''; var i; for (i = 0; i < parameters.length; i += 1) { - var component = '<div class="form-group">' + + var component = '<div class="mT15 form-group" style="margin-left:25px;">' + '<label class="col-sm-3 control-label">' + '<span>' + parameters[i].description + '</span>' + generateRequiredLabel(parameters[i]) + '</label>' + @@ -145,7 +152,7 @@ function generateRequiredLabel(parameter) { } function generateLocationComponent(vims) { - var component = '<div class="form-group">' + + var component = '<div class="form-group" style="margin-left:25px;margin-bottom:15px;">' + '<label class="col-sm-3 control-label">' + '<span>Location</span>' + '<span class="required">*</span>' + @@ -159,7 +166,7 @@ function generateLocationComponent(vims) { } function transformToOptions(vims) { - var options = ''; + var options = '<option value="select">--select--</option>'; var i; for (i = 0; i < vims.length; i += 1) { var option = '<option value="' + vims[i].vimId + '">' + vims[i].vimName + '</option>'; @@ -191,7 +198,13 @@ function fetchServiceTemplateBy(templateId) { } ).then( function(response) { - template.csarType = response.type; + if(response.type === 'GSAR') { + template.serviceType = 'GSO'; + } else if(response.type === 'NSAR' || response.type === 'NFAR') { + template.serviceType = 'NFVO'; + } else if(response.type === 'SSAR') { + template.serviceType = "SDNO"; + } defer.resolve(template) } ); @@ -199,27 +212,27 @@ function fetchServiceTemplateBy(templateId) { } function createNetworkServiceInstance(template, serviceInstance, gatewayService) { - if (template.csarType === 'GSAR') { + if (template.serviceType === 'GSO') { return createGsoServiceInstance(gatewayService, serviceInstance, template); - } else if (template.csarType === 'NSAR' || template.csarType === 'NFAR') { + } else if (template.serviceType === 'NFVO') { return createNfvoServiceInstance(gatewayService, serviceInstance); - } else if (template.csarType === 'SSAR') { + } else if (template.serviceType === 'SDNO') { return createSdnoServiceInstance(gatewayService, serviceInstance); } } function createGsoServiceInstance(gatewayService, serviceInstance, serviceTemplate) { var defer = $.Deferred(); - serviceInstance.serviceParameters.location = serviceInstance.vimLocation; + serviceInstance.inputParameters.location = serviceInstance.vimLocation; var gsoLcmUri = '/openoapi/lifecyclemgr/v1/services'; var parameter = { 'name': serviceInstance.serviceName, - 'description': serviceInstance.serviceDescription, + 'description': serviceInstance.description, 'serviceDefId': serviceTemplate.gsarId, 'templatedId': serviceInstance.serviceTemplateId, 'templateName': serviceTemplate.templateName, 'getewayUri': gsoLcmUri, - 'parameters': serviceInstance.serviceParameters + 'parameters': serviceInstance.inputParameters }; $.when($.ajax({ type: "POST", @@ -228,21 +241,21 @@ function createGsoServiceInstance(gatewayService, serviceInstance, serviceTempla dataType: "json", data: JSON.stringify(parameter) })).then(function(response) { - serviceInstance.serviceInstanceId = response.serviceId; + serviceInstance.serviceId = response.serviceId; defer.resolve(serviceInstance); - }) + }); return defer; } function createNfvoServiceInstance(gatewayService, serviceInstance) { - var nfvoLcmNsUrl = '/openoapi/nslcm/v1.0/ns'; - serviceInstance.serviceParameters.location = serviceInstance.vimLocation; - return createServiceInstance(gatewayService, nfvoLcmNsUrl, serviceInstance); + var nfvoLcmNsUri = '/openoapi/nslcm/v1.0/ns'; + serviceInstance.inputParameters.location = serviceInstance.vimLocation; + return createServiceInstance(gatewayService, nfvoLcmNsUri, serviceInstance); } function createSdnoServiceInstance(gatewayService, serviceInstance) { - var sdnoLcmNsUrl = '/openoapi/sdnonslcm/v1.0/ns'; - return createServiceInstance(gatewayService, sdnoLcmNsUrl, serviceInstance); + var sdnoLcmNsUri = '/openoapi/sdnonslcm/v1.0/ns'; + return createServiceInstance(gatewayService, sdnoLcmNsUri, serviceInstance); } function createServiceInstance(gatewayService, nsUri, serviceInstance) { @@ -250,7 +263,7 @@ function createServiceInstance(gatewayService, nsUri, serviceInstance) { var sParameter = { 'nsdId': serviceInstance.serviceTemplateId, 'nsName': serviceInstance.serviceName, - 'description': serviceInstance.serviceDescription, + 'description': serviceInstance.description, 'gatewayUri': nsUri }; $.when($.ajax({ @@ -260,12 +273,13 @@ function createServiceInstance(gatewayService, nsUri, serviceInstance) { dataType: "json", data: JSON.stringify(sParameter) })).then(function(response) { - var nsInstanceId = response[0].nsInstanceId; - var initNsUrl = nsUri + '/' + nsInstanceId + '/Instantiate' + var nsInstanceId = response.nsInstanceId; + serviceInstance.serviceId = nsInstanceId; + var initNsUrl = nsUri + '/' + nsInstanceId + '/Instantiate'; var parameter = { 'gatewayUri': initNsUrl, 'nsInstanceId': nsInstanceId, - 'additionalParamForNs': serviceInstance.serviceParameters + 'additionalParamForNs': serviceInstance.inputParameters }; return $.ajax({ type: "POST", @@ -274,7 +288,7 @@ function createServiceInstance(gatewayService, nsUri, serviceInstance) { dataType: "json", data: JSON.stringify(parameter) }); - }).then(function(response) { + }).then(function() { defer.resolve(serviceInstance); }); return defer; @@ -291,21 +305,8 @@ function collectServiceParameters(parameters) { } function updateTable(serviceInstance) { - appendOenRow(serviceInstance); - addDeleteEventRegistration(); -} - -function appendOenRow(serviceInstance) { - var index = service_instance_insert_index; - var creator = ''; - $('#sai').append('<tr id="service_instance_' + index + '"></tr>'); - $("#service_instance_" + index).html('<td><div class="DataTables_sort_wrapper openo-ellipsis "><span id="service_name" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">' + serviceInstance.serviceName + '</span></td>' + - '<td><span class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">' + serviceInstance.templateName + '</span></td>' + - '<td class="service_template_id"><span class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">' + serviceInstance.serviceTemplateId + '</span><input type="hidden" value="' + serviceInstance.serviceInstanceId + '"/></td>' + - '<td><span class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">' + formatDate(new Date()) + '</span></td>' + - '<td><span class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">' + creator + '</span></td>' + - '<td><button class="data_delete_action"><img id="delete_action" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element " src="images/delete.png"></img></button></td>'); - service_instance_insert_index += 1; + serviceInstance.createTime = formatDate(new Date()); + $('#sai').bootstrapTable("append", serviceInstance); } function formatDate(date) { @@ -318,64 +319,47 @@ function formatDate(date) { return year + "-" + month + "-" + day + " " + hh + ":" + mm + ":" + ss; } -function addDeleteEventRegistration() { - $(".data_delete_action").click(function (event) { - var trElement = $(this).parents("tr")[0]; - var tdElement = $(trElement).children("td.service_template_id")[0]; - var spanElement = $(tdElement).children("span")[0]; - var templateId = $(spanElement).text(); - var inputElement = $(tdElement).children("input")[0]; - var instanceId = $(inputElement).val(); - - var gatewayService = 'http://localhost:8080/openoapi/servicegateway/v1/services'; - $.when( - fetchServiceTemplateBy(templateId) - ).then( - function(template) { - if (template.csarType === 'GSAR') { - return deleteGsoServiceInstance(gatewayService, instanceId); - } else if (template.csarType === 'NSAR' || serviceTemplate.csarType === 'NFAR') { - var nfvoNsUri = '/openoapi/nslcm/v1.0/ns'; - return deleteServiceInstance(gatewayService, nfvoNsUri, instanceId); - } else if (template.csarType === 'SSAR') { - var sdnoNsUri = '/openoapi/sdnonslcm/v1.0/ns'; - return deleteServiceInstance(gatewayService, sdnoNsUri, instanceId); - } - } - ).then( - function() { - trElement.remove(); - } - ); - }); +function deleteNe(rowId, row) { + var instanceId = row.serviceId; + var serviceType = row.serviceType; + var gatewayService = 'http://localhost:8080/openoapi/servicegateway/v1/services'; + var remove = function () { + $('#sai').bootstrapTable('remove', {field: 'serviceId', values: [instanceId]}); + }; + if(serviceType === 'GSO') { + deleteGsoServiceInstance(gatewayService, instanceId, remove) + } else if (serviceType === 'NFVO') { + var nfvoNsUri = '/openoapi/nslcm/v1.0/ns'; + deleteNonGsoServiceInstance(gatewayService, nfvoNsUri, instanceId, remove); + } else if (serviceType === 'SDNO') { + var sdnoNsUri = '/openoapi/sdnonslcm/v1.0/ns'; + deleteNonGsoServiceInstance(gatewayService, sdnoNsUri, instanceId, remove); + } } -function deleteGsoServiceInstance(gatewayService, instanceId) { - var defer = $.Deferred(); +function deleteGsoServiceInstance(gatewayService, instanceId, remove) { var gsoLcmUri = '/openoapi/lifecyclemgr/v1/services'; $.when( - deleteNetworkServiceInstance(gatewayService, gsoLcmUri, instanceId); + deleteNetworkServiceInstance(gatewayService, gsoLcmUri, instanceId) ).then( - function(response) { - defer.resolve(); - }); - return defer; + function() { + remove(); + } + ); } -function deleteServiceInstance(gatewayService, nsUri, instanceId) { - var defer = $.Deferred(); +function deleteNonGsoServiceInstance(gatewayService, nsUri, instanceId, remove) { $.when( terminateNetworkServiceInstance(gatewayService, nsUri, instanceId) ).then( - function(response) { + function() { return deleteNetworkServiceInstance(gatewayService, nsUri, instanceId); } ).then( - function(response) { - defer.resolve(); + function() { + remove(); } ) - return defer; } function deleteNetworkServiceInstance(gatewayService, nsUri, instanceId) { diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/tmNodesController.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/tmNodesController.js index 78a3d4c2..6f1235a6 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/tmNodesController.js +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/tmNodesController.js @@ -18,7 +18,7 @@ var vm = avalon.define({ $id: "tmNodesController", instanceId: "", $language: { - "sProcessing": "<img src='../component/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span> " + "sProcessing": "<img src='../common/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span> " + $.i18n.prop("nfv-nso-iui-table-sProcess") + "</span>", "sLengthMenu": $.i18n.prop("nfv-nso-iui-table-sLengthMenu"), "sZeroRecords": $.i18n.prop("nfv-nso-iui-table-sZeroRecords"), diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/tmTopoController.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/tmTopoController.js index 80a65054..87d416bb 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/tmTopoController.js +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/tmTopoController.js @@ -19,7 +19,7 @@ var vm = avalon.define({ templateId: "", nodesData: [], $language: { - "sProcessing": "<img src='../component/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span> " + "sProcessing": "<img src='../common/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span> " + $.i18n.prop("nfv-nso-iui-table-sProcess") + "</span>", "sLengthMenu": $.i18n.prop("nfv-nso-iui-table-sLengthMenu"), "sZeroRecords": $.i18n.prop("nfv-nso-iui-table-sZeroRecords"), diff --git a/openo-portal/portal-package/pom.xml b/openo-portal/portal-package/pom.xml index e93419e9..a1a45ee9 100644 --- a/openo-portal/portal-package/pom.xml +++ b/openo-portal/portal-package/pom.xml @@ -101,6 +101,26 @@ </overlays> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>zip</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks name="${project.artifactId}"> + <zip destfile="target/openo-portal-${project.version}.zip" update="true"> + <zipfileset dir="target" includes="*.war"/> + </zip> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </project> |