diff options
Diffstat (limited to 'openo-portal/portal-extsys')
29 files changed, 103 insertions, 66 deletions
diff --git a/openo-portal/portal-extsys/pom.xml b/openo-portal/portal-extsys/pom.xml index 3b6c5e50..9661f7d7 100644 --- a/openo-portal/portal-extsys/pom.xml +++ b/openo-portal/portal-extsys/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2016 [ZTE] and others. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/conf/dataconfig.json b/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/conf/dataconfig.json new file mode 100644 index 00000000..87e36cfd --- /dev/null +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/conf/dataconfig.json @@ -0,0 +1,4 @@ +{
+ "url": "http://localhost",
+ "port": "8080"
+}
\ No newline at end of file diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/js/controller.js b/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/js/controller.js index fa2f88f1..04437df9 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/js/controller.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/js/controller.js @@ -13,6 +13,12 @@ * limitations under the License.
*/
+var url = "";
+$.getJSON("./conf/dataconfig.json", function (jsonData){
+ url = jsonData.url +":"+ jsonData.port;
+ console.log("URL = " + url);
+});
+
$('.siteDeleteImg').click(
function () {
var data = $(this).parent().parent().parent().find('td:last').find(
@@ -29,7 +35,7 @@ $('.siteDeleteImg').click( });
function deleteController(objectId) {
- var requestUrl = "/openoapi/extsys/v1/sdncontrollers/" + objectId;
+ var requestUrl = url + "/openoapi/extsys/v1/sdncontrollers/" + objectId;
$.ajax({
type: "DELETE",
url: requestUrl,
@@ -48,7 +54,7 @@ function deleteController(objectId) { }
function loadControllerData() {
- var requestUrl = "/openoapi/extsys/v1/sdncontrollers";
+ var requestUrl = url + "/openoapi/extsys/v1/sdncontrollers";
$.ajax({
type: "GET",
url: requestUrl,
@@ -148,7 +154,7 @@ $(function () { "topologicalController": jsonobj
};
formData = JSON.stringify(newJson);
- var requestUrl = "/openoapi/extsys/v1/sdncontrollers";
+ var requestUrl = url + "/openoapi/extsys/v1/sdncontrollers";
$.ajax({
type: "POST",
url: requestUrl,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/bootstrap.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/bootstrap.css index dbebe62b..2091ce96 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/bootstrap.css +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/bootstrap.css @@ -1,5 +1,5 @@ /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css index d24a2680..53280d3f 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css @@ -1,5 +1,5 @@ /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css index 680919b2..5c9f677e 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css @@ -1,5 +1,5 @@ /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css index bb79d8e9..0a29b3cf 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css @@ -1,5 +1,5 @@ /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js index bd964684..20f22dab 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties index 70d2225f..bbc33272 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties @@ -1,5 +1,5 @@ #
-# Copyright 2016 [ZTE] and others.
+# Copyright 2016 ZTE Corporation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ ############## vimView.html i18n ##############
com_zte_ums_eco_roc_vim_checking_status=Checking vim status...
-com_zte_ums_eco_roc_vim_name=Display name
+com_zte_ums_eco_roc_vim_name=Name
com_zte_ums_eco_roc_vim_auth_url=Auth URL
com_zte_ums_eco_roc_vim_username=Username
com_zte_ums_eco_roc_vim_password=Password
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties index d2c5e9f3..c12d4eb5 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties @@ -1,5 +1,5 @@ #
-# Copyright 2016 [ZTE] and others.
+# Copyright 2016 ZTE Corporation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js index d7373668..7a477691 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js index 7efebf89..e0be4afc 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js index e62cc106..dacb7dab 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js index 255d39aa..9ceb9f45 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js index dc9f3ad1..4f7a17a8 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
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 dfeb5dd8..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 @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -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/js/vimUtil.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimUtil.js index 5def3101..8be275cd 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimUtil.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimUtil.js @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html index c39cc408..3999983c 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html @@ -1,7 +1,7 @@ <!DOCTYPE html>
<!--
- Copyright 2016 [ZTE] and others.
+ Copyright 2016 ZTE Corporation.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
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 7bc55914..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 @@ -1,7 +1,7 @@ <!DOCTYPE html>
<!--
- Copyright 2016 [ZTE] and others.
+ Copyright 2016 ZTE Corporation.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -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,26 +161,11 @@ <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"
- name_i18n="com_zte_conductor_ui_i18n"></span>
- <span class="" aria-required="" style="visibility: hidden;">*</span>
+ name_i18n="com_zte_conductor_ui_i18n"></span>
</label>
<div class="col-sm-7">
<textarea class="form-control" rows="3" ms-duplex="addVim.description"
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css index b1a752ac..a4162eda 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css @@ -1,5 +1,5 @@ /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css index cd23bc76..ae08f135 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css @@ -1,5 +1,5 @@ /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
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 cea26225..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 @@ -1,5 +1,5 @@ # -# Copyright 2016 [ZTE] and others. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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 e98df6e4..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 @@ -1,5 +1,5 @@ # -# Copyright 2016 [ZTE] and others. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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/commonUtil.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/commonUtil.js index b8be1b7e..fdf3bca0 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/commonUtil.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/commonUtil.js @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js index aed34c3d..2311f6a2 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js index b656d4d8..f42dd93d 100644 --- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js +++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
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 df3166c1..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 @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -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 d4420b30..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 @@ -1,5 +1,5 @@ /*
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -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 c5b7cf3a..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 @@ -1,6 +1,6 @@ <!--
- Copyright 2016 [ZTE] and others.
+ Copyright 2016 ZTE Corporation.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -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>
@@ -146,8 +146,7 @@ </div>
<div class="form-group">
<label class="control-label col-sm-3">
- <span id="nfv-vnfm-iui-text_description" name_i18n="com_zte_nfv_nsoc_i18n"></span>
- <span class="" aria-required="" style="visibility: hidden;">*</span>
+ <span id="nfv-vnfm-iui-text_description" name_i18n="com_zte_nfv_nsoc_i18n"></span>
</label>
<div class="col-sm-7">
<textarea class="form-control" rows="3" ms-duplex="addVnfm.description"
|