Modify the UI of Vim and vnfm manager

Change-Id: I80ba1645a45775e10bb62840b532eea988904cee
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>

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 06479d4..96e23a0 100644 (file)
--- 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: "",\r
             vimName: "",\r
             domain: '',\r
+            domainVisable:true,\r
+            vimNameModify:false,\r
             userName: "",\r
             tenant: "",\r
             password: "",\r
@@ -102,10 +104,12 @@ var vm = avalon
             if (vm.action.ADD == action) {\r
                 vm.addVim.vimId = "";\r
                 vm.addVim.vimName = "";\r
+                vm.addVim.vimNameModify=false;\r
                 vm.addVim.userName = "";\r
                 vm.addVim.password = "";\r
                 vm.addVim.url = "";\r
                 vm.addVim.domain = "";\r
+                vm.addVim.domainVisable = true;\r
                 vm.addVim.description = "";\r
                 vm.addVim.tenant = "";\r
                 vm.addVim.vendor = "";\r
@@ -116,12 +120,14 @@ var vm = avalon
             } else {\r
                 vm.addVim.vimId = el.vimId;\r
                 vm.addVim.vimName = el.name;\r
+                vm.addVim.vimNameModify=true;\r
                 vm.addVim.url = el.url;\r
                 vm.addVim.description = el.description;\r
                 vm.addVim.userName = el.userName;\r
                 vm.addVim.password = el.password;\r
                 vm.addVim.tenant = el.tenant;\r
                 vm.addVim.domain = el.domain;\r
+                vm.addVim.domainVisable=vm.$getdomainVisable(el.type);\r
                 vm.addVim.saveType = "update";\r
                 vm.addVim.titleName = $.i18n.prop('com_zte_ums_eco_roc_vim_modify_info');\r
                 vm.addVim.vimType = el.type;\r
@@ -148,16 +154,14 @@ var vm = avalon
             }\r
             vm.executeWait.visible = true;\r
             vm.executeError.visible = false;\r
-            if (vm.addVim.saveType == "add") {               \r
-                /*\r
-                 for( var i = 0; i < vm.vimInfo.length; i ++ ){\r
-                 if(vm.addVim.url == vm.vimInfo[i].url){\r
-                 resUtil.growl($.i18n.prop("com_zte_ums_eco_roc_vim_growl_msg_title") +  'already exists',"info");\r
-                 $('#addVimDlg').modal('hide');\r
-                 return;\r
-                 }\r
-                 }\r
-                 */\r
+            if (vm.addVim.saveType == "add") { \r
+                for( var i = 0; i < vm.vimInfo.length; i ++ ){\r
+                    if(vm.addVim.name == vm.vimInfo[i].name){\r
+                       resUtil.growl($.i18n.prop("com_zte_ums_eco_roc_vim_growl_msg_title") +  ' already exists',"info");\r
+                       $('#addVimDlg').modal('hide');\r
+                        return;\r
+                    }\r
+                }                 \r
                 vm.persistVim();\r
             } else if (vm.addVim.saveType == "update") {\r
                 vm.updateVim();\r
@@ -292,7 +296,20 @@ var vm = avalon
         },\r
         gotoChartPage: function (oid, name, tenant) {\r
             window.location.href = "vimChart.html?" + oid + "&" + name + "&" + tenant;\r
+        },\r
+        $getdomainVisable:function(vimType){\r
+            if ("openstack"==vimType){\r
+                return true;           \r
+             }else{\r
+                return false;\r
+             }\r
+\r
+        },\r
+        vimTypeRendered:function(){\r
+            vm.addVim.domainVisable=vm.$getdomainVisable(vm.addVim.vimType);\r
         }\r
+\r
+\r
     });\r
 avalon.scan();\r
 vm.$initTable();\r

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 726883f..2851838 100644 (file)
--- 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>\r
                                 </label>\r
                                 <div class="col-sm-7">\r
-                                    <input type="text" ms-duplex="addVim.vimName" name="vimName" class="form-control"/>\r
+                                    <input type="text" ms-duplex="addVim.vimName" name="vimName" class="form-control" ms-readonly="addVim.vimNameReadonly"/>\r
+                                    <span class="help-block"></span>\r
+                                </div>\r
+                            </div>\r
+                            <div class="form-group">\r
+                                <label class="control-label col-sm-3">\r
+                                    <span id_i18n="com_zte_ums_eco_roc_vim_type"\r
+                                          name_i18n="com_zte_conductor_ui_i18n"></span>\r
+                                    <span class="required" aria-required="true">*</span>\r
+                                </label>\r
+                                <div class="col-sm-7">\r
+                                    <select id="vimTypeSelect" ms-each="$vimType.selectItems"\r
+                                            ms-duplex="addVim.vimType" data-duplex-changed="vimTypeRendered">\r
+                                        <option ms-attr-value='el.cond_value'>{{el.name}}</option>\r
+                                    </select>\r
                                     <span class="help-block"></span>\r
                                 </div>\r
                             </div>\r
@@ -138,7 +152,7 @@
                                     <span class="help-block"></span>\r
                                 </div>\r
                             </div>\r
-                            <div class="form-group">\r
+                            <div class="form-group" ms-visible="addVim.domainVisable">\r
                                 <label class="control-label col-sm-3">\r
                                     <span id_i18n="com_zte_ums_eco_roc_vim_domain"\r
                                           name_i18n="com_zte_conductor_ui_i18n"></span>\r
@@ -147,21 +161,7 @@
                                     <input type="text" ms-duplex="addVim.domain" name="domain" class="form-control"/>\r
                                     <span class="help-block"></span>\r
                                 </div>\r
-                            </div>\r
-                            <div class="form-group">\r
-                                <label class="control-label col-sm-3">\r
-                                    <span id_i18n="com_zte_ums_eco_roc_vim_type"\r
-                                          name_i18n="com_zte_conductor_ui_i18n"></span>\r
-                                    <span class="required" aria-required="true">*</span>\r
-                                </label>\r
-                                <div class="col-sm-7">\r
-                                    <select id="vimTypeSelect" ms-each="$vimType.selectItems"\r
-                                            ms-duplex="addVim.vimType">\r
-                                        <option ms-attr-value='el.cond_value'>{{el.name}}</option>\r
-                                    </select>\r
-                                    <span class="help-block"></span>\r
-                                </div>\r
-                            </div>\r
+                            </div>                           \r
                             <div class="form-group">\r
                                 <label class="control-label col-sm-3">\r
                                     <span id_i18n="com_zte_ums_eco_roc_vim_description"\r

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 4690e7c..a53d1bd 100644 (file)
--- 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 29bfa7f..8384a0b 100644 (file)
--- 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 0fc15bf..ed5d74f 100644 (file)
--- 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: {\r
             saveSuccess: $.i18n.prop("nfv-vnfm-iui-message-save-success"),\r
             saveFail: $.i18n.prop("nfv-vnfm-iui-message-save-fail"),\r
+            alreadyExist: $.i18n.prop("nfv-vnfm-iui-message-vnfm-already-exists"),\r
             updateSuccess: $.i18n.prop("nfv-vnfm-iui-message-update-success"),\r
             updateFail: $.i18n.prop("nfv-vnfm-iui-message-update-fail")\r
         },\r
@@ -99,7 +100,7 @@ var vm = avalon
             name: "",\r
             type: "",\r
             //moc : "",\r
-            //mocDisabled : false,\r
+            nameReadonly : false,\r
             vimId: "",\r
             //vimVisiable : false,\r
             vendor: "",\r
@@ -119,7 +120,7 @@ var vm = avalon
             vm.addVnfm.name = "";\r
             vm.addVnfm.type = "";\r
             //vm.addVnfm.moc = "";\r
-            //vm.addVnfm.mocDisabled = false;\r
+            vm.addVnfm.nameReadonly = false;\r
             vm.addVnfm.vimId = "";\r
             //vm.addVnfm.vimVisiable = false;\r
             vm.addVnfm.vendor = "";\r
@@ -177,7 +178,15 @@ var vm = avalon
                 password: vm.addVnfm.password\r
             }\r
             //save VIM info\r
-            if (vm.addVnfm.saveType == "add") {\r
+            if (vm.addVnfm.saveType == "add") {  \r
+                //      for( var i = 0; i < vm.vnfmInfo.length; i ++ ){\r
+                //     if(vm.addVnfm.name == vm.vnfmInfo[i].name){                       \r
+                //        vm.server_rtn.warning_block = true;\r
+                //        vm.server_rtn.rtn_info = vm.$htmlText.alreadyExist;\r
+                //        commonUtil.showMessage(vm.$htmlText.alreadyExist, "failed");\r
+                //        return;\r
+                //     }\r
+                // }     \r
                 $.ajax({\r
                     type: "POST",\r
                     url: vm.$restUrl.addVnfmInfoUrl,\r

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 2e5b5c6..3438717 100644 (file)
--- 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;\r
     vm.addVnfm.vimId = data.vimId;\r
     vm.addVnfm.url = data.url;\r
+    vm.addVnfm.nameReadonly=true;\r
     vm.addVnfm.userName = data.userName;\r
     vm.addVnfm.password = data.password;\r
     vm.addVnfm.saveType = "update";\r

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 a4bd1d7..0f034d7 100644 (file)
--- 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>\r
                                 </label>\r
                                 <div class="col-sm-7">\r
-                                    <input type="text" ms-duplex="addVnfm.name" name="name" class="form-control"/>\r
+                                    <input type="text" ms-duplex="addVnfm.name" name="name" class="form-control" ms-readonly="addVnfm.nameReadonly"/>\r
                                     <span class="help-block"></span>\r
                                 </div>\r
                             </div>\r