Remove Chinese comment, modify pom.
authornancylizi <li.zi30@zte.com.cn>
Mon, 26 Sep 2016 11:09:59 +0000 (19:09 +0800)
committernancylizi <li.zi30@zte.com.cn>
Mon, 26 Sep 2016 11:09:59 +0000 (19:09 +0800)
Issue-id:TOSCA-80

Change-Id: I9aae2d4ef98b69b2ff986ef8034fdf604bc3e08d
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
14 files changed:
openo-portal/pom.xml
openo-portal/portal-catalog/pom.xml
openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
openo-portal/portal-catalog/src/main/webapp/catalog/css/hostMirror.css
openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css
openo-portal/portal-catalog/src/main/webapp/catalog/css/software.css
openo-portal/portal-catalog/src/main/webapp/catalog/css/template.css
openo-portal/portal-catalog/src/main/webapp/catalog/css/templateDetail.css
openo-portal/portal-catalog/src/main/webapp/catalog/css/virtualApplication.css
openo-portal/portal-catalog/src/main/webapp/catalog/css/vnfm.css
openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
openo-portal/portal-catalog/src/main/webapp/catalog/js/component/serverPageTable.js
openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js
openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js

index 75007e3..2cbc32f 100644 (file)
@@ -35,5 +35,6 @@
       <module>portal-extsys</module>
       <module>portal-auth</module>
       <module>portal-lifecyclemgr</module>
+      <module>portal-catalog</module>
     </modules>
 </project>
index 6a647b0..9c6d7da 100644 (file)
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.openo.gso.gui</groupId>
         <artifactId>openo-portal</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
+       
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>portal-catalog</artifactId>
-    <packaging>pom</packaging>
+       <version>1.0.0-SNAPSHOT</version>
+       <packaging>war</packaging>
+       
+       <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
index 36f944b..aabbaa0 100644 (file)
     <script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>\r
 \r
        <script type="text/javascript" src="../common/thirdparty/cometd/cometd.js"></script>\r
-       <script type="text/javascript" src="../common/thirdparty/cometd/jquery.cometd.js"></script>\r
        <script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/../common/thirdparty/jquery.ui.widget.js"></script>\r
     <script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/js/jquery.iframe-transport.js"></script>\r
     <script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/js/jquery.fileupload.js"></script>\r
index a63d3bc..eee3d1b 100644 (file)
@@ -306,7 +306,7 @@ div.separator-line {
        margin-bottom: 10px\r
 }\r
 \r
-/*增加daterangepicker的css*/\r
+/*increase daterangepicker's css*/\r
 input[name="daterange"] {\r
        width: 220px;\r
        line-height: 0;\r
index 94ea2e9..73bc6f4 100644 (file)
@@ -293,7 +293,7 @@ div.separator-line {
        margin-bottom: 10px\r
 }\r
 \r
-/*����daterangepicker��css*/\r
+/*daterangepicker css*/\r
 input[name="daterange"] {\r
        width: 220px;\r
        line-height: 0;\r
index 2068df9..6648b45 100644 (file)
@@ -306,7 +306,7 @@ div.separator-line {
        margin-bottom: 10px
 }
 
-/*增加daterangepicker的css*/
+/*increase daterangepicker's css*/
 input[name="daterange"] {
        width: 220px;
        line-height: 0;
index 09b6ae6..25bf17d 100644 (file)
@@ -310,7 +310,7 @@ div.separator-line {
        margin-bottom: 10px
 }
 
-/*����daterangepicker��css*/
+/*increase daterangepicker's css*/
 input[name="daterange"] {
        width: 220px;
        line-height: 0;
index 7314f5d..9503500 100644 (file)
@@ -310,7 +310,7 @@ div.separator-line {
        margin-bottom: 10px\r
 }\r
 \r
-/*����daterangepicker��css*/\r
+/*increase daterangepicker's css*/\r
 input[name="daterange"] {\r
        width: 220px;\r
        line-height: 0;\r
index 3ec0681..99eafbb 100644 (file)
@@ -297,7 +297,7 @@ div.separator-line {
        margin-bottom: 10px\r
 }\r
 \r
-/*����daterangepicker��css*/\r
+/*increase daterangepicker's css*/\r
 input[name="daterange"] {\r
        width: 220px;\r
        line-height: 0;\r
@@ -452,7 +452,6 @@ td .icheckbox_square-aero {
        margin-right: 0;\r
 }\r
 \r
-/*卡片面板样式*/\r
 .hpanel {\r
        background-color: none;\r
        border: none;\r
index 66348da..1dac48f 100644 (file)
@@ -302,7 +302,7 @@ div.separator-line {
        margin-bottom: 10px
 }
 
-/*增加daterangepicker的css*/
+/*increase daterangepicker's css*/
 input[name="daterange"] {
        width: 220px;
        line-height: 0;
@@ -408,7 +408,6 @@ input.pagination-panel-input {
 }
 
 
-/*卡片面板样式*/
 .animated-panel {
   -webkit-animation-duration: .5s;
   animation-duration: .5s;
index 1e33352..86d82ce 100644 (file)
@@ -14,7 +14,7 @@
 # limitations under the License.\r
 #\r
 \r
-//表格相关\r
+//table\r
 nfv-nso-iui-table-sLengthMenu=每页 _MENU_ 条结果\r
 nfv-nso-iui-table-sZeroRecords=没有匹配结果\r
 nfv-nso-iui-table-sInfo=总共找到 _TOTAL_ 条结果\r
@@ -31,7 +31,7 @@ nfv-nso-iui-table-sProcess=处理中...
 //common\r
 nfv-nso-iui-common-tip=提示: \r
 \r
-//包管理表格字段名称定义\r
+//package table colums\r
 nfv-package-iui-title=包管理\r
 nfv-package-iui-field-sn=序号\r
 nfv-package-iui-field-name=名称\r
@@ -43,7 +43,7 @@ nfv-package-iui-field-onboardstate=上载状态
 nfv-package-iui-field-deletionpending=待删除\r
 nfv-package-iui-field-operation=操作\r
 \r
-//包详细信息字段\r
+//package detail message\r
 nfv-package-iui-field-detail-name=名称\r
 nfv-package-iui-field-detail-type=类型\r
 nfv-package-iui-field-detail-usagestate=使用状态\r
@@ -99,7 +99,7 @@ nfv-package-iui-drop-zone-uploadBtn=上传
 nfv-template-topo-iui-title=拓扑\r
 nfv-template-nodes-iui-title=节点\r
 \r
-//模板管理表格字段名称定义\r
+//template table colums\r
 nfv-template-iui-title=模板管理\r
 nfv-template-iui-field-order=序号\r
 nfv-template-iui-field-templatename=名称\r
@@ -114,7 +114,7 @@ nfv-template-iui-field-operations=操作
 nfv-template-iui-field-download-uri=下载Uri\r
 nfv-template-iui-field-type=节点类型\r
 \r
-//模板明细表格字段名称定义\r
+//template detail table colums\r
 nfv-templateDetail-iui-index=序号\r
 nfv-templateDetail-iui-title=节点模板\r
 nfv-templateDetail-iui-field-nodeId=ID\r
@@ -147,7 +147,7 @@ nfv-topology-iui-vnf-tip=点击查看嵌套拓扑图
 nfv-topology-iui-btn-return-tip=返回\r
 nfv-topology-iui-message-error=查询拓扑图模板信息失败\r
 \r
-//虚拟应用表格字段名称定义\r
+//virtual application table colums\r
 nfv-virtualApplication-iui-title=生命周期管理\r
 nfv-virtualApplication-iui-field-name=名称\r
 nfv-virtualApplication-iui-field-template=模板\r
@@ -247,7 +247,7 @@ nfv-virtualApplication-iui-validate-noinputParam=无需输入参数
 nfv-virtualApplication-iui-validate-digits=只能输入整数\r
 nfv-virtualApplication-iui-validate-range=请输入在 {0} 和 {1} 之间的值\r
 \r
-//节点明细表格字段名称定义\r
+//virtual application detail table colums\r
 nfv-virtualApplicationDetail-iui-field-nodeId=ID\r
 nfv-virtualApplicationDetail-iui-field-nodeName=名称\r
 nfv-virtualApplicationDetail-iui-field-nodeType=节点类型\r
@@ -265,7 +265,7 @@ nfv-virtualApplicationDetail-iui-text-events=事件
 nfv-virtualApplicationDetail-iui-text-nodeDetail=节点详情\r
 nfv-virtualApplicationDetail-iui-btn-close=关闭\r
 \r
-//主机镜像表格字段名称定义\r
+//host image table colums\r
 nfv-host-iui-title=主机镜像\r
 nfv-host-iui-field-name=名称\r
 nfv-host-iui-field-size=大小\r
@@ -304,7 +304,7 @@ nfv-host-iui-progress-uploading=上传中
 nfv-host-iui-progress-success=上传成功\r
 nfv-host-iui-progress-fail=上传失败\r
 \r
-//软件镜像表格字段名称定义\r
+//software image table colums\r
 nfv-software-iui-title=软件镜像\r
 nfv-software-iui-field-name=名称\r
 nfv-software-iui-field-size=大小\r
index cfa4a99..00a6782 100644 (file)
@@ -436,7 +436,7 @@ serverPageTable.initDataTableForEvent = function( setting ,cond , divId) {
         "bAutoWidth":true,//automatically set the column width\r
         "bLengthChange": true,// record number in each row\r
         "iDisplayLength": 10,// row number in each page\r
-        "bSort": setting.sort ? true : false,// 排序\r
+        "bSort": setting.sort ? true : false,\r
         "bInfo": setting.info,// Showing 1 to 10 of 23 entries \r
         "bWidth": true,\r
         "bScrollCollapse": true,\r
index 834562a..ee49038 100644 (file)
  */\r
 \r
 var vm = avalon.define({\r
-    $id : "tmDetailController",\r
-    templateId : "",\r
-    templateData : [\r
+    $id: "tmDetailController",\r
+    templateId: "",\r
+    templateData: [\r
         {href: "#topology", name: "Topology", value: true},\r
         {href: "#nodes", name: "Nodes", value: false}\r
     ],\r
     $language: {\r
         "sProcessing": "<img src='../component/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span>&nbsp;&nbsp;"\r
-                        +$.i18n.prop("nfv-nso-iui-table-sProcess")+"</span>",\r
+        + $.i18n.prop("nfv-nso-iui-table-sProcess") + "</span>",\r
         "sLengthMenu": $.i18n.prop("nfv-nso-iui-table-sLengthMenu"),\r
         "sZeroRecords": $.i18n.prop("nfv-nso-iui-table-sZeroRecords"),\r
         "sInfo": "<span class='seperator'>  </span>" + $.i18n.prop("nfv-nso-iui-table-sInfo"),\r
         "sInfoEmpty": $.i18n.prop("nfv-nso-iui-table-sInfoEmpty"),\r
         "sGroupActions": $.i18n.prop("nfv-nso-iui-table-sGroupActions"),\r
-        "sAjaxRequestGeneralError":$.i18n.prop("nfv-nso-iui-table-sAjaxRequestGeneralError"),\r
+        "sAjaxRequestGeneralError": $.i18n.prop("nfv-nso-iui-table-sAjaxRequestGeneralError"),\r
         "sEmptyTable": $.i18n.prop("nfv-nso-iui-table-sEmptyTable"),\r
         "oPaginate": {\r
             "sPrevious": $.i18n.prop("nfv-nso-iui-table-sPrevious"),\r
@@ -38,41 +38,41 @@ var vm = avalon.define({
             "sPageOf": $.i18n.prop("nfv-nso-iui-table-sPageOf")\r
         }\r
     },\r
-    $restUrl : {\r
-        queryNodeTemplateUrl : "/openoapi/catalog/v1/servicetemplates/{0}/nodetemplates",\r
-        queryTemplateInfoUrl : "/openoapi/catalog/v1/servicetemplates"\r
+    $restUrl: {\r
+        queryNodeTemplateUrl: "/openoapi/catalog/v1/servicetemplates/{0}/nodetemplates",\r
+        queryTemplateInfoUrl: "/openoapi/catalog/v1/servicetemplates"\r
     },\r
-    $init : function() {\r
+    $init: function () {\r
         vm.$initTemplateData();\r
         vm.$initTopoNodesData();\r
     },\r
-    $initTemplateData : function() {\r
+    $initTemplateData: function () {\r
         $.ajax({\r
-            type : "GET",\r
-            url : vm.$restUrl.queryTemplateInfoUrl,\r
-            success : function(resp) {\r
-                if(resp) {\r
+            type: "GET",\r
+            url: vm.$restUrl.queryTemplateInfoUrl,\r
+            success: function (resp) {\r
+                if (resp) {\r
                     vm.nodesTab.servicesTemplateData = [];\r
-                    for(var i=0; i<resp.length; i++) {\r
+                    for (var i = 0; i < resp.length; i++) {\r
                         //generate node table display data\r
                         vm.nodesTab.servicesTemplateData.push(resp[i]);\r
                     }\r
                     vm.nodesTab.$initNfvNodesTab();\r
                 }\r
             },\r
-            error : function() {\r
+            error: function () {\r
                 commonUtil.showMessage($.i18n.prop("nfv-topology-iui-message-error"), "danger");\r
             }\r
         });\r
     },\r
-    $initTopoNodesData : function() {\r
+    $initTopoNodesData: function () {\r
         $.ajax({\r
-            type : "GET",\r
-            url : vm.$restUrl.queryNodeTemplateUrl,\r
-            success : function(resp) {\r
-                if(resp) {\r
+            type: "GET",\r
+            url: vm.$restUrl.queryNodeTemplateUrl,\r
+            success: function (resp) {\r
+                if (resp) {\r
                     vm.nodesTab.nodesDetail.nodesTemplateDetailData = [];\r
-                    for(var i=0; i<resp.length; i++) {\r
+                    for (var i = 0; i < resp.length; i++) {\r
                         //generate node table display data\r
                         var nodeTemplate = topoUtil.generateNodeTemplate(resp[i]);\r
                         vm.nodesTab.nodesList.nodesData.push(nodeTemplate);\r
@@ -85,12 +85,12 @@ var vm = avalon.define({
                     //vm.nodesTab.nodesList.$initNodesTable();\r
                 }\r
             },\r
-            error : function() {\r
+            error: function () {\r
                 commonUtil.showMessage($.i18n.prop("nfv-topology-iui-message-error"), "danger");\r
             }\r
         });\r
     },\r
-    $initNodesData : function() {\r
+    $initNodesData: function () {\r
         $.ajax({\r
             type: "GET",\r
             url: vm.$restUrl.queryNodeTemplateUrl,\r
@@ -115,59 +115,59 @@ var vm = avalon.define({
             }\r
         });\r
     },\r
-    topologyTab : {\r
-        topology : "topology.html",\r
-        vnfTip : $.i18n.prop("nfv-topology-iui-vnf-tip"),\r
-        btnTip : $.i18n.prop("nfv-topology-iui-btn-return-tip"),\r
-        topoTemplateData:[],\r
-        boxTopoDatas:[],\r
-        networkTopoDatas:[],\r
+    topologyTab: {\r
+        topology: "topology.html",\r
+        vnfTip: $.i18n.prop("nfv-topology-iui-vnf-tip"),\r
+        btnTip: $.i18n.prop("nfv-topology-iui-btn-return-tip"),\r
+        topoTemplateData: [],\r
+        boxTopoDatas: [],\r
+        networkTopoDatas: [],\r
         isShowNum: false,\r
-        returnBtnVisible : false,\r
-        $getColor: function(index) {\r
+        returnBtnVisible: false,\r
+        $getColor: function (index) {\r
             return topoUtil.getColor(index);\r
         },\r
-        $getCidr: function(properties){\r
+        $getCidr: function (properties) {\r
             return topoUtil.getCidr(properties);\r
         },\r
-        $getCpTop: function(index, parentBoxId){\r
+        $getCpTop: function (index, parentBoxId) {\r
             return topoUtil.getCpTop(index, parentBoxId);\r
         },\r
-        $initTopology : function() {\r
+        $initTopology: function () {\r
             topoUtil.initTopoData(vm.topologyTab.topoTemplateData.$model);\r
-        },          \r
-        $showTopo:function(id, name){\r
+        },\r
+        $showTopo: function (id, name) {\r
             vm.nodesTab.nodesDetail.$showDetails("block", id, name);\r
         },\r
-        $showVnfTopo: function(templateId) {\r
+        $showVnfTopo: function (templateId) {\r
             vm.topologyTab.returnBtnVisible = true;\r
             vm.$restUrl.queryNodeTemplateUrl = "/openoapi/catalog/v1/servicetemplates/" + templateId + "/nodetemplates";\r
             vm.$init();\r
         },\r
-        $returnNS: function() {\r
+        $returnNS: function () {\r
             vm.topologyTab.returnBtnVisible = false;\r
             vm.$restUrl.queryNodeTemplateUrl = "/openoapi/catalog/v1/servicetemplates/" + vm.templateId + "/nodetemplates";\r
             vm.$init();\r
         }\r
     },\r
-    nodesTab : {\r
+    nodesTab: {\r
         servicesTemplateData: [],\r
-        $nodesTabId : "ict_nodes_template_table",\r
-        $nodesTemplateTabFields : {// table columns\r
+        $nodesTabId: "ict_nodes_template_table",\r
+        $nodesTemplateTabFields: {// table columns\r
             table: [\r
-                {"mData": "serviceTemplateId", name: "ID","bVisible": false},\r
-                {"mData": "", name: "","sClass": 'details-control'},\r
+                {"mData": "serviceTemplateId", name: "ID", "bVisible": false},\r
+                {"mData": "", name: "", "sClass": 'details-control'},\r
                 {"mData": "templateName", name: $.i18n.prop("nfv-template-iui-field-templatename")},\r
                 {"mData": "vendor", name: $.i18n.prop("nfv-template-iui-field-vendor")},\r
                 {"mData": "version", name: $.i18n.prop("nfv-template-iui-field-version")},\r
-                {"mData":"csarid", name: "packageID","bVisible": false},\r
+                {"mData": "csarid", name: "packageID", "bVisible": false},\r
                 {"mData": "type", name: $.i18n.prop("nfv-template-iui-field-type")},\r
                 //{"mData": "inputs", name: $.i18n.prop("nfv-template-iui-field-inputs"),"fnRender" : tmDetailUtil.inputsRender},\r
                 //{"mData": "outputs", name: $.i18n.prop("nfv-template-iui-field-outputs"),"fnRender" : tmDetailUtil.outputsRender},\r
                 //{"mData": "operations", name: $.i18n.prop("nfv-template-iui-field-operations")}\r
             ]\r
         },\r
-        $initNfvNodesTab: function() {\r
+        $initNfvNodesTab: function () {\r
             var setting = {};\r
             setting.language = vm.$language;\r
             setting.paginate = true;\r
@@ -177,10 +177,10 @@ var vm = avalon.define({
             setting.restUrl = vm.$restUrl.queryTemplateInfoUrl;\r
             setting.tableId = vm.nodesTab.$nodesTabId;\r
             //serverPageTable.initTableWithData(setting,vm.nodesTab.$nodesTabId + '_div',vm.nodesTab.servicesTemplateData.$model);\r
-            serverPageTable.initDataTable(setting,{},vm.nodesTab.$nodesTabId + '_div');\r
+            serverPageTable.initDataTable(setting, {}, vm.nodesTab.$nodesTabId + '_div');\r
             $('#' + vm.nodesTab.$nodesTabId + '>tbody').on("click", 'td.details-control', function () {\r
                 var tr = $(this).closest('tr');\r
-                var table =  $('#' + vm.nodesTab.$nodesTabId).dataTable();\r
+                var table = $('#' + vm.nodesTab.$nodesTabId).dataTable();\r
                 if (table.fnIsOpen(tr[0])) {\r
                     table.fnClose(tr[0]);\r
                     tr.removeClass('shown');\r
@@ -193,18 +193,39 @@ var vm = avalon.define({
         },\r
 \r
         //nodes list table\r
-        nodesList :{\r
+        nodesList{\r
             nodesData: [],\r
-            $nodesTabDataId : "ict_nodes_table",\r
-            $nodesTabFields : {// table columns\r
+            $nodesTabDataId: "ict_nodes_table",\r
+            $nodesTabFields: {// table columns\r
                 table: [\r
                     {"mData": "id", name: "ID", "bVisible": false},\r
-                    {"mData": "name", name: $.i18n.prop("nfv-templateDetail-iui-field-nodetypename"), "bSortable": true, "fnRender" : tmDetailUtil.nameRender},\r
+                    {\r
+                        "mData": "name",\r
+                        name: $.i18n.prop("nfv-templateDetail-iui-field-nodetypename"),\r
+                        "bSortable": true,\r
+                        "fnRender": tmDetailUtil.nameRender\r
+                    },\r
                     {"mData": "type", name: $.i18n.prop("nfv-templateDetail-iui-field-type"), "bSortable": false},\r
-                    {"mData": "containedin", name: $.i18n.prop("nfv-templateDetail-iui-field-containedin"), "bSortable": false},\r
-                    {"mData": "deployedon", name: $.i18n.prop("nfv-templateDetail-iui-field-deployedon"), "bSortable": false},\r
-                    {"mData": "connectedto", name: $.i18n.prop("nfv-templateDetail-iui-field-connectedto"), "bSortable": false},\r
-                    {"mData": "virtuallinksto", name: $.i18n.prop("nfv-templateDetail-iui-field-virtuallinksto"), "bSortable": false}\r
+                    {\r
+                        "mData": "containedin",\r
+                        name: $.i18n.prop("nfv-templateDetail-iui-field-containedin"),\r
+                        "bSortable": false\r
+                    },\r
+                    {\r
+                        "mData": "deployedon",\r
+                        name: $.i18n.prop("nfv-templateDetail-iui-field-deployedon"),\r
+                        "bSortable": false\r
+                    },\r
+                    {\r
+                        "mData": "connectedto",\r
+                        name: $.i18n.prop("nfv-templateDetail-iui-field-connectedto"),\r
+                        "bSortable": false\r
+                    },\r
+                    {\r
+                        "mData": "virtuallinksto",\r
+                        name: $.i18n.prop("nfv-templateDetail-iui-field-virtuallinksto"),\r
+                        "bSortable": false\r
+                    }\r
                 ]\r
             },\r
             $initNodesTable: function () {\r
@@ -217,60 +238,96 @@ var vm = avalon.define({
                 setting.restUrl = vm.$restUrl.queryNodeTemplateUrl;\r
                 setting.tableId = vm.nodesTab.nodesList.$nodesTabDataId;\r
                 //serverPageTable.initTableWithData(setting,vm.nodesTab.nodesList.$nodesTabDataId + '_div',vm.nodesTab.nodesList.nodesData.$model);\r
-                serverPageTable.initTableWithoutLib(setting,{},vm.nodesTab.nodesList.$nodesTabDataId + '_div');\r
+                serverPageTable.initTableWithoutLib(setting, {}, vm.nodesTab.nodesList.$nodesTabDataId + '_div');\r
             },\r
-            $format_Detail: function() {\r
+            $format_Detail: function () {\r
                 var sOut = '<div class="row-fluid" data-name="table_zone"><div class="col-xs-12" id="ict_nodes_table_div"></div></div>'\r
                 vm.$initNodesData();\r
                 return sOut;\r
             },\r
         },\r
         //Nodes Details\r
-        nodesDetail : {\r
+        nodesDetail: {\r
             nodesTemplateDetailData: [],\r
-            detailTitle : "",\r
-            isShow : "none",\r
-            detailIndex : 0,\r
-            detailData : [\r
+            detailTitle: "",\r
+            isShow: "none",\r
+            detailIndex: 0,\r
+            detailData: [\r
                 {id: "general", name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-general"), isActive: true},\r
-                {id: "properties", name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-properties"), isActive: false},\r
-                {id: "relationShips", name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-relationShips"), isActive: false}\r
+                {\r
+                    id: "properties",\r
+                    name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-properties"),\r
+                    isActive: false\r
+                },\r
+                {\r
+                    id: "relationShips",\r
+                    name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-relationShips"),\r
+                    isActive: false\r
+                }\r
             ],\r
-            $showDetails : function(isShow, nodetypeid, nodetypename) {\r
+            $showDetails: function (isShow, nodetypeid, nodetypename) {\r
                 vm.nodesTab.nodesDetail.isShow = isShow;\r
                 if (isShow == "block") {\r
                     vm.nodesTab.nodesDetail.detailTitle = nodetypename + " " + $.i18n.prop("nfv-templateDetail-nodesTab-iui-title-nodeDetail"),\r
-                    $('#' + vm.nodesTab.nodesDetail.detailData[0].id).click();\r
+                        $('#' + vm.nodesTab.nodesDetail.detailData[0].id).click();\r
                     vm.nodesTab.nodesDetail.detailData[0].isActive = true;\r
                     vm.nodesTab.nodesDetail.$initNodeDetailTable(nodetypeid);\r
                 }\r
             },\r
-            detailCondChange : function(index) {\r
+            detailCondChange: function (index) {\r
                 vm.nodesTab.nodesDetail.detailIndex = index;\r
-                for(var i=0; i<vm.nodesTab.nodesDetail.detailData.length; i++) {\r
+                for (var i = 0; i < vm.nodesTab.nodesDetail.detailData.length; i++) {\r
                     vm.nodesTab.nodesDetail.detailData[i].isActive = false;\r
                 }\r
                 vm.nodesTab.nodesDetail.detailData[index].isActive = true;\r
             },\r
-            $tableFields : {// table columns\r
+            $tableFields: {// table columns\r
                 general: [\r
-                    {"mData": "key", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-key"), "bSortable" : false},\r
-                    {"mData": "value", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-value"), "bSortable" : false}\r
+                    {\r
+                        "mData": "key",\r
+                        "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-key"),\r
+                        "bSortable": false\r
+                    },\r
+                    {\r
+                        "mData": "value",\r
+                        "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-value"),\r
+                        "bSortable": false\r
+                    }\r
                 ],\r
                 properties: [\r
-                    {"mData": "key", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-key"), "bSortable" : false},\r
-                    {"mData": "value", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-value"), "bSortable" : false}\r
+                    {\r
+                        "mData": "key",\r
+                        "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-key"),\r
+                        "bSortable": false\r
+                    },\r
+                    {\r
+                        "mData": "value",\r
+                        "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-value"),\r
+                        "bSortable": false\r
+                    }\r
                 ],\r
                 relationShips: [\r
-                    {"mData": "sourceNodeName", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-sourceNodeName"), "bSortable" : false},\r
-                    {"mData": "targetNodeName", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-targetNodeName"), "bSortable" : false},\r
-                    {"mData": "type", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-type"), "bSortable" : false}\r
+                    {\r
+                        "mData": "sourceNodeName",\r
+                        "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-sourceNodeName"),\r
+                        "bSortable": false\r
+                    },\r
+                    {\r
+                        "mData": "targetNodeName",\r
+                        "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-targetNodeName"),\r
+                        "bSortable": false\r
+                    },\r
+                    {\r
+                        "mData": "type",\r
+                        "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-type"),\r
+                        "bSortable": false\r
+                    }\r
                 ]\r
             },\r
-            $initNodeDetailTable: function(nodetemplateid) {\r
+            $initNodeDetailTable: function (nodetemplateid) {\r
                 var data = topoUtil.getCurrentDetailData(vm.nodesTab.nodesDetail.nodesTemplateDetailData.$model, nodetemplateid);\r
                 //initialize three tables of nodedetail\r
-                $.each(vm.nodesTab.nodesDetail.$tableFields, function(key, value){\r
+                $.each(vm.nodesTab.nodesDetail.$tableFields, function (key, value) {\r
                     var setting = {};\r
                     setting.language = vm.$language;\r
                     setting.paginate = false;\r
@@ -282,25 +339,34 @@ var vm = avalon.define({
             }\r
         }\r
     },\r
-    executionTab : {\r
-        $eventsTabId : "ict_events_table",\r
-        $eventsTabFields : {// table columns\r
+    executionTab: {\r
+        $eventsTabId: "ict_events_table",\r
+        $eventsTabFields: {// table columns\r
             table: [\r
                 {"mData": "currentStepId", name: "ID", "bVisible": false},\r
-                {"mData": "currentStepName", name: $.i18n.prop("nfv-templateDetail-executionTab-iui-field-currentStepName")},\r
-                {"mData": "currentStepStatus", name: $.i18n.prop("nfv-templateDetail-executionTab-iui-field-currentStepStatus")},\r
-                {"mData": "currentStepDesc", name: $.i18n.prop("nfv-templateDetail-executionTab-iui-field-currentStepDesc")},\r
+                {\r
+                    "mData": "currentStepName",\r
+                    name: $.i18n.prop("nfv-templateDetail-executionTab-iui-field-currentStepName")\r
+                },\r
+                {\r
+                    "mData": "currentStepStatus",\r
+                    name: $.i18n.prop("nfv-templateDetail-executionTab-iui-field-currentStepStatus")\r
+                },\r
+                {\r
+                    "mData": "currentStepDesc",\r
+                    name: $.i18n.prop("nfv-templateDetail-executionTab-iui-field-currentStepDesc")\r
+                },\r
                 {"mData": "currentTime", name: $.i18n.prop("nfv-templateDetail-executionTab-iui-field-executionTime")},\r
                 {"mData": "allSteps", name: "allSteps", "bVisible": false}\r
             ]\r
         },\r
         $queryEventsInfoUrl: "/api/nsoc/appinstance/operateschedule?instanceId=",\r
         $queryStepUrl: "",\r
-        $getEventsCond: function() {\r
+        $getEventsCond: function () {\r
             var cond = {};\r
             return cond;\r
         },\r
-        $initEventsTable: function() {\r
+        $initEventsTable: function () {\r
             console.log("initEventsTable ");\r
             var setting = {};\r
             setting.language = vm.$language;\r
@@ -310,29 +376,29 @@ var vm = avalon.define({
             setting.restUrl = vm.executionTab.$queryEventsInfoUrl;\r
             setting.tableId = vm.executionTab.$eventsTabId;\r
             serverPageTable.initDataTable(setting, vm.executionTab.$getEventsCond(),\r
-                    vm.executionTab.$eventsTabId + '_div');\r
+                vm.executionTab.$eventsTabId + '_div');\r
         },\r
-        $operation : "",\r
-        steps : [],\r
-        $init: function() {\r
+        $operation: "",\r
+        steps: [],\r
+        $init: function () {\r
             vm.executionTab.$initEventsTable();\r
         }\r
     },\r
 \r
 });\r
 \r
-var initParam = function() { //initialize template detail params\r
+var initParam = function () { //initialize template detail params\r
     var paramStr = window.location.search.substring(1);\r
-    if(paramStr.length > 0) {\r
+    if (paramStr.length > 0) {\r
         var params = paramStr.split("&");\r
         var templateId = params[0].substring(params[0].indexOf('=') + 1);\r
         var flavor = params[1].substring(params[1].indexOf('=') + 1);\r
         avalon.scan();\r
-          \r
+\r
         vm.templateId = templateId;\r
         vm.$restUrl.queryNodeTemplateUrl = commonUtil.format(vm.$restUrl.queryNodeTemplateUrl, templateId);\r
 \r
-        if(flavor) {\r
+        if (flavor) {\r
             vm.$restUrl.queryNodeTemplateUrl += "?flavor=" + flavor;\r
         }\r
 \r
index a531278..2545314 100644 (file)
@@ -149,7 +149,6 @@ topoUtil.getInstanceNum = function(nodeTemplate, nodeInstanceData) {
        var num = 0;\r
        var id;\r
        if(nodeTemplate.properties && nodeTemplate.properties.vnfdid) {\r
-               //ns嵌套vnf,ns中vnf的nodetemplate的属性vnfdid才是嵌套vnf的真实id\r
                id = nodeTemplate.properties.vnfdid;\r
        } else {\r
                id = nodeTemplate.id;\r