diff options
Diffstat (limited to 'openo-portal/portal-catalog/src/main/webapp')
33 files changed, 374 insertions, 318 deletions
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html index aabbaa02..827f13e7 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html @@ -1,12 +1,12 @@ <!--
- 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.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -226,7 +226,7 @@ </thead>
<tbody ms-each-rest="resource.vimSelectItems">
<tr>
- <td ms-text="rest.vimName"></td>
+ <td ms-text="rest.name"></td>
<td>
<div class="checkbox">
<input type="radio" name="testEnvRadios" ms-attr-id="testEnvRadios{{$index}}"
@@ -277,11 +277,11 @@ <script type="text/javascript" src="../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootbox/bootbox.min.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
<script type="text/javascript" src="../common/thirdparty/cometd/cometd.js"></script>
- <script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/../common/thirdparty/jquery.ui.widget.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/js/vendor/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/js/jquery.iframe-transport.js"></script>
<script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/js/jquery.fileupload.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/datatable-sort.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/datatable-sort.css index ed9847ad..b92cf8ee 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/datatable-sort.css +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/datatable-sort.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. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - table.table thead .sorting, table.table thead .sorting_asc, table.table thead .sorting_desc, diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/fileupload.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/fileupload.css index 14246da4..412ad075 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/fileupload.css +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/fileupload.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.
@@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
@charset "UTF-8";
.file-caption {
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/hostMirror.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/hostMirror.css index eee3d1bc..9847e124 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/hostMirror.css +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/hostMirror.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.
@@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
body {
font-family: microsoft yahei !important;
}
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css index 73bc6f4c..aa7027bb 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.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.
@@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
body {
font-family: microsoft yahei !important;
}
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/animate.min.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/animate.min.css index cf2cbaf5..f561db0f 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/animate.min.css +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/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. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - @charset "UTF-8";/*! Animate.css - http://daneden.me/animate Licensed under the MIT license - http://opensource.org/licenses/MIT diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/skill.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/skill.css index 7f980e97..1d2d397f 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/skill.css +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/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. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - body { font-family: 'Open Sans', sans-serif; background-color: #f1f3fa; diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/software.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/software.css index 6648b455..faa53c3a 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/software.css +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/software.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. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - body { font-family: microsoft yahei !important; } diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/template.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/template.css index 25bf17d4..a26e1b27 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/template.css +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/template.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. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - body { font-family: microsoft yahei !important; } diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/templateDetail.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/templateDetail.css index 9503500f..99ba5347 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/templateDetail.css +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/templateDetail.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.
@@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
body {
font-family: microsoft yahei !important;
}
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/topology.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/topology.css index 1e0d8777..0d1de94e 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/topology.css +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/topology.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.
@@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
.container-fluid {
background-color: #fff;
padding: 0;
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/virtualApplication.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/virtualApplication.css index 99eafbb3..e0792d86 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/virtualApplication.css +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/virtualApplication.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.
@@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
body {
font-family: microsoft yahei !important;
}
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/vnfm.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/vnfm.css index 1dac48f3..2adc8620 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/vnfm.css +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/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. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - body { font-family: microsoft yahei !important; } diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties index d066da43..798c0fc8 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties @@ -1,11 +1,11 @@ #
-# 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.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties index 86d82ce6..ae379c34 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties @@ -1,11 +1,11 @@ #
-# 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.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/commonUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/commonUtil.js index abc4cd63..5a5cdaca 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/commonUtil.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/commonUtil.js @@ -1,11 +1,11 @@ /*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * 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.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/loadi18n_nsoc.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/loadi18n_nsoc.js index e667450f..459aeb19 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/loadi18n_nsoc.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/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. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - function loadPropertiesSideMenu(lang, fileNamePrefix, filePath){ jQuery.i18n.properties({ language:lang, diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/serverPageTable.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/serverPageTable.js index 00a6782b..2c076315 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/serverPageTable.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/serverPageTable.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.
@@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
var serverPageTable = {};
/* Bootstrap style full number pagination control */
$.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings )
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js index 4a971218..974bac61 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.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.
@@ -13,16 +13,12 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
var vm = avalon.define({
$id : "pmController",
resource : {
packageInfo : [],
packageDetails : "",
- vimSelectItems : [
- {vimName:"test1", oid:"123456"},
- {vimName:"test2",oid:"987654"}
- ]
+ vimSelectItems : []
},
csarIdSelected : "",
$packageTableFields : {// table columns
@@ -36,7 +32,7 @@ var vm = avalon.define({ ]
},
$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"),
@@ -64,7 +60,7 @@ var vm = avalon.define({ nsarOnboardUrl: "/openoapi/nslcm/v1.0/nspackage",
nfarOnboardUrl: "/openoapi/nslcm/v1.0/vnfpackage",
changePackageStatusUrl : "/openoapi/catalog/v1/csars",
- queryVimInfoUrl : "/api/roc/v1/resource/vims"
+ queryVimInfoUrl : "/openoapi/extsys/v1/vims"
},
$getPackageCond: function() {
var cond = {};
@@ -134,11 +130,17 @@ var vm = avalon.define({ labVimId : "",
},
$initData : function(csarId) {
- vm.resource.vimSelectItems = [
- {vimName:"test1", oid:"123456"},
- {vimName:"test2", oid:"987654"},
- {vimName:"test3", oid:"123qwe"}
- ];
+ //vm.resource.vimSelectItems = [
+ // {vimName:"test1", oid:"123456"},
+ // {vimName:"test2", oid:"987654"},
+ // {vimName:"test3", oid:"123qwe"}
+ //];
+ var url=vm.$restUrl.queryVimInfoUrl;
+ commonUtil.get(url,null,function(resp) {
+ if (resp) {
+ vm.resource.vimSelectItems=resp;
+ }
+ })
vm.selectVimDialog.nfarOnBoardParam.csarId = csarId;
},
$confirmBtnClick : function () {
@@ -149,10 +151,10 @@ var vm = avalon.define({ var radioId = "testEnvRadios" + i;
var checkboxId = "produceEnvChecks" + i;
if(document.getElementById(radioId).checked) {
- labVimId = vm.resource.vimSelectItems[i].oid;
+ labVimId = vm.resource.vimSelectItems[i].vimId;
}
if(document.getElementById(checkboxId).checked) {
- vimIds.push(vm.resource.vimSelectItems[i].oid);
+ vimIds.push(vm.resource.vimSelectItems[i].vimId);
}
}
vm.selectVimDialog.nfarOnBoardParam.labVimId = labVimId;
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js index 992357d0..c694c51f 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.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.
@@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
var pmUtil = {};
pmUtil.changeStatus = function(csarId, status) {
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmController.js index bea04e3f..4b667a4b 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmController.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmController.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.
@@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
avalon.config({
interpolate: ["<!--", "-->"]
});
@@ -24,7 +23,7 @@ var vm = avalon.define({ $templateTableFields : {// table columns
table: [
{"mData": "serviceTemplateId", name: "ID", "bVisible": false},
- {"mData": "templateName", name: $.i18n.prop("nfv-template-iui-field-templatename"), "fnRender" : tmUtil.nameRender},
+ {"mData": "templateName",name: $.i18n.prop("nfv-template-iui-field-templatename"),"fnRender": tmUtil.nameRender},
//{"mData": "templateName", name: $.i18n.prop("nfv-template-iui-field-templatename-topo"), "fnRender" : tmUtil.topoRender},
//{"mData": "templateName", name: $.i18n.prop("nfv-template-iui-field-templatename-nodes"), "fnRender" : tmUtil.nodesRender},
{"mData": "vendor", name: $.i18n.prop("nfv-template-iui-field-vendor")},
@@ -34,7 +33,7 @@ var vm = avalon.define({ ]
},
$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-catalog/src/main/webapp/catalog/js/template/tmDetailController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js index ee490385..2401d314 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.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.
@@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
var vm = avalon.define({
- $id: "tmDetailController",
- templateId: "",
- templateData: [
+ $id : "tmDetailController",
+ templateId : "",//store the Id of service template which shows in Topology tab page
+ globalNodesData: {},//store the nodes data which shows in Topology tab page
+ templateData : [
{href: "#topology", name: "Topology", value: true},
{href: "#nodes", name: "Nodes", value: false}
],
$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"),
@@ -71,43 +71,19 @@ var vm = avalon.define({ url: vm.$restUrl.queryNodeTemplateUrl,
success: function (resp) {
if (resp) {
- vm.nodesTab.nodesDetail.nodesTemplateDetailData = [];
+ vm.nodesDetail.nodesTemplateDetailData = [];
+ var nodesTempData = [];
for (var i = 0; i < resp.length; i++) {
//generate node table display data
var nodeTemplate = topoUtil.generateNodeTemplate(resp[i]);
- vm.nodesTab.nodesList.nodesData.push(nodeTemplate);
+ nodesTempData.push(nodeTemplate);
}
- vm.nodesTab.nodesDetail.nodesTemplateDetailData = resp;
+ vm.globalNodesData[vm.templateId] = nodesTempData;
//generate topology graph display data
- vm.topologyTab.topoTemplateData = topoUtil.generateTopoTemplate(vm.nodesTab.nodesList.nodesData.$model);
+ vm.nodesDetail.nodesTemplateDetailData = resp;
//initialize topology data
+ vm.topologyTab.topoTemplateData = topoUtil.generateTopoTemplate(vm.globalNodesData[vm.templateId]);
topoUtil.initTopoData(vm.topologyTab.topoTemplateData.$model);
- //vm.nodesTab.nodesList.$initNodesTable();
- }
- },
- error: function () {
- commonUtil.showMessage($.i18n.prop("nfv-topology-iui-message-error"), "danger");
- }
- });
- },
- $initNodesData: function () {
- $.ajax({
- type: "GET",
- url: vm.$restUrl.queryNodeTemplateUrl,
- success: function (resp) {
- if (resp) {
- vm.nodesTab.nodesDetail.nodesTemplateDetailData = [];
- for (var i = 0; i < resp.length; i++) {
- //generate node table display data
- var nodeTemplate = topoUtil.generateNodeTemplate(resp[i]);
- vm.nodesTab.nodesList.nodesData.push(nodeTemplate);
- }
- vm.nodesTab.nodesDetail.nodesTemplateDetailData = resp;
- //generate topology graph display data
- //vm.topologyTab.topoTemplateData = topoUtil.generateTopoTemplate(vm.nodesTab.nodesList.nodesData.$model);
- //initialize topology data
- //topoUtil.initTopoData(vm.topologyTab.topoTemplateData.$model);
- vm.nodesTab.nodesList.$initNodesTable();
}
},
error: function () {
@@ -137,7 +113,7 @@ var vm = avalon.define({ topoUtil.initTopoData(vm.topologyTab.topoTemplateData.$model);
},
$showTopo: function (id, name) {
- vm.nodesTab.nodesDetail.$showDetails("block", id, name);
+ vm.topologyTab.$showTopoDetails("block", id, name);
},
$showVnfTopo: function (templateId) {
vm.topologyTab.returnBtnVisible = true;
@@ -148,7 +124,17 @@ var vm = avalon.define({ vm.topologyTab.returnBtnVisible = false;
vm.$restUrl.queryNodeTemplateUrl = "/openoapi/catalog/v1/servicetemplates/" + vm.templateId + "/nodetemplates";
vm.$init();
- }
+ },
+ $showTopoDetails: function (isShow, nodetypeid, nodetypename) {
+ vm.nodesDetail.isShow = isShow;
+ if (isShow == "block") {
+ vm.nodesDetail.detailTitle = nodetypename + " " + $.i18n.prop("nfv-templateDetail-nodesTab-iui-title-nodeDetail"),
+ $('#' + vm.nodesDetail.detailData[0].id).click();
+ vm.nodesDetail.detailData[0].isActive = true;
+ vm.nodesDetail.$initTopoNodesDetailTable(nodetypeid);
+ }
+ },
+
},
nodesTab: {
servicesTemplateData: [],
@@ -162,9 +148,6 @@ var vm = avalon.define({ {"mData": "version", name: $.i18n.prop("nfv-template-iui-field-version")},
{"mData": "csarid", name: "packageID", "bVisible": false},
{"mData": "type", name: $.i18n.prop("nfv-template-iui-field-type")},
- //{"mData": "inputs", name: $.i18n.prop("nfv-template-iui-field-inputs"),"fnRender" : tmDetailUtil.inputsRender},
- //{"mData": "outputs", name: $.i18n.prop("nfv-template-iui-field-outputs"),"fnRender" : tmDetailUtil.outputsRender},
- //{"mData": "operations", name: $.i18n.prop("nfv-template-iui-field-operations")}
]
},
$initNfvNodesTab: function () {
@@ -186,15 +169,38 @@ var vm = avalon.define({ tr.removeClass('shown');
}
else {
- table.fnOpen(tr[0], vm.nodesTab.nodesList.$format_Detail(), 'details');
+ table.fnOpen(tr[0], vm.nodesTab.nodesList.$format_Detail(table,tr[0]), 'details');
tr.addClass('shown');
}
});
},
-
+ $initNodesData: function (tempId) {
+ $.ajax({
+ type: "GET",
+ //url: vm.$restUrl.queryNodeTemplateUrl,
+ url: "/openoapi/catalog/v1/servicetemplates/" + tempId + "/nodetemplates",
+ success: function (resp) {
+ if (resp) {
+ var nodesTempData = [];
+ for (var i = 0; i < resp.length; i++) {
+ //generate node table display data
+ var nodeTemplate = topoUtil.generateNodeTemplate(resp[i]);
+ nodesTempData.push(nodeTemplate);
+ }
+ vm.nodesTab.nodesList.nodesData[tempId] = nodesTempData;
+ //generate topology graph display data
+ vm.nodesTab.nodesList.$initNodesTable(tempId);
+ }
+ },
+ error: function () {
+ commonUtil.showMessage($.i18n.prop("nfv-topology-iui-message-error"), "danger");
+ }
+ });
+ },
//nodes list table
nodesList: {
- nodesData: [],
+ nodesData: {},
+ tempId:"",
$nodesTabDataId: "ict_nodes_table",
$nodesTabFields: {// table columns
table: [
@@ -228,115 +234,132 @@ var vm = avalon.define({ }
]
},
- $initNodesTable: function () {
+ $initNodesTable: function (tempId) {
var setting = {};
setting.language = vm.$language;
setting.paginate = true;
setting.info = true;
//setting.sort = true;
setting.columns = vm.nodesTab.nodesList.$nodesTabFields.table;
- setting.restUrl = vm.$restUrl.queryNodeTemplateUrl;
- setting.tableId = vm.nodesTab.nodesList.$nodesTabDataId;
+ setting.restUrl = "/openoapi/catalog/v1/servicetemplates/" + tempId + "/nodetemplates";
+ setting.tableId = vm.nodesTab.nodesList.$nodesTabDataId + "_" + tempId;
//serverPageTable.initTableWithData(setting,vm.nodesTab.nodesList.$nodesTabDataId + '_div',vm.nodesTab.nodesList.nodesData.$model);
- serverPageTable.initTableWithoutLib(setting, {}, vm.nodesTab.nodesList.$nodesTabDataId + '_div');
+ serverPageTable.initTableWithoutLib(setting, {}, setting.tableId + '_div');
},
- $format_Detail: function () {
- var sOut = '<div class="row-fluid" data-name="table_zone"><div class="col-xs-12" id="ict_nodes_table_div"></div></div>'
- vm.$initNodesData();
+ $format_Detail: function (oTable, nTr) {
+ var aData = oTable.fnGetData(nTr);
+ var tempId = aData.serviceTemplateId;
+ vm.nodesTab.nodesList.tempId = tempId;
+ var tableId = "ict_nodes_table" + "_" + tempId + "_div";
+ var sOut = '<div class="row-fluid" data-name="table_zone"><div class="col-xs-12" id="'+tableId+'"></div></div>'
+ vm.nodesTab.$initNodesData(tempId);
return sOut;
},
},
- //Nodes Details
- nodesDetail: {
- nodesTemplateDetailData: [],
- detailTitle: "",
- isShow: "none",
- detailIndex: 0,
- detailData: [
- {id: "general", name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-general"), isActive: true},
+ },
+ //Nodes Details
+ nodesDetail: {
+ nodesTemplateDetailData: [], //used in topo tab page to show node detail
+ detailTitle: "",
+ isShow: "none",
+ detailIndex: 0,
+ detailData: [
+ {id: "general", name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-general"), isActive: true},
+ {
+ id: "properties",
+ name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-properties"),
+ isActive: false
+ },
+ {
+ id: "relationShips",
+ name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-relationShips"),
+ isActive: false
+ }
+ ],
+ $showDetails: function (isShow, nodetypeid, nodetypename,tempId) {
+ vm.nodesDetail.isShow = isShow;
+ if (isShow == "block") {
+ vm.nodesDetail.detailTitle = nodetypename + " " + $.i18n.prop("nfv-templateDetail-nodesTab-iui-title-nodeDetail"),
+ $('#' + vm.nodesDetail.detailData[0].id).click();
+ vm.nodesDetail.detailData[0].isActive = true;
+ vm.nodesDetail.$initNodeDetailTable(nodetypeid,tempId);
+ }
+ },
+ detailCondChange: function (index) {
+ vm.nodesDetail.detailIndex = index;
+ for (var i = 0; i < vm.nodesDetail.detailData.length; i++) {
+ vm.nodesDetail.detailData[i].isActive = false;
+ }
+ vm.nodesDetail.detailData[index].isActive = true;
+ },
+ $tableFields : {// table columns
+ general: [
{
- id: "properties",
- name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-properties"),
- isActive: false
+ "mData": "key",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-key"),
+ "bSortable": false
},
{
- id: "relationShips",
- name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-relationShips"),
- isActive: false
+ "mData": "value",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-value"),
+ "bSortable": false
}
],
- $showDetails: function (isShow, nodetypeid, nodetypename) {
- vm.nodesTab.nodesDetail.isShow = isShow;
- if (isShow == "block") {
- vm.nodesTab.nodesDetail.detailTitle = nodetypename + " " + $.i18n.prop("nfv-templateDetail-nodesTab-iui-title-nodeDetail"),
- $('#' + vm.nodesTab.nodesDetail.detailData[0].id).click();
- vm.nodesTab.nodesDetail.detailData[0].isActive = true;
- vm.nodesTab.nodesDetail.$initNodeDetailTable(nodetypeid);
+ properties: [
+ {
+ "mData": "key",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-key"),
+ "bSortable": false
+ },
+ {
+ "mData": "value",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-value"),
+ "bSortable": false
}
- },
- detailCondChange: function (index) {
- vm.nodesTab.nodesDetail.detailIndex = index;
- for (var i = 0; i < vm.nodesTab.nodesDetail.detailData.length; i++) {
- vm.nodesTab.nodesDetail.detailData[i].isActive = false;
+ ],
+ relationShips: [
+ {
+ "mData": "sourceNodeName",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-sourceNodeName"),
+ "bSortable": false
+ },
+ {
+ "mData": "targetNodeName",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-targetNodeName"),
+ "bSortable": false
+ },
+ {
+ "mData": "type",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-type"),
+ "bSortable": false
}
- vm.nodesTab.nodesDetail.detailData[index].isActive = true;
- },
- $tableFields: {// table columns
- general: [
- {
- "mData": "key",
- "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-key"),
- "bSortable": false
- },
- {
- "mData": "value",
- "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-value"),
- "bSortable": false
- }
- ],
- properties: [
- {
- "mData": "key",
- "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-key"),
- "bSortable": false
- },
- {
- "mData": "value",
- "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-value"),
- "bSortable": false
- }
- ],
- relationShips: [
- {
- "mData": "sourceNodeName",
- "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-sourceNodeName"),
- "bSortable": false
- },
- {
- "mData": "targetNodeName",
- "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-targetNodeName"),
- "bSortable": false
- },
- {
- "mData": "type",
- "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-type"),
- "bSortable": false
- }
- ]
- },
- $initNodeDetailTable: function (nodetemplateid) {
- var data = topoUtil.getCurrentDetailData(vm.nodesTab.nodesDetail.nodesTemplateDetailData.$model, nodetemplateid);
- //initialize three tables of nodedetail
- $.each(vm.nodesTab.nodesDetail.$tableFields, function (key, value) {
- var setting = {};
- setting.language = vm.$language;
- setting.paginate = false;
- setting.info = false;
- setting.columns = value;
- setting.tableId = "ict_table_" + key;
- serverPageTable.initTableWithData(setting, setting.tableId + '_div', data[key]);
- });
- }
+ ]
+ },
+ $initNodeDetailTable: function (nodetemplateid,tempId) {
+ var data = topoUtil.getCurrentDetailData(vm.nodesTab.nodesList.nodesData[tempId], nodetemplateid);
+ //initialize three tables of nodedetail
+ $.each(vm.nodesDetail.$tableFields, function (key, value) {
+ var setting = {};
+ setting.language = vm.$language;
+ setting.paginate = false;
+ setting.info = false;
+ setting.columns = value;
+ setting.tableId = "ict_table_" + key;
+ serverPageTable.initTableWithData(setting, setting.tableId + '_div', data[key]);
+ });
+ },
+ $initTopoNodesDetailTable: function (nodetemplateid) {
+ var data = topoUtil.getCurrentDetailData(vm.nodesDetail.nodesTemplateDetailData.$model, nodetemplateid);
+ //initialize three tables of nodedetail
+ $.each(vm.nodesDetail.$tableFields, function (key, value) {
+ var setting = {};
+ setting.language = vm.$language;
+ setting.paginate = false;
+ setting.info = false;
+ setting.columns = value;
+ setting.tableId = "ict_table_" + key;
+ serverPageTable.initTableWithData(setting, setting.tableId + '_div', data[key]);
+ });
}
},
executionTab: {
@@ -383,7 +406,7 @@ var vm = avalon.define({ $init: function () {
vm.executionTab.$initEventsTable();
}
- },
+ }
});
@@ -401,7 +424,6 @@ var initParam = function () { //initialize template detail params if (flavor) {
vm.$restUrl.queryNodeTemplateUrl += "?flavor=" + flavor;
}
-
vm.$init();
}
};
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.js index 8e54ef3a..a3135fa2 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.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.
@@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
var tmDetailUtil = {};
tmDetailUtil.timer = null;
tmDetailUtil.nameRender = function(obj) {
- return '<a href="#" onclick="vm.nodesTab.nodesDetail.$showDetails('
- + '\'block\',\'' + obj.aData.id + '\', \'' + obj.aData.name + '\')">' + obj.aData.name + '</a>';
+ return '<a href="#" onclick="vm.nodesDetail.$showDetails('
+ + '\'block\',\'' + obj.aData.id + '\', \'' + obj.aData.name + '\',\'' + vm.nodesTab.nodesList.tempId + '\')">' + obj.aData.name + '</a>';
}
tmDetailUtil.inputsRender = function(obj) {
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js index d717c780..3a0d2853 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.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.
@@ -13,19 +13,18 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
var vm = avalon.define({
$id : "tmNodesController",
- templateId : "",
+ templateId : "", //store the Id of service template which shows in Topology tab page
$language: {
- "sProcessing": "<img src='../component/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span> "
- +$.i18n.prop("nfv-nso-iui-table-sProcess")+"</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"),
"sInfo": "<span class='seperator'> </span>" + $.i18n.prop("nfv-nso-iui-table-sInfo"),
"sInfoEmpty": $.i18n.prop("nfv-nso-iui-table-sInfoEmpty"),
"sGroupActions": $.i18n.prop("nfv-nso-iui-table-sGroupActions"),
- "sAjaxRequestGeneralError":$.i18n.prop("nfv-nso-iui-table-sAjaxRequestGeneralError"),
+ "sAjaxRequestGeneralError": $.i18n.prop("nfv-nso-iui-table-sAjaxRequestGeneralError"),
"sEmptyTable": $.i18n.prop("nfv-nso-iui-table-sEmptyTable"),
"oPaginate": {
"sPrevious": $.i18n.prop("nfv-nso-iui-table-sPrevious"),
@@ -34,52 +33,47 @@ var vm = avalon.define({ "sPageOf": $.i18n.prop("nfv-nso-iui-table-sPageOf")
}
},
- $restUrl : {
- queryNodeTemplateUrl : "/openoapi/catalog/v1/servicetemplates/{0}/nodetemplates",
- queryTemplateInfoUrl : "/openoapi/catalog/v1/servicetemplates"
+ $restUrl: {
+ queryNodeTemplateUrl: "/openoapi/catalog/v1/servicetemplates/{0}/nodetemplates",
+ queryTemplateInfoUrl: "/openoapi/catalog/v1/servicetemplates"
},
- $init : function() {
+ $init: function () {
vm.$initTemplateData();
- //vm.$initTopoNodesData();
- vm.$initNodesData();
},
- $initTemplateData : function() {
+ $initTemplateData: function () {
$.ajax({
- type : "GET",
- url : vm.$restUrl.queryTemplateInfoUrl,
- success : function(resp) {
- if(resp) {
+ type: "GET",
+ url: vm.$restUrl.queryTemplateInfoUrl,
+ success: function (resp) {
+ if (resp) {
vm.servicesTemplateData = [];
- for(var i=0; i<resp.length; i++) {
+ for (var i = 0; i < resp.length; i++) {
//generate node table display data
vm.servicesTemplateData.push(resp[i]);
}
vm.$initNfvNodesTab();
}
},
- error : function() {
+ error: function () {
commonUtil.showMessage($.i18n.prop("nfv-topology-iui-message-error"), "danger");
}
});
},
- $initNodesData : function() {
+ $initNodesData: function (tempId) {
$.ajax({
type: "GET",
- url: vm.$restUrl.queryNodeTemplateUrl,
+ //url: vm.$restUrl.queryNodeTemplateUrl,
+ url: "/openoapi/catalog/v1/servicetemplates/" + tempId + "/nodetemplates",
success: function (resp) {
if (resp) {
- vm.nodesDetail.nodesTemplateDetailData = [];
+ var nodesTempData = [];
for (var i = 0; i < resp.length; i++) {
//generate node table display data
var nodeTemplate = topoUtil.generateNodeTemplate(resp[i]);
- vm.nodesList.nodesData.push(nodeTemplate);
+ nodesTempData.push(nodeTemplate);
}
- vm.nodesDetail.nodesTemplateDetailData = resp;
- //generate topology graph display data
- //vm.topologyTab.topoTemplateData = topoUtil.generateTopoTemplate(vm.nodesList.nodesData.$model);
- //initialize topology data
- //topoUtil.initTopoData(vm.topologyTab.topoTemplateData.$model);
- vm.nodesList.$initNodesTable();
+ vm.nodesList.nodesData[tempId] = nodesTempData;
+ vm.nodesList.$initNodesTable(tempId);
}
},
error: function () {
@@ -88,8 +82,8 @@ var vm = avalon.define({ });
},
servicesTemplateData: [],
- $nodesTabId : "ict_nodes_template_table",
- $nodesTemplateTabFields : {// table columns
+ $nodesTabId: "ict_nodes_template_table",
+ $nodesTemplateTabFields: {// table columns
table: [
{"mData": "serviceTemplateId", name: "ID","bVisible": false},
{"mData": "", name: "","sClass": 'details-control'},
@@ -117,87 +111,149 @@ var vm = avalon.define({ tr.removeClass('shown');
}
else {
- table.fnOpen(tr[0], vm.nodesList.$format_Detail(), 'details');
+ table.fnOpen(tr[0], vm.nodesList.$format_Detail(table,tr[0]), 'details');
tr.addClass('shown');
}
});
},
//nodes list table
- nodesList :{
- nodesData: [],
- $nodesTabDataId : "ict_nodes_table",
- $nodesTabFields : {// table columns
+ nodesList: {
+ nodesData: {}, //used in Nodes tab page, to store nodes data of difference service template
+ tempId:"", //used in Nodes tab page,to store the node's templateId
+ $nodesTabDataId: "ict_nodes_table",
+ $nodesTabFields: {// table columns
table: [
{"mData": "id", name: "ID", "bVisible": false},
- {"mData": "name", name: $.i18n.prop("nfv-templateDetail-iui-field-nodetypename"), "bSortable": true, "fnRender" : tmNodesDetailUtil.nameRender},
+ {
+ "mData": "name",
+ name: $.i18n.prop("nfv-templateDetail-iui-field-nodetypename"),
+ "bSortable": true,
+ "fnRender": tmNodesDetailUtil.nameRender
+ },
{"mData": "type", name: $.i18n.prop("nfv-templateDetail-iui-field-type"), "bSortable": false},
- {"mData": "containedin", name: $.i18n.prop("nfv-templateDetail-iui-field-containedin"), "bSortable": false},
- {"mData": "deployedon", name: $.i18n.prop("nfv-templateDetail-iui-field-deployedon"), "bSortable": false},
- {"mData": "connectedto", name: $.i18n.prop("nfv-templateDetail-iui-field-connectedto"), "bSortable": false},
- {"mData": "virtuallinksto", name: $.i18n.prop("nfv-templateDetail-iui-field-virtuallinksto"), "bSortable": false}
+ {
+ "mData": "containedin",
+ name: $.i18n.prop("nfv-templateDetail-iui-field-containedin"),
+ "bSortable": false
+ },
+ {
+ "mData": "deployedon",
+ name: $.i18n.prop("nfv-templateDetail-iui-field-deployedon"),
+ "bSortable": false
+ },
+ {
+ "mData": "connectedto",
+ name: $.i18n.prop("nfv-templateDetail-iui-field-connectedto"),
+ "bSortable": false
+ },
+ {
+ "mData": "virtuallinksto",
+ name: $.i18n.prop("nfv-templateDetail-iui-field-virtuallinksto"),
+ "bSortable": false
+ }
]
},
- $initNodesTable: function () {
+ $initNodesTable: function (tempId) {
var setting = {};
setting.language = vm.$language;
setting.paginate = true;
setting.info = true;
setting.columns = vm.nodesList.$nodesTabFields.table;
- setting.restUrl = vm.$restUrl.queryNodeTemplateUrl;
- setting.tableId = vm.nodesList.$nodesTabDataId;
- serverPageTable.initTableWithoutLib(setting,{},vm.nodesList.$nodesTabDataId + '_div');
+ setting.restUrl = "/openoapi/catalog/v1/servicetemplates/" + tempId + "/nodetemplates";
+ setting.tableId = vm.nodesList.$nodesTabDataId + "_" + tempId;
+ //serverPageTable.initTableWithData(setting,vm.nodesList.$nodesTabDataId + '_div',vm.nodesList.nodesData.$model);
+ serverPageTable.initTableWithoutLib(setting, {}, setting.tableId + '_div');
},
- $format_Detail: function() {
- var sOut = '<div class="row-fluid" data-name="table_zone"><div class="col-xs-12" id="ict_nodes_table_div"></div></div>'
- vm.$initNodesData();
+ $format_Detail: function (oTable, nTr) {
+ var aData = oTable.fnGetData(nTr);
+ var tempId = aData.serviceTemplateId;
+ vm.nodesList.tempId = tempId;
+ var tableId = "ict_nodes_table" + "_" + tempId + "_div";
+ var sOut = '<div class="row-fluid" data-name="table_zone"><div class="col-xs-12" id="'+tableId+'"></div></div>'
+ vm.$initNodesData(tempId);
return sOut;
},
},
//Nodes Details
nodesDetail : {
- nodesTemplateDetailData: [],
- detailTitle : "",
- isShow : "none",
- detailIndex : 0,
- detailData : [
+ detailTitle: "",
+ isShow: "none",
+ detailIndex: 0,
+ detailData: [
{id: "general", name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-general"), isActive: true},
- {id: "properties", name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-properties"), isActive: false},
- {id: "relationShips", name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-relationShips"), isActive: false}
+ {
+ id: "properties",
+ name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-properties"),
+ isActive: false
+ },
+ {
+ id: "relationShips",
+ name: $.i18n.prop("nfv-templateDetail-nodesTab-iui-tab-relationShips"),
+ isActive: false
+ }
],
- $showDetails : function(isShow, nodetypeid, nodetypename) {
+ $showDetails: function (isShow, nodetypeid, nodetypename,tempId) {
vm.nodesDetail.isShow = isShow;
if (isShow == "block") {
vm.nodesDetail.detailTitle = nodetypename + " " + $.i18n.prop("nfv-templateDetail-nodesTab-iui-title-nodeDetail"),
$('#' + vm.nodesDetail.detailData[0].id).click();
vm.nodesDetail.detailData[0].isActive = true;
- vm.nodesDetail.$initNodeDetailTable(nodetypeid);
+ vm.nodesDetail.$initNodeDetailTable(nodetypeid,tempId);
}
},
- detailCondChange : function(index) {
+ detailCondChange: function (index) {
vm.nodesDetail.detailIndex = index;
- for(var i=0; i<vm.nodesDetail.detailData.length; i++) {
+ for (var i = 0; i < vm.nodesDetail.detailData.length; i++) {
vm.nodesDetail.detailData[i].isActive = false;
}
vm.nodesDetail.detailData[index].isActive = true;
},
$tableFields : {// table columns
general: [
- {"mData": "key", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-key"), "bSortable" : false},
- {"mData": "value", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-value"), "bSortable" : false}
+ {
+ "mData": "key",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-key"),
+ "bSortable": false
+ },
+ {
+ "mData": "value",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-value"),
+ "bSortable": false
+ }
],
properties: [
- {"mData": "key", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-key"), "bSortable" : false},
- {"mData": "value", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-value"), "bSortable" : false}
+ {
+ "mData": "key",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-key"),
+ "bSortable": false
+ },
+ {
+ "mData": "value",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-value"),
+ "bSortable": false
+ }
],
relationShips: [
- {"mData": "sourceNodeName", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-sourceNodeName"), "bSortable" : false},
- {"mData": "targetNodeName", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-targetNodeName"), "bSortable" : false},
- {"mData": "type", "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-type"), "bSortable" : false}
+ {
+ "mData": "sourceNodeName",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-sourceNodeName"),
+ "bSortable": false
+ },
+ {
+ "mData": "targetNodeName",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-targetNodeName"),
+ "bSortable": false
+ },
+ {
+ "mData": "type",
+ "name": $.i18n.prop("nfv-templateDetail-nodesTab-iui-field-type"),
+ "bSortable": false
+ }
]
},
- $initNodeDetailTable: function(nodetemplateid) {
- var data = topoUtil.getCurrentDetailData(vm.nodesDetail.nodesTemplateDetailData.$model, nodetemplateid);
+ $initNodeDetailTable: function (nodetemplateid,tempId) {
+ var data = topoUtil.getCurrentDetailData(vm.nodesList.nodesData[tempId], nodetemplateid);
//initialize three tables of nodedetail
$.each(vm.nodesDetail.$tableFields, function(key, value){
var setting = {};
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.js index ca71ce44..caa751ed 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.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.
@@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
var tmNodesDetailUtil = {};
tmNodesDetailUtil.timer = null;
tmNodesDetailUtil.nameRender = function(obj) {
return '<a href="#" onclick="vm.nodesDetail.$showDetails('
- + '\'block\',\'' + obj.aData.id + '\', \'' + obj.aData.name + '\')">' + obj.aData.name + '</a>';
+ + '\'block\',\'' + obj.aData.id + '\', \'' + obj.aData.name + '\',\'' + vm.nodesList.tempId + '\')">' + obj.aData.name + '</a>';
}
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js index 8395b715..d5977cea 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.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.
@@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
var vm = avalon.define({
$id : "tmTopoController",
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-catalog/src/main/webapp/catalog/js/template/tmUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmUtil.js index d15db04d..05768083 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmUtil.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmUtil.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.
@@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
var tmUtil = {};
tmUtil.nameRender = function(obj) {
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js index 2545314d..2c0561e0 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.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.
@@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-
var topoUtil = {};
topoUtil.topoDatas=[];
topoUtil.svgOffsetWidth = 0;
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html b/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html index 45056012..5a7abc5b 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html @@ -1,12 +1,12 @@ <!--
- 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.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -86,8 +86,8 @@ <script type="text/javascript" src="../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/template.html b/openo-portal/portal-catalog/src/main/webapp/catalog/template.html index 19a9b787..b9e43898 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/template.html +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/template.html @@ -1,12 +1,12 @@ <!--
- 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.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +15,6 @@ limitations under the License.
-->
-
<!DOCTYPE html>
<html>
<head lang="en">
@@ -54,7 +53,7 @@ <script type="text/javascript" src="../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootbox/bootbox.min.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
<script type="text/javascript" src="../common/thirdparty/avalon/avalon.modern.js"></script>
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html b/openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html index d4226ca2..0bd89197 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html @@ -1,12 +1,12 @@ <!--
- 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.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +15,6 @@ limitations under the License.
-->
-
<!DOCTYPE html>
<html>
<head lang="en">
@@ -70,10 +69,10 @@ </div>
</div>
- <div id="right-menu" class="ms-nodedetail" ms-css-display="nodesTab.nodesDetail.isShow">
+ <div id="right-menu" class="ms-nodedetail" ms-css-display="nodesDetail.isShow">
<div>
- <div class="title"><h4>{{nodesTab.nodesDetail.detailTitle}}</h4>
- <div class="rigth right-button-pointer" ms-click="nodesTab.nodesDetail.$showDetails('none')">
+ <div class="title"><h4>{{nodesDetail.detailTitle}}</h4>
+ <div class="rigth right-button-pointer" ms-click="nodesDetail.$showDetails('none')">
<button type="button" class="btn btn-default">
<span id="nfv-templateDetail-nodesTab-iui-btn-close" name_i18n="com_zte_nfv_nsoc_i18n"></span>
</button>
@@ -81,21 +80,21 @@ </div>
<div>
<div class="btn-group" >
- <button type="button" class="btn btn-default" ms-repeat="nodesTab.nodesDetail.detailData" ms-click="nodesTab.nodesDetail.detailCondChange($index)" ms-attr-id="el.id"
+ <button type="button" class="btn btn-default" ms-repeat="nodesDetail.detailData" ms-click="nodesDetail.detailCondChange($index)" ms-attr-id="el.id"
ms-class="active: el.isActive">{{el.name}}
</button>
</div>
- <div ms-if="nodesTab.nodesDetail.detailIndex === 0">
+ <div ms-if="nodesDetail.detailIndex === 0">
<div class="row-fluid" data-name="table_zone">
<div id='ict_table_general_div' class="nodesDetail"></div>
</div>
</div>
- <div ms-if="nodesTab.nodesDetail.detailIndex === 1">
+ <div ms-if="nodesDetail.detailIndex === 1">
<div class="row-fluid" data-name="table_zone">
<div id='ict_table_properties_div' class="nodesDetail"></div>
</div>
</div>
- <div ms-if="nodesTab.nodesDetail.detailIndex === 2">
+ <div ms-if="nodesDetail.detailIndex === 2">
<div class="row-fluid" data-name="table_zone">
<div id='ict_table_relationShips_div' class="nodesDetail"></div>
</div>
@@ -107,8 +106,8 @@ <script type="text/javascript" src="../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.min.js"></script>
+ <!--<script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.js"></script>-->
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/topology.html b/openo-portal/portal-catalog/src/main/webapp/catalog/topology.html index ceff55bf..cf4fbac8 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/topology.html +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/topology.html @@ -1,12 +1,12 @@ <!--
- 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.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html b/openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html index 9dff8ad2..b29a4162 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html @@ -1,12 +1,12 @@ <!--
- 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.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +15,6 @@ limitations under the License.
-->
-
<html>
<head lang="en">
<meta charset="UTF-8">
@@ -189,8 +188,8 @@ <script type="text/javascript" src="../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>
|