aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2017-02-22 17:38:43 +0000
committerGerrit Code Review <gerrit@open-o.org>2017-02-22 17:38:43 +0000
commit50e1131da2bb3a8876c1852ff43a180465a5ae53 (patch)
tree3efc164d5faabbdf2f317c0db6305ad564c7e99b
parent8959b0b4a1e3c2a115ac4151e8c92b9270314d1a (diff)
parent090dbb24c94253393be82300062d20e420fa98a0 (diff)
Merge "LCM service Mgmt code"
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html63
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/TopoAccor.html154
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/UnderLay_TP.html237
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html351
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/chartTopo.html268
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/conf/License.txt362
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/conf/dataconfig.json4
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html640
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/i18n/lcm-template-parameters-i18n-en-US.properties95
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/lcm_detail_nfvo_nodesinfo.html76
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/lcm_detail_nfvo_topology.html228
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/newShow.html179
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/overlayvpn.html291
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/overlayvpn_topo.html55
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/sdnovpn.html126
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/underlayvpn.html291
16 files changed, 0 insertions, 3420 deletions
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html
deleted file mode 100644
index bea24a5a..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- /* Copyright 2016-2017, Huawei Technologies Co., Ltd.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<!DOCTYPE html>
-<html>
-
-<head>
-
- <head lang="en">
- <meta charset="UTF-8">
- <title></title>
- <link href="css/bootstrap.min.css" rel="stylesheet"/>
- <link href="css/VMMain.css" rel="stylesheet"/>
- <link href="css/bootstrap-table.min.css" rel="stylesheet"/>
-
- <script type="text/javascript" src="js/jquery-1.11.2.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="js/bootstrap.min.js"></script>
- <script type="text/javascript" src="js/rest.js"></script>
- <script type="text/javascript" src="js/gsolcm.js"></script>
- <script type="text/javascript" src="js/bootstrap-table.min.js"></script>
- <script>
- $(document).ready(function () {
- new lcmHandler();
- $('[data-toggle="tooltip"]').tooltip();
-
- var params = new URLSearchParams(window.location.search.slice(1));
-
- var jsonData = JSON.parse((params.get("json")));
- if (jsonData != null) {
- document.getElementById("parametersDetail").innerHTML = convertInputsToUI('', 'show', jsonData.inputParameters);
- }
-
- });
- </script>
-
- <style>
- html, body {
- width: 99%;/*800px;*/
- }
- </style>
- </head>
-
-<body>
-<form class="form-horizontal" role="form">
-<div id="parametersDetail"></div>
-</form>
-</body>
-
-</html> \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/TopoAccor.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/TopoAccor.html
deleted file mode 100644
index 5f759945..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/TopoAccor.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <link href="css/bootstrap.min.css" rel="stylesheet" />
-
- <link href="css/bootstrap-table.min.css" rel="stylesheet" />
-
- <script type="text/javascript" src="js/jquery-1.11.2.min.js"></script>
- <script type="text/javascript" src="js/bootstrap.min.js"></script>
- <script type="text/javascript" src="js/rest.js"></script>
- <script type="text/javascript" src="js/bootstrap-table.min.js"></script>
- <script>
- $(document).ready(function () {
- var serviceId = getQueryStringValue("serviceId");
- console.log("TOPOAccor - serviceId : " + serviceId);
-
- $("#topoContObj").attr('data', 'chartTopo.html?serviceId='+serviceId);
- $("#nfvotopoContObj").attr('data', 'lcm_detail_nfvo_topology.html?serviceId='+serviceId);
- });
-
- function getQueryStringValue (key) {
- var params = new URLSearchParams(window.location.search.slice(1));
- return params.get(key);
- }
- function acordClick_sdno() {
- $("#topoContObj").show();
- $("#nfvotopoContObj").hide();
- }
- function acordClick_nfvo() {
- $("#nfvotopoContObj").show();
- $("#topoContObj").hide();
- }
-
- </script>
- <meta charset="utf-8">
- <title>JS Bin</title>
- <style>
- body {
- overflow: hidden;
- margin: 15px;
- }
- .panel-heading:hover {
- border: 1px solid #4ac9ff;
- color: #4ac9ff;
- }
-
- li:hover {
- cursor: pointer;
- color: #4ac9ff;
- }
- #accordion .glyphicon {
- margin-right: 10px;
- }
-
- .panel-collapse > .list-group .list-group-item:first-child {
- border-top-right-radius: 0;
- border-top-left-radius: 0;
- }
-
- .panel-collapse > .list-group .list-group-item {
- border-width: 1px 0;
- }
-
- .panel-collapse > .list-group {
- margin-bottom: 0;
- }
-
- .panel-collapse .list-group-item {
- border-radius: 0;
- }
-
- .panel-collapse .list-group .list-group {
- margin: 0;
- margin-top: 10px;
- }
-
- .panel-collapse .list-group-item li.list-group-item {
- margin: 0 -15px;
- border-top: 1px solid #ddd !important;
- border-bottom: 0;
- padding-left: 30px;
- }
-
- .panel-collapse .list-group-item li.list-group-item:last-child {
- padding-bottom: 0;
- }
-
- .panel-collapse div.list-group div.list-group {
- margin: 0;
- }
-
- .panel-collapse div.list-group .list-group a.list-group-item {
- border-top: 1px solid #ddd !important;
- border-bottom: 0;
- padding-left: 30px;
- }
-
- .panel-collapse .list-group-item li.list-group-item {
- border-top: 1px solid #DDD !important;
- }
-
- .selected {
- /*background-color: #ddd;*/
- color: #4ac9ff;
- }
- .panel-title>a {
- display: inline-block;
- width: 100%;
- }
-
- </style>
-</head>
-<body>
-
- <div class="row">
- <div class="col-sm-3" style="width: 18%; padding-right: 0;">
- <div class="panel-group" id="accordion">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a id="sdno" style="text-decoration:none;" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" onClick="acordClick_sdno();">
- SDNO
- </a>
- </h4>
- </div>
- </div>
- </div>
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a id="nfvo" style="text-decoration:none;" class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" onClick="acordClick_nfvo();">
- NFVO
- </a>
- </h4>
- </div>
- </div>
- </div>
- <div class="col-sm-3" style="width: 82%; padding-right: 0;">
- <div class="panel-body" style="padding: 0">
- <object id="topoContObj" data="chartTopo.html" width="100%" height="300" type="text/html">
-
- </object>
- </div>
- <div class="panel-body" style="padding: 0">
- <object id="nfvotopoContObj" data="lcm_detail_nfvo_topology.html" width="100%" height="300" type="text/html">
-
- </object>
- </div>
- </div>
- </div>
-
-
-</body>
-</html> \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/UnderLay_TP.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/UnderLay_TP.html
deleted file mode 100644
index 0a73cd7e..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/UnderLay_TP.html
+++ /dev/null
@@ -1,237 +0,0 @@
-
-<!-- /* Copyright 2016-2017, Huawei Technologies Co., Ltd.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<!DOCTYPE html>
-
-<html>
-
-<head lang="en">
- <meta charset="UTF-8">
- <title></title>
- <link href="css/bootstrap.min.css" rel="stylesheet" />
- <link href="css/VMMain.css" rel="stylesheet" />
- <link href="css/bootstrap-table.min.css" rel="stylesheet" />
- <script type="text/javascript" src="js/jquery-1.11.2.min.js"></script>
- <script type="text/javascript" src="js/bootstrap.min.js"></script>
- <script type="text/javascript" src="js/brs.js"></script>
- <script type="text/javascript" src="js/underlay.js"></script>
- <script type="text/javascript" src="js/bootstrap-table.min.js"></script>
- <script type="text/javascript" src="js/bootstrap-table-filter-control.min.js"></script>
- <style>
- .fixed-table-container tbody td .th-inner,
- .fixed-table-container thead th .th-inner {
- line-height: 4px;
- }
- .fixed-table-pagination .pagination-info {
- display: none !important;
- }
- .table tbody tr:hover td,
- .table tbody tr.odd:hover td {
- background-color: #e6fbe0 !important;
- }
- .delete-btn {
- background: url(delete.png) no-repeat !important;
- width: 16px;
- height: 16px;
- border: none;
- }
- table tr.openoTable_row_selected td {
- background: #e8f8fe!important;
- border-bottom: 1px solid #e8e8e8!important;
- }
- .container-fluid {
- padding-left: 10px;
- padding-right: 0px;
- }
- </style>
- <script type="text/javascript">
- $(document).ready(function() {
- var jsondata = loadUnderlayData();
- $('#tbl_overlay').bootstrapTable({
- //Assigning data to table
- data: jsondata
- });
- $('#underlayTpDataTable').bootstrapTable({
- //Assigning data to table
- data: {}
- });
- $('.table tbody tr').click(function() {
-
- $(this).addClass('openoTable_row_selected').siblings().removeClass('openoTable_row_selected');
- });
-
- $('#sai').on('sort.bs.table', function () {
-
-
- }).on('click-row.bs.table', function () {
-
-
- $('.table tbody tr').click(function() {
-
- $(this).addClass('openoTable_row_selected').siblings().removeClass('openoTable_row_selected');
- });
-
- });
- });
-
- function operateFormatter(value, row, index) {
- return [
- '<img class="siteDeleteImg" src="images/delete.png" href="javascript:void(0)" style="cursor: pointer" name="title" title="Delete" />'
- ].join('');
- }
- window.operateEvents = {
- 'click .siteDeleteImg': function(e, value, row, index) {
- // TO DO ajex call for delete
- console.log(value, row, index);
- }
- };
- /* function nameFormatter(value, row) {
- jsonForTP = row.json.data;
- var name=JSON.stringify(row.json.data);
- var temp = "<a class='underlayNameLink' onclick='getMethod(this)' name='"+ name + "' data-events='operateEventsU'>" + value + "</a>";
- return temp;
- }*/
- function getMethod(obj) {
- //Update the lower table here
- $('#underlayTpDataTable').bootstrapTable(
- //Assigning data to table
- "append", JSON.parse(obj.name)
- );
- }
- </script>
-
-</head>
-
-<body id="open_base_vpn_cotentBody" class="cotentBody ng-scope">
- <div class="container-fluid ms-controller">
- <h3>TP Details</h3>
- <!-- <div class="row-fluid" data-name="table_zone">
- <div id=''>
- <div>
- <div class="top">
- <table class="table table-striped" id="tbl_overlay" data-pagination="true" data-page-size="5" data-pagination-first-text="First" data-pagination-pre-text="Previous" data-pagination-next-text="Next" data-pagination-last-text="Last">
- <thead id="sunderlayTable_thead" class="openo-table-thead" style="background:#ECECEC">
- <tr class="active">
-
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="underlayType" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="underlayType_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">TP Name
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="underlayTenantName" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="underlayTenantName_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">PE Name
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="underlayType" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="underlayType_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">VLAN ID
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="underlayType" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="underlayType_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Site CIDR
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="underlayType" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="underlayType_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">IP
- </span>
- </div>
- </th>
-
- </tr>
- </thead>
- <tbody>
-
- <tr>
- <td>a_data </td>
- <td>data </td>
- <td>Sample1 </td>
- <td>Sample </td>
- <td>Sample1 </td>
- </tr>
-
- <tr>
- <td>b_data </td>
- <td>new sample </td>
- <td>modified </td>
- <td>Sample </td>
- <td>Sample1 </td>
- </tr>
-
- <tr>
- <td>alarm </td>
- <td>deleted </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample1 </td>
- </tr>
-
- <tr>
- <td>datanew </td>
- <td>Sample </td>
- <td>Sample1 </td>
- <td>Sample </td>
- <td>Sample1 </td>
- </tr>
- </tbody>
-
- </table>
- </div>
- </div>
- </div>
- </div> -->
-
- <div class="row-fluid" data-name="table_zone">
- <div id='ict_virtualApplication_table_div'>
- <div>
- <div class="top">
- <table class="table-striped table " id="sai" data-pagination="true" data-pagination-first-text="First"
- data-pagination-pre-text="Previous" data-pagination-next-text="Next" data-pagination-last-text="Last"
- data-filter-control="true">
- <thead style="background:#ECECEC">
- <tr>
- <th data-field="tname" data-sortable="true" data-filter-control="input">TP Name</th>
- <th data-field="pname" data-sortable="true" data-filter-control="input">PE Name</th>
- <th data-field="vlan" data-sortable="true" data-filter-control="input">VLAN ID</th>
- <th data-field="site" data-sortable="true" data-filter-control="input">Site CIDR</th>
- <th data-field="ip" data-sortable="true" data-filter-control="input">IP</th>
- </tr>
- </thead>
- </table>
- </div>
- </div>
- </div>
- </div>
-
-
-
- </div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html
deleted file mode 100644
index cf6b6394..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html
+++ /dev/null
@@ -1,351 +0,0 @@
-<!-- /* Copyright 2016-2017, Huawei Technologies Co., Ltd.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-<!DOCTYPE html>
-<html>
-
-<head lang="en">
- <meta charset="UTF-8">
- <title></title>
- <link href="css/bootstrap.min.css" rel="stylesheet"/>
- <link href="css/VMMain.css" rel="stylesheet"/>
- <script type="text/javascript" src="js/jquery-1.11.2.min.js"></script>
- <script type="text/javascript" src="js/bootstrap.min.js"></script>
- <script type="text/javascript" src="js/rest.js"></script>
-
- <script>
- $(document).ready(function () {
-
- $("#dashboard").hide();
- $("#nfvo_dashboard").hide()
- $("#overDiv").hide();
- $("#underDiv").hide();
-
- var serviceId = getQueryStringValue("serviceId");
- var serviceType = getQueryStringValue("serviceType");
-
- console.log("serviceId : " + serviceId);
-
- var jsonData = [];
- var object = {};
-
- if("SSAR" === serviceType)
- {
- object.nodeType = "sdn"
- jsonData[0] = object;
- }
- else if("NSAR" == serviceType || "NFAR" == serviceType || "NFVO" == serviceType)
- {
- object.nodeType = "nfv";
- jsonData[0] = object;
- }
- else{
- jsonData = loadServiceDetails(serviceId);
- }
-
-
-
- //TODO check for the type and update the tab
- console.log("jsonData length: " + jsonData.length);
- /* for (i = 0; i < jsonData.length; i++) {
- // console.log("jsonData Name: " + jsonData[i].nodeType);
- if (jsonData[i].nodeType.indexOf('sdn') != -1) {
- //$("#sdnoLink").text(jsonData[i].name.toUpperCase());
- console.log("Adding Accordian to SDNO");
- $("#accordion").append(addAccordionData("sdno", "SDNO"));
- }
- else if (jsonData[i].nodeType.indexOf('gso') != -1) {
- console.log("Adding Accordian to GSO");
- $("#accordion").append(addAccordionData("gso", "GSO"));
- }
- else if (jsonData[i].nodeType.indexOf('nfv') != -1) {
- console.log("Adding Accordian to NFVO");
- $("#accordion").append(addAccordionData("nfvo", "NFVO"));
- }
- else {
-
- }
- } */
-
- $("#overlayContObj").attr('data', 'overlayvpn.html?serviceId='+serviceId);
- $("#underlayContObj").attr('data', 'underlayvpn.html?serviceId='+serviceId);
-
- $("#nfvoContObj").attr('data', 'lcm_detail_nfvo_nodesinfo.html?serviceId='+serviceId);
- });
-
- function fnOver() {
- $("#dashboard").show();
- $("#overDiv").show();
- $("#underDiv").hide();
- }
-
- function fnUnder() {
- $("#dashboard").show();
- $("#overDiv").hide();
- $("#underDiv").show();
- }
-
- function clZte() {
- $("#dashboard").hide();
- }
-
- function fnLoadTblData(el, panelType) {
- console.log("panelType of "+el.id+" is "+panelType);
- var current = document.querySelector('.selected');
- if (current) {
- current.classList.remove('selected');
- }
- el.classList.add('selected');
- switch (panelType) {
- case "sdno":
- $("#nfvo_dashboard").hide();
- if(el.id == "overLink") {
- $("#dashboard").show();
- $("#overDiv").show();
- $("#underDiv").hide();
- } else if(el.id == "underLink"){
- $("#dashboard").show();
- $("#overDiv").hide();
- $("#underDiv").show();
- } else {
- $("#dashboard").hide();
- $("#overDiv").hide();
- $("#underDiv").hide();
- }
- break;
- case "gso":
- $("#dashboard").hide();
- $("#nfvo_dashboard").hide();
- $("#overDiv").hide();
- $("#underDiv").hide();
- break;
- case "nfvo":
- $("#dashboard").hide();
- $("#nfvo_dashboard").show();
- $("#overDiv").hide();
- $("#underDiv").hide();
- break;
- }
-
- }
-
- function getQueryStringValue(key) {
- var params = new URLSearchParams(window.location.search.slice(1));
- return params.get(key);
- }
-
- function addAccordionData(type, text) {
- var content = '';
- content += '<div class="panel panel-default"><div class="panel-heading">';
- content += '<h4 class="panel-title">';
- content += '<a style="text-decoration:none;" data-toggle="collapse" data-parent="#accordion" href="#collapseOne_'+type+'" onClick="fnLoadTblData(this, \''+type+'\');">';
- content += '<span id="sdnoLink">'+text+'</span></a>';
- content += '</h4></div>';
- if(type == "sdno") {
- content += '<div id="collapseOne_' + type + '" class="panel-collapse collapse in">';
- } else {
- content += '<div id="collapseOne_' + type + '" class="panel-collapse collapse">';
- }
- content += '<ul class="list-group">';
-
- if(type == "sdno") {
- content += '<li onClick="fnLoadTblData(this, \''+type+'\');" id="overLink" class="list-group-item selected"><span class="glyphicon glyphicon-pencil text-primary"></span><span>Overlay VPN</span>';
- content += '</li>';
- content += '<li id="underLink" onClick="fnLoadTblData(this, \''+type+'\');" class="list-group-item"><span class="glyphicon glyphicon-pencil text-primary"></span><span>Underlay VPN</span>';
- content += '</li>';
- }
- else if(type == "gso"){
- content += '<li onClick="fnLoadTblData(this, \''+type+'\');" id="linkgso" class="list-group-item"><span class="glyphicon glyphicon-pencil text-primary"></span><span>OPEN-O</span></li>';
- }
- else if(type == "nfvo"){
- //content += '<li onClick="fnLoadTblData(this, \''+type+'\');" id="linknfvo" class="list-group-item"><span class="glyphicon glyphicon-pencil text-primary"></span><span>ZTE</span></li>';
- }
- content += '</ul></div></div>';
- return content;
- }
- </script>
-
- <style>
- body {
- overflow: hidden;
- }
-
- .panel-heading:hover {
- border: 1px solid #4ac9ff;
- color: #4ac9ff;
- }
-
- li:hover {
- cursor: pointer;
- color: #4ac9ff;
- }
-
- body {
- margin: 15px;
- }
-
- #accordion .glyphicon {
- margin-right: 10px;
- }
-
- .panel-collapse > .list-group .list-group-item:first-child {
- border-top-right-radius: 0;
- border-top-left-radius: 0;
- }
-
- .panel-collapse > .list-group .list-group-item {
- border-width: 1px 0;
- }
-
- .panel-collapse > .list-group {
- margin-bottom: 0;
- }
-
- .panel-collapse .list-group-item {
- border-radius: 0;
- }
-
- .panel-collapse .list-group .list-group {
- margin: 0;
- margin-top: 10px;
- }
-
- .panel-collapse .list-group-item li.list-group-item {
- margin: 0 -15px;
- border-top: 1px solid #ddd !important;
- border-bottom: 0;
- padding-left: 30px;
- }
-
- .panel-collapse .list-group-item li.list-group-item:last-child {
- padding-bottom: 0;
- }
-
- .panel-collapse div.list-group div.list-group {
- margin: 0;
- }
-
- .panel-collapse div.list-group .list-group a.list-group-item {
- border-top: 1px solid #ddd !important;
- border-bottom: 0;
- padding-left: 30px;
- }
-
- .panel-collapse .list-group-item li.list-group-item {
- border-top: 1px solid #DDD !important;
- }
-
- .selected {
- /*background-color: #ddd;*/
- color: #4ac9ff;
- }
- .panel-title>a {
- display: inline-block;
- width: 100%;
- }
- </style>
-</head>
-</body>
-<div class="">
- <div class="row">
- <div class="col-sm-3" style="width:18%; padding-right: 0;">
- <div class="panel-group" id="accordion">
- <!--<div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a style="text-decoration:none;" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
- <span id="sdnoLink">SDNO1223</span></a>
- </h4>
- </div>
- <div id="collapseOne" class="panel-collapse collapse in">
- <ul class="list-group">
- <li onClick="fnOver();" id="overLink" class="list-group-item"><span class="glyphicon glyphicon-pencil text-primary"></span><span>Overlay VPN</span>
-
- </li>
- <li id="underLink" onClick="fnUnder();" class="list-group-item"><span class="glyphicon glyphicon-pencil text-primary"></span><span>Underlay VPN</span>
-
- </li>
-
- </ul>
- </div>
- </div>
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a style="text-decoration:none;" data-toggle="collapse" data-parent="#accordion" href="#collapseFour">
- </span>NFVO</a>
- </h4>
- </div>
- <div id="collapseFour" class="panel-collapse collapse">
- <div class="list-group">
- <li onClick="clZte();" id="underLink" class="list-group-item"><span class="glyphicon glyphicon-pencil text-primary"></span><span>ZTE</span>
-
- </li>
-
- </div>
- </div>
- </div>-->
-
- </div>
- </div>
- <div class="col-sm-3" style="width:82%; padding: 0;">
- <div id="dashboard" class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">SDNO-VPN Manager</h3>
- </div>
- <div class="panel-body" style="height: 250px; overflow: auto; padding: 0; background-color: #fafafa">
-
- <div id="overDiv">
- <!--<iframe src="overlayvpn.html" style="width:100%;height:450px;" name="targetframe"
- allowTransparency="true" scrolling="no" frameborder="0">
- </iframe>-->
- <object id="overlayContObj" data="overlayvpn.html" width="100%" height="450px" type="text/html">
-
- </object>
- </div>
- <div id="underDiv">
- <!--<iframe src="underlayvpn.html" style="width:100%;height:500px;" name="targetframe"
- allowTransparency="true" scrolling="no" frameborder="0">
- </iframe>-->
- <object id="underlayContObj" data="underlayvpn.html" width="100%" height="450px" type="text/html">
-
- </object>
- </div>
- </div>
- </br>
- </div>
-
- <div id="nfvo_dashboard" class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">NFVO</h3>
- </div>
- <div class="panel-body" style="height: 250px; overflow: auto; padding: 0; background-color: #fafafa">
- <div id="nodesInfo">
- <object id="nfvoContObj" data="lcm_detail_nfvo_nodesinfo.html" width="100%" height="450px" type="text/html">
-
- </object>
- </div>
- </div>
- </br>
- </div>
-
- </div>
- </div>
-</div>
-</div>
-</br>
-</body>
-
-</html> \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/chartTopo.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/chartTopo.html
deleted file mode 100644
index 9423b584..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/chartTopo.html
+++ /dev/null
@@ -1,268 +0,0 @@
-
-<!-- /* Copyright 2016-2017, Huawei Technologies Co., Ltd.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<!DOCTYPE html>
-<html>
-
-<head lang="en">
- <meta charset="UTF-8">
- <title></title>
- <link href="css/bootstrap.min.css" rel="stylesheet" />
- <link href="css/VMMain.css" rel="stylesheet" />
- <link href="css/bootstrap-table.min.css" rel="stylesheet" />
-
- <script type="text/javascript" src="js/jquery-1.11.2.min.js"></script>
- <script type="text/javascript" src="js/bootstrap.min.js"></script>
- <script type="text/javascript" src="js/rest.js"></script>
- <script type="text/javascript" src="js/bootstrap-table.min.js"></script>
- <script type="text/javascript" src="js/jquery-ui-1.12.1.min.js"> </script>
- <link href="css/jquery-ui-1.12.1.min.css" rel="stylesheet" />
-
-
- <script src="js/topo/sigma/sigma.min.js"></script>
- <script src="js/topo/sigma/sigma.renderers.edgeLabels.min.js"></script>
-
-
- <style>
- body {
- overflow: hidden;
- }
- .panel-heading:hover {
- border: 1px solid #4ac9ff;
- color: #4ac9ff;
- }
- li:hover {
- cursor: pointer;
- color: #4ac9ff;
- }
- body {
- margin: 15px;
- }
- #accordion .glyphicon {
- margin-right: 10px;
- }
- .panel-collapse>.list-group .list-group-item:first-child {
- border-top-right-radius: 0;
- border-top-left-radius: 0;
- }
- .panel-collapse>.list-group .list-group-item {
- border-width: 1px 0;
- }
- .panel-collapse>.list-group {
- margin-bottom: 0;
- }
- .panel-collapse .list-group-item {
- border-radius: 0;
- }
- .panel-collapse .list-group .list-group {
- margin: 0;
- margin-top: 10px;
- }
- .panel-collapse .list-group-item li.list-group-item {
- margin: 0 -15px;
- border-top: 1px solid #ddd !important;
- border-bottom: 0;
- padding-left: 30px;
- }
- .panel-collapse .list-group-item li.list-group-item:last-child {
- padding-bottom: 0;
- }
- .panel-collapse div.list-group div.list-group {
- margin: 0;
- }
- .panel-collapse div.list-group .list-group a.list-group-item {
- border-top: 1px solid #ddd !important;
- border-bottom: 0;
- padding-left: 30px;
- }
- .panel-collapse .list-group-item li.list-group-item {
- border-top: 1px solid #DDD !important;
- }
- </style>
- <script>
-
- $(function () {
- var serviceId = getQueryStringValue("serviceId");
- console.log("TOPO - serviceId : "+ serviceId);
-
-
-
- $('#container').highcharts({
- chart: {
- backgroundColor: 'rgb(250,250,250)',
- events: {
- load: function () {
-
-
- var ren = this.renderer,
- colors = Highcharts.getOptions().colors,
- rightArrow = ['M', 0, 0, 'L', 100, 0, 'L', 95, 5, 'M', 100, 0, 'L', 95, -5],
- leftArrow = ['M', 100, 0, 'L', 0, 0, 'L', 5, 5, 'M', 0, 0, 'L', 5, -5];
-
-
- ren.label('vCpe Name', 10, 82)
- .attr({
- fill: colors[0],
- stroke: 'white',
- 'stroke-width': 2,
- padding: 5,
- r: 5
- })
- .css({
- color: 'white'
- })
- .add()
- .shadow(true);
-
-
- ren.path(rightArrow)
- .attr({
- 'stroke-width': 1,
- stroke: colors[1]
- })
- .translate(95, 95)
- .add();
-
- ren.label('', 50, 75)
- .css({
- fontSize: '10px',
- color: colors[3]
- })
- .add();
-
-
-
- ren.label('Site Name', 210, 82)
- .attr({
- fill: colors[0],
- stroke: 'white',
- 'stroke-width': 2,
- padding: 5,
- r: 5
- })
- .css({
- color: 'white'
- })
- .add()
- .shadow(true);
-
-
- ren.label('DC Name', 420, 82)
- .attr({
- fill: colors[0],
- stroke: 'white',
- 'stroke-width': 2,
- padding: 5,
- r: 5
- })
- .css({
- color: 'white'
- })
- .add()
- .shadow(true);
-
- ren.label('VPC', 620, 82)
- .attr({
- fill: colors[0],
- stroke: 'white',
- 'stroke-width': 2,
- padding: 5,
- r: 5
- })
- .css({
- color: 'white'
- })
- .add()
- .shadow(true);
-
-
-
- ren.path(rightArrow)
- .attr({
- 'stroke-width': 1,
- stroke: colors[1]
- })
- .translate(300, 95)
- .add();
-
- ren.path(rightArrow)
- .attr({
- 'stroke-width': 1,
- stroke: colors[1]
- })
- .translate(500, 95)
- .add();
-
-
- }
- }
- },
- title: {
- text: 'SDNO-TOPO',
- style: {
- color: 'black'
- }
- }
-
- });
- function addAccordionData(paneltype, text){
- var content = '';
- content += '<div id="panel_'+paneltype+'" class="panel panel-default" onclick="acordClick(\''+paneltype+'\');"><div class="panel-heading">';
- content += '<h4 class="panel-title">';
- content += '<a style="text-decoration:none;" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">';
- content += '<span id="sdnoLink">'+text+'</span></a>';
- content += '</h4></div>';
- content += '</div></div>';
- return content;
- }
- function getQueryStringValue (key) {
- var params = new URLSearchParams(window.location.search.slice(1));
- return params.get(key);
- }
- });
- function acordClick(panelType) {
- //TODO: Act according to the panelType. value may be sdno, gso or nfvo
- console.log(panelType + " Clicked");
- }
- </script>
-
- <style>
-hr{
- margin:1px;
-}
-</style>
-</head>
-
-
-<body>
-<div class="">
- <div class="row">
- <div class="col-sm-3" style="width:18%">
- <div class="panel-group" id="accordion">
- </div>
- </div>
- <div class="col-sm-3" id="dashboard" style="width:82%">
- <div id="container" style="width: 750px; height: 250px; margin: 0 auto; display: inline-block;"> </div>
- </div>
- </div>
-</div>
-
-
-
-
-</body>
-</html>
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/conf/License.txt b/lifecyclemgr/src/main/webapp/lifecyclemgr/conf/License.txt
deleted file mode 100644
index 8e698ecb..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/conf/License.txt
+++ /dev/null
@@ -1,362 +0,0 @@
-THIS LICENSE FILE CONTAINS THE LICENSE APPLICABLE DEPENDING ON THE TYPE OF CONTRIBUTIONS.
-
-APACHE LICENSE 2 IS APPLICABLE FOR SOURCE CODE, CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL FOR DOCUMENTATION
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-
-Apache License Version 2.0, January 2004 http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of this License; and You must cause any modified files to carry prominent notices stating that You changed the files; and You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Attribution 4.0 International
-
-https://creativecommons.org/licenses/by/4.0/legalcode
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an "as-is" basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
-
- Considerations for licensors: Our public licenses are
- intended for use by those authorized to give the public
- permission to use material in ways otherwise restricted by
- copyright and certain other rights. Our licenses are
- irrevocable. Licensors should read and understand the terms
- and conditions of the license they choose before applying it.
- Licensors should also secure all rights necessary before
- applying our licenses so that the public can reuse the
- material as expected. Licensors should clearly mark any
- material not subject to the license. This includes other CC-
- licensed material, or material used under an exception or
- limitation to copyright. More considerations for licensors:
- wiki.creativecommons.org/Considerations_for_licensors
- Considerations for the public: By using one of our public
- licenses, a licensor grants the public permission to use the
- licensed material under specified terms and conditions. If
- the licensor's permission is not necessary for any reason--for
- example, because of any applicable exception or limitation to
- copyright--then that use is not regulated by the license. Our
- licenses grant only permissions under copyright and certain
- other rights that a licensor has authority to grant. Use of
- the licensed material may still be restricted for other
- reasons, including because others have copyright or other
- rights in the material. A licensor may make special requests,
- such as asking that all changes be marked or described.
- Although not required by our licenses, you are encouraged to
- respect those requests where reasonable. More_considerations
- for the public:
- wiki.creativecommons.org/Considerations_for_licensees
-Creative Commons Attribution 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
-
-
-Section 1 -- Definitions.
-
- a. Adapted Material means material subject to Copyright and Similar
- Rights that is derived from or based upon the Licensed Material
- and in which the Licensed Material is translated, altered,
- arranged, transformed, or otherwise modified in a manner requiring
- permission under the Copyright and Similar Rights held by the
- Licensor. For purposes of this Public License, where the Licensed
- Material is a musical work, performance, or sound recording,
- Adapted Material is always produced where the Licensed Material is
- synched in timed relation with a moving image.
- b. Adapter's License means the license You apply to Your Copyright
- and Similar Rights in Your contributions to Adapted Material in
- accordance with the terms and conditions of this Public License.
- c. Copyright and Similar Rights means copyright and/or similar rights
- closely related to copyright including, without limitation,
- performance, broadcast, sound recording, and Sui Generis Database
- Rights, without regard to how the rights are labeled or
- categorized. For purposes of this Public License, the rights
- specified in Section 2(b)(1)-(2) are not Copyright and Similar
- Rights.
- d. Effective Technological Measures means those measures that, in the
- absence of proper authority, may not be circumvented under laws
- fulfilling obligations under Article 11 of the WIPO Copyright
- Treaty adopted on December 20, 1996, and/or similar international
- agreements.
- e. Exceptions and Limitations means fair use, fair dealing, and/or
- any other exception or limitation to Copyright and Similar Rights
- that applies to Your use of the Licensed Material.
- f. Licensed Material means the artistic or literary work, database,
- or other material to which the Licensor applied this Public
- License.
- g. Licensed Rights means the rights granted to You subject to the
- terms and conditions of this Public License, which are limited to
- all Copyright and Similar Rights that apply to Your use of the
- Licensed Material and that the Licensor has authority to license.
- h. Licensor means the individual(s) or entity(ies) granting rights
- under this Public License.
- i. Share means to provide material to the public by any means or
- process that requires permission under the Licensed Rights, such
- as reproduction, public display, public performance, distribution,
- dissemination, communication, or importation, and to make material
- available to the public including in ways that members of the
- public may access the material from a place and at a time
- individually chosen by them.
- j. Sui Generis Database Rights means rights other than copyright
- resulting from Directive 96/9/EC of the European Parliament and of
- the Council of 11 March 1996 on the legal protection of databases,
- as amended and/or succeeded, as well as other essentially
- equivalent rights anywhere in the world.
- k. You means the individual or entity exercising the Licensed Rights
- under this Public License. Your has a corresponding meaning.
-
-Section 2 -- Scope.
-
- a. License grant.
- 1. Subject to the terms and conditions of this Public License,
- the Licensor hereby grants You a worldwide, royalty-free,
- non-sublicensable, non-exclusive, irrevocable license to
- exercise the Licensed Rights in the Licensed Material to:
- a. reproduce and Share the Licensed Material, in whole or
- in part; and
- b. produce, reproduce, and Share Adapted Material.
- 2. Exceptions and Limitations. For the avoidance of doubt, where
- Exceptions and Limitations apply to Your use, this Public
- License does not apply, and You do not need to comply with
- its terms and conditions.
- 3. Term. The term of this Public License is specified in Section
- 6(a).
- 4. Media and formats; technical modifications allowed. The
- Licensor authorizes You to exercise the Licensed Rights in
- all media and formats whether now known or hereafter created,
- and to make technical modifications necessary to do so. The
- Licensor waives and/or agrees not to assert any right or
- authority to forbid You from making technical modifications
- necessary to exercise the Licensed Rights, including
- technical modifications necessary to circumvent Effective
- Technological Measures. For purposes of this Public License,
- simply making modifications authorized by this Section 2(a)
- (4) never produces Adapted Material.
- 5. Downstream recipients.
- a. Offer from the Licensor -- Licensed Material. Every
- recipient of the Licensed Material automatically
- receives an offer from the Licensor to exercise the
- Licensed Rights under the terms and conditions of this
- Public License.
- b. No downstream restrictions. You may not offer or impose
- any additional or different terms or conditions on, or
- apply any Effective Technological Measures to, the
- Licensed Material if doing so restricts exercise of the
- Licensed Rights by any recipient of the Licensed
- Material.
- 6. No endorsement. Nothing in this Public License constitutes or
- may be construed as permission to assert or imply that You
- are, or that Your use of the Licensed Material is, connected
- with, or sponsored, endorsed, or granted official status by,
- the Licensor or others designated to receive attribution as
- provided in Section 3(a)(1)(A)(i).
- b. Other rights.
- 1. Moral rights, such as the right of integrity, are not
- licensed under this Public License, nor are publicity,
- privacy, and/or other similar personality rights; however, to
- the extent possible, the Licensor waives and/or agrees not to
- assert any such rights held by the Licensor to the limited
- extent necessary to allow You to exercise the Licensed
- Rights, but not otherwise.
- 2. Patent and trademark rights are not licensed under this
- Public License.
- 3. To the extent possible, the Licensor waives any right to
- collect royalties from You for the exercise of the Licensed
- Rights, whether directly or through a collecting society
- under any voluntary or waivable statutory or compulsory
- licensing scheme. In all other cases the Licensor expressly
- reserves any right to collect such royalties.
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the following conditions.
-
- a. Attribution.
- 1. If You Share the Licensed Material (including in modified
- form), You must:
- a. retain the following if it is supplied by the Licensor
- with the Licensed Material:
- i. identification of the creator(s) of the Licensed
- Material and any others designated to receive
- attribution, in any reasonable manner requested by
- the Licensor (including by pseudonym if
- designated);
- ii. a copyright notice;
- iii. a notice that refers to this Public License;
- iv. a notice that refers to the disclaimer of
- warranties;
- v. a URI or hyperlink to the Licensed Material to the
- extent reasonably practicable;
- b. indicate if You modified the Licensed Material and
- retain an indication of any previous modifications; and
- c. indicate the Licensed Material is licensed under this
- Public License, and include the text of, or the URI or
- hyperlink to, this Public License.
- 2. You may satisfy the conditions in Section 3(a)(1) in any
- reasonable manner based on the medium, means, and context in
- which You Share the Licensed Material. For example, it may be
- reasonable to satisfy the conditions by providing a URI or
- hyperlink to a resource that includes the required
- information.
- 3. If requested by the Licensor, You must remove any of the
- information required by Section 3(a)(1)(A) to the extent
- reasonably practicable.
- 4. If You Share Adapted Material You produce, the Adapter's
- License You apply must not prevent recipients of the Adapted
- Material from complying with this Public License.
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
-
- a. for the avoidance of doubt, Section 2(a)(1) grants You the right
- to extract, reuse, reproduce, and Share all or a substantial
- portion of the contents of the database;
- b. if You include all or a substantial portion of the database
- contents in a database in which You have Sui Generis Database
- Rights, then the database in which You have Sui Generis Database
- Rights (but not its individual contents) is Adapted Material; and
- c. You must comply with the conditions in Section 3(a) if You Share
- all or a substantial portion of the contents of the database.
-For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
- a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
- EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
- AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
- ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
- IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
- WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
- PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
- ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
- KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
- ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
- b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
- TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
- NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
- INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
- COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
- USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
- ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
- DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
- IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
- c. The disclaimer of warranties and limitation of liability provided
- above shall be interpreted in a manner that, to the extent
- possible, most closely approximates an absolute disclaimer and
- waiver of all liability.
-
-Section 6 -- Term and Termination.
-
- a. This Public License applies for the term of the Copyright and
- Similar Rights licensed here. However, if You fail to comply with
- this Public License, then Your rights under this Public License
- terminate automatically.
- b. Where Your right to use the Licensed Material has terminated under
- Section 6(a), it reinstates:
- 1. automatically as of the date the violation is cured, provided
- it is cured within 30 days of Your discovery of the
- violation; or
- 2. upon express reinstatement by the Licensor.
- For the avoidance of doubt, this Section 6(b) does not affect any
- right the Licensor may have to seek remedies for Your violations
- of this Public License.
- c. For the avoidance of doubt, the Licensor may also offer the
- Licensed Material under separate terms or conditions or stop
- distributing the Licensed Material at any time; however, doing so
- will not terminate this Public License.
- d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
- License.
-
-Section 7 -- Other Terms and Conditions.
-
- a. The Licensor shall not be bound by any additional or different
- terms or conditions communicated by You unless expressly agreed.
- b. Any arrangements, understandings, or agreements regarding the
- Licensed Material not stated herein are separate from and
- independent of the terms and conditions of this Public License.
-
-Section 8 -- Interpretation.
-
- a. For the avoidance of doubt, this Public License does not, and
- shall not be interpreted to, reduce, limit, restrict, or impose
- conditions on any use of the Licensed Material that could lawfully
- be made without permission under this Public License.
- b. To the extent possible, if any provision of this Public License is
- deemed unenforceable, it shall be automatically reformed to the
- minimum extent necessary to make it enforceable. If the provision
- cannot be reformed, it shall be severed from this Public License
- without affecting the enforceability of the remaining terms and
- conditions.
- c. No term or condition of this Public License will be waived and no
- failure to comply consented to unless expressly agreed to by the
- Licensor.
- d. Nothing in this Public License constitutes or may be interpreted
- as a limitation upon, or waiver of, any privileges and immunities
- that apply to the Licensor or You, including from the legal
- processes of any jurisdiction or authority.
-Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the "Licensor." The text of the Creative Commons public licenses is dedicated to the public domain under the CC0 Public Domain Dedication. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark "Creative Commons" or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
-
-Creative Commons may be contacted at creativecommons.org. \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/conf/dataconfig.json b/lifecyclemgr/src/main/webapp/lifecyclemgr/conf/dataconfig.json
deleted file mode 100644
index b39c904e..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/conf/dataconfig.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "url": "http://localhost",
- "port": "8080"
-} \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html
deleted file mode 100644
index e457f291..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html
+++ /dev/null
@@ -1,640 +0,0 @@
-<!--
-
- Copyright 2016-2017, Huawei Technologies Co., Ltd.
-
- 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
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Lifecycle Manager</title>
- <link href="css/bootstrap.min.css" rel="stylesheet"/>
- <link href="css/VMMain.css" rel="stylesheet"/>
- <link href="css/bootstrap-table.min.css" rel="stylesheet"/>
- <script type="text/javascript" src="js/jquery-1.11.2.min.js"></script>
- <script type="text/javascript" src="js/bootstrap.min.js"></script>
- <script type="text/javascript" src="js/rest.js"></script>
- <script type="text/javascript" src="js/bootstrap-table.min.js"></script>
- <script type="text/javascript" src="js/gsolcm.js"></script>
- <script type="text/javascript" src="../common/thirdparty/bootbox/bootbox.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="js/jquery.bootstrap-growl.min.js"></script>
- <script type="text/javascript" src="js/jquery.isloading.min.js"></script>
- <script type="text/javascript" src="js/jquery-ui-1.12.1.min.js"></script>
- <script type="text/javascript" src="js/dialog-min.js"></script>
- <link href="css/jquery-ui-1.12.1.min.css" rel="stylesheet" />
- <script type="text/javascript" src="js/bootstrap-table-filter-control.min.js"></script>
- <script type="text/javascript">
- $(document).ready(function () {
- new lcmHandler();
-
- $('.modal-dialog').draggable();
- // $("#detailCont").show();
- var jsondata = loadGetServiceData();
-
- $.each(jsondata,function(k,v){
- jsondata[k].createTime= new Date(jsondata[k].createTime).toUTCString();
- });
-
- $('#sai').bootstrapTable({
- //Assigning data to table
- data: jsondata
- });
- $('.table tbody tr').click(function() {
- $(this).addClass('openoTable_row_selected').siblings().removeClass('openoTable_row_selected');
- })
-
- $('.detail-top ul li').click(function() {
- $(this).addClass('current').siblings().removeClass('current');
- });
- $("#topoCont").hide();
- $("#inpCont").show();
- $("#topoContMod").hide();
- $("#detailContMod").hide();
- $("#inpContMod").show();
-
- $('#sai').bootstrapTable({}) .on('click-row.bs.table', function (e, row, $element) {
- var newURL = "accorTables.html?serviceId="+row.serviceId + "&serviceType="+row.serviceType;
- // var newURL = "accorTables.html?serviceId="+row.serviceId ;
- console.log("URL: "+newURL);
- document.getElementById("tabContainer").style.display = "none";
- document.getElementById("detailConObj").setAttribute('data', newURL);
- document.getElementById("detailContDlg").setAttribute('data', newURL);
- document.getElementById("tabContainer").style.display = "block";
-
- //loadIframe("topoFrame", "chartTopo.html?serviceId="+row.serviceId);
- document.getElementById("topoContObj").setAttribute('data', 'TopoAccor.html?serviceId='+row.serviceId);
- document.getElementById("topoContDlg").setAttribute('data', 'TopoAccor.html?serviceId='+row.serviceId);
- document.getElementById('inputcontent').setAttribute('data', 'InputData.html?json='+ JSON.stringify(row));
- document.getElementById('inputcontentDlg').setAttribute('data', 'InputData.html?json='+ JSON.stringify(row));
- });
-
- });
-
- function operateFormatter(value, row, index) {
- return [
- '<img class="siteDeleteImg" src="images/delete.png" href="javascript:void(0)" style="cursor: pointer" name="title" title="Delete" />'
- ].join('');
- }
-
- function operateFormatterServiceName(value, row, index){
- var temp = row.serviceId;
- return [
- '<a data-toggle="modal" href="#ModifyModal" style="text-decoration:underline" onclick="return anchorClick(' + temp + ')">' + value + '</a>'
- ].join('');
- }
- window.operateEvents = {
- 'click .siteDeleteImg': function (e, value, row, index) {
- // TO DO ajex call for delete
- var result = deleteService(row.id, row);
- }
- };
-
- function hideBasic() {
- $("#basicInfoTab").hide();
- initParameterTab();
- $("#templateParameterTab").show();
- }
-
- function showBasic() {
- $("#basicInfoTab").show();
- $("#templateParameterTab").hide();
- }
-
- function serviceTemplateChanged() {
- templateParameters.changed = true;
- }
-
- function showTopoCont() {
- $("#topoCont").show();
- $("#detailCont").hide();
- $("#inpCont").hide();
- }
-
- function showDetCont() {
- $("#topoCont").hide();
- $("#detailCont").show();
- $("#inpCont").hide();
- }
-
- function showInpCont() {
- $("#topoCont").hide();
- $("#detailCont").hide();
- $("#inpCont").show();
- }
-
- function showTopoContMod() {
- $("#topoContMod").show();
- $("#detailContMod").hide();
- $("#inpContMod").hide();
- }
-
- function showDetContMod() {
- $("#topoContMod").hide();
- $("#detailContMod").show();
- $("#inpContMod").hide();
- }
-
- function showInpContMod() {
- $("#topoContMod").hide();
- $("#detailContMod").hide();
- $("#inpContMod").show();
- }
-
- function loadIframe(iframeName, url) {
- var $iframe = $('#' + iframeName);
- if ( $iframe.length ) {
- $iframe.attr('src',url);
- $iframe.style.height = "400px";
- return false;
- }
- return true;
- }
- </script>
- <style>
- .nav-tabs {
- border-bottom-style: none;
- }
- .mT15 {
- margin-top: 15px;
- }
- .fixed-table-container tbody td .th-inner,
- .fixed-table-container thead th .th-inner {
- line-height: 4px;
- }
- .fixed-table-pagination .pagination-info {
- display: none !important;
- }
- .table tbody tr:hover td,
- .table tbody tr.odd:hover td {
- background-color: #e6fbe0 !important;
- }
- /*.fixed-table-pagination .page-list{display:inline-block !important}*/
- /*.detail-top ul{
- background:#F8F6F6 !important;
- }*/
-
- .detail {
- border-top-style: none;
- }
- .btn {
- padding: 4px;
- }
- #ModifyModal .modal-dialog {
- width: 1100px;
- }
- #vmAppDialog .modal-dialog {
- width: 630px;
- }
- #ModifyModal .modal-dialog body {
- margin: 10px;
- }
- .dropdown-menu {
- min-width: 10px;
- }
- .nav-tabs.nav-justified>.active>a,
- .nav-tabs.nav-justified>.active>a:hover,
- .nav-tabs.nav-justified>.active>a:focus {
- border-left: 1px solid #4AC9FF;
- border-right: 1px solid #4AC9FF;
- border-top: 1px solid #4AC9FF;
- border-right: 1px solid #4AC9FF
- }
- .nav-tabs.nav-justified>li>a {
- border-bottom: 1px solid #4AC9FF;
- border-radius: 4px 4px 0 0
- }
- .clearfix {
- display: none;
- }
- .isloading-wrapper.isloading-right{
- margin-left:10px;
- }
- .isloading-overlay{
- position:relative;
- text-align:center;
- }
- .isloading-overlay .isloading-wrapper{
- background: url("images/loading.gif") 90% 50% no-repeat #FFFFFF;
- padding:15px 30px;
- -webkit-border-radius:7px;
- -webkit-background-clip:padding-box;
- -moz-border-radius:7px;
- -moz-background-clip:padding;
- border-radius:7px;
- background-clip:padding-box;
- display:inline-block;
- margin:0 auto;
- top:10%;
- z-index:9000;
- }
- .icon-refresh{
- background: url("images/loading.gif") 50% 50% no-repeat;
- }
- </style>
-</head>
-<body id="open_base_site_cotentBody" class="cotentBody ng-scope">
-<div class="container-fluid ms-controller">
- <h3> Life Cycle Manager </h3>
- <div class="separator-line"></div>
- <div class="uploadBtn">
- <div id="open_base_tpL_userHeader" class="userHeader">
- <div id="open_base_tpL_buttonGroup" class="openoButton_buttonGroupClass">
- <div class="openo openo-widget-button openoButton_buttonClass_parent ng-isolate-scope openoButton_buttonClass defaultbutton openoButton_button_default"
- tabindex="0" id="false" text="res.brApp_ui_res_btn_create" icon-url="./images/add.png"
- cls="defaultbutton" click="clickAdd"
- style="display: inline-block; padding-left: 0px; padding-right: 0px;">
- <div class="openoButton_buttonInnerClass openo-corner-all openoButton_Image" id="false_button">
- <span class="openo-widget-button-image openoButton_buttonLeftImg"
- style="background-image: url(images/add.png);"></span>
- <span class="openoButton_buttonCenterText openoButton_buttonCenterTextFont">Create</span>
- <span class="openo-widget-button-image openoButton_buttonImgDefault"></span>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <div class="row-fluid" data-name="table_zone">
- <div id='ict_virtualApplication_table_div'>
- <div>
- <div class="top">
- <table class="table table-striped" id="sai" data-pagination="true" data-page-size="5"
- data-pagination-first-text="First" data-pagination-pre-text="Previous"
- data-pagination-next-text="Next" data-pagination-last-text="Last" data-filter-control="true">
- <thead id="soverlayTable_thead" class="openo-table-thead" style="background:#ECECEC">
- <tr class="active" style="background:#D9D6D5">
-
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign"
- data-formatter="operateFormatterServiceName" data-field="serviceName"
- data-sortable="true" data-filter-control="input">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="overlayDesc_sorticon"
- class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Service Name
- </span>
- </div>
- </th>
-
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign"
- data-field="templateName" data-sortable="true" data-filter-control="input">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="overlayThincCPE_sorticon"
- class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Template Name
- </span>
- </div>
- </th>
-
- <!-- th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="overlayDCName" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="overlayDCName_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Service Instruction </span>
- </div>
- </th -->
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign"
- data-field="createTime" data-sortable="true" data-filter-control="input">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="overlayVPC_sorticon"
- class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Create Time
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign"
- data-field="creator" data-sortable="true" data-filter-control="input">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="overlayVPCCIDR_sorticon"
- class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Creator
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign"
- data-field="overlayOperation" align="center" data-formatter="operateFormatter"
- data-events="operateEvents">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="portAction_sorticon"
- class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Action</span>
- </div>
- </th>
- </tr>
- </thead>
-
- <tbody>
-
-
- </tbody>
-
- </table>
- </div>
- </div>
- </div>
- </div>
-
- <div id="ModifyModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
- aria-hidden="false">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="content" style="background:#fafafa;">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×
- </button>
- <h4 class="modal-title" id="">
- <span>Service Info</span>
- </h4>
- </div>
-
- <div class="detail" style="margin:10px;border-radius:5px;">
- <div class="detail-top" style="margin-top:10px;border-radius:5px;">
- <span><h2 style="margin-left: 1%">Detailed Info</h2></span>
-
-
-
-
- <!-- <ul class="nav nav-tabs nav-justified vmapp-margin">
- <li class="active basic">
- <a href="#" onClick="showDetContMod();" id="" data-toggle="tab">
- <span>Detail Info</span>
- </a>
- </li>
- <li class="">
- <a href="#" onclick="showTopoContMod();" data-toggle="tab">
- <span>Topo</span>
- </a>
- </li>
- <li class="">
- <a href="#" onclick="showInpContMod();" data-toggle="tab">
- <span>Input Data</span>
- </a>
- </li>
- </ul> -->
-
- <div id="detailContMod">
- <object id="detailContDlg" data="accorTables.html" width="100%" height="300" type="text/html">
-
- </object>
- </div>
- <div id="topoContMod" style="display:none;">
- <object id="topoContDlg" data="TopoAccor.html" width="100%" height="300" type="text/html">
-
- </object>
- <!--<iframe id="topoFrame" src="chartTopo.html" name="" style="width:100%; height:400px;" allowTransparency="true" scrolling="no" frameborder="0">
- </iframe>-->
- </div>
- <div id="inpContMod" style="display:none;">
- <object id="inputcontentDlg" data="InputData.html" width="100%" height="300"
- type="text/html">
-
- </object>
- <!--<iframe src="InputData.html" name="" style="width:100%" allowTransparency="true" scrolling="no" frameborder="0">
- </iframe>
- </iframe>-->
- </div>
-
- </div>
- <div class="detail-bottom"></div>
-
- </div>
- <div class="modal-footer">
- <button type="button" style="width:80px;" class="btn SDBtn" data-dismiss="modal"
- aria-hidden="true" id="">
- <span id="nfv-virtualApplication-iui-text-cancelBtn">OK</span>
- </button>
- <button data-dismiss="modal" style="width:80px;" type="button"
- class="btn button-previous SDBtn">
- <span id="nfv-virtualApplication-iui-text-previousBtn">Cancel</span>
- </button>
-
- </div>
- </br>
-
- </div>
- </div>
- </div>
- </div>
-
- <div style="padding-top:20px;"></div>
-
- <div id="tabContainer" class="detail" style="border-radius:5px;display: none">
- <div class="detail-top" style="margin-top:2px;border-radius:5px;">
-
- <span><h2 style="margin-left: 1%">Detailed Info</h2></span>
-
- <div id="inpCont" style="display:none;">
- <object id="inputcontent" src="InputData.html" width="100%" height="300" type="text/html">
- </object>
- </div>
- <!-- <ul class="nav nav-tabs nav-justified vmapp-margin">
-
- <li class="active basic">
- <a href="#" onClick="showDetCont();" id="detHov" data-toggle="tab">
- <span>Detail Info</span>
- </a>
- </li>
-
- <li class="">
- <a href="#" onclick="showTopoCont();" data-toggle="tab">
- <span>Topo</span>
- </a>
- </li>
-
- <li class="">
- <a href="#" onclick="showInpCont();" data-toggle="tab">
- <span>Input Data</span>
- </a>
- </li>
-
- </ul> -->
- </div>
-
- <div style="border-radius:5px;">
- <div id="detailCont" style="display:none;">
-
- <object id="detailConObj" data="accorTables.html" width="100%" height="300" type="text/html">
-
- </object>
- </div>
- <div id="topoCont" style="display:none;">
- <!--<iframe src="chartTopo.html" name="" style="width:100%" allowTransparency="true" scrolling="no" frameborder="0">
- </iframe>-->
- <!--<object data="chartTopo.html" width="100%" height="300" type="text/html">
-
- </object>-->
- <object id="topoContObj" data="TopoAccor.html" width="100%" height="300" type="text/html">
-
- </object>
- </div>
- <div id="inpCont" style="display:none;">
- <object id="inputcontent" src="InputData.html" width="100%" height="300" type="text/html">
- </object>
- </div>
- </div>
-
- </div>
-
-</div>
-</br>
-
-<div id="vmAppDialog" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="false">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="content">
- <div class="modal-header" style="margin-bottom: 15px;">
- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×
- </button>
- <h4 class="modal-title" id="myModalLabel">
- <span>Create</span>
- </h4>
- </div>
- <form class="form-horizontal" role="form" id="neForm">
- <div id="wizard">
- <div class="modal-body">
-
- <ul class="nav nav-tabs nav-justified vmapp-margin">
- <li class="active basic">
- <a href="#basicTab" style="margin-left:1px;" onclick="showBasic();" id="basicTab"
- data-toggle="tab">
- <span>Base</span>
- </a>
- </li>
- <li style="padding-right:2px;" class="para">
- <a href="#" onclick="hideBasic();" data-toggle="tab">
- <span>Template Parameters</span>
- </a>
- </li>
-
- </ul>
-
- <div id="basicInfoTab">
- <div class="mT15 form-group" style="margin-left:25px;"
- ms-class="has-error:vmAppDialog.name==''">
- <label class="col-sm-3 control-label">
- <span>Service Name</span>
- <span class="required">*</span>
- </label>
- <div class="col-sm-7">
- <input type="text" id="svcName" name="svcName" class="form-control"
- placeholder="Service Name" maxlength="256"/>
- </div>
- </div>
- <div class="mT15 form-group" style="margin-left:25px;"
- ms-class="has-error:vmAppDialog.name==''">
- <label class="col-sm-3 control-label">
- <span>Service Description</span>
- <span class="required">*</span>
- </label>
- <div class="col-sm-7">
- <input type="text" id="svcDesc" name="" class="form-control"
- placeholder="Service Description" maxlength="256"/>
- </div>
- </div>
-
- <div class="form-group" style="margin-left:25px;margin-bottom:15px;"
- ms-class="has-error:vmAppDialog.name==''">
- <label class="col-sm-3 control-label">
- <span>Service Template</span>
- <span class="required">*</span>
- </label>
- <div class="col-sm-7">
- <select class="form-control" style="padding-top: 0px;padding-bottom: 0px;"
- id="svcTempl" name="svcTempl" onchange="serviceTemplateChanged();">
- <option value="select">--select--</option>
- <option value="1.1">1.1</option>
- <option value="1.2">1.2</option>
- </select>
- </div>
- </div>
- </div>
-
- <div id="templateParameterTab">
-
- </div>
-
- </div>
- <div class="modal-footer">
- <button type="button" style="width:80px;" class="btn SDBtn" data-dismiss="modal"
- aria-hidden="true" id="createNS">
- <span id="nfv-virtualApplication-iui-text-cancelBtn">OK</span>
- </button>
- <button type="button" style="width:80px;" class="btn button-previous SDBtn" data-dismiss="modal">
- <span id="nfv-virtualApplication-iui-text-previousBtn">Cancel</span>
- </button>
-
- </div>
- </div>
- </form>
- </div>
- </div>
- </div>
-</div>
-</div>
-<div id="filterTpLogicalType_select_popupcontainer" class="openo openo-select-popup-container openo-hide"
- style="width: 155px; max-height: 130px; left: 628px; top: 104px; z-index: 1761;">
- <div class="openo-select-item openo-ellipsis " id="filterTpLogicalType_openo-select-id_0">
- <label class="openo-ellipsis openo-select-blank-item"
- style="width: 100%; display: block; height: 20px;"></label>
- </div>
- <div class="openo-select-item openo-ellipsis " id="filterTpLogicalType_openo-select-id_1">
- <label class="openo-ellipsis " style="width: 100%; display: block; height: 20px;">ETH</label>
- </div>
- <div class="openo-select-item openo-ellipsis " id="filterTpLogicalType_openo-select-id_2">
- <label class="openo-ellipsis " style="width: 100%; display: block; height: 20px;" title="POS">POS</label>
- </div>
- <div class="openo-select-item openo-ellipsis " id="filterTpLogicalType_openo-select-id_3">
- <label class="openo-ellipsis " style="width: 100%; display: block; height: 20px;">Trunk</label>
- </div>
- <div class="openo-select-item openo-ellipsis " id="filterTpLogicalType_openo-select-id_4">
- <label class="openo-ellipsis " style="width: 100%; display: block; height: 20px;">Loopback</label>
- </div>
-</div>
-<div class="modal fade" id="progressDialog" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="false">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header" style="margin-left:10px;margin-bottom:5px;">
- <h4 class="modal-title" id="idProgressTitle" style="text-align:center;"></h4>
- </div>
- <div class="modal-body" style="margin-left:10px;margin-bottom:5px;margin-right:10px;">
- <div class="progress">
- <div id="progressbar" class="progress-bar" role="progressbar" style="width: 10%;">
- <span id ="progressValue">0%</span>
- </div>
- </div>
- <div id="progressContent"></div>
- </div>
- </div>
- </div>
-</div>
-<div class="modal fade" id="errorDialog" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal"
- aria-hidden="true">×
- </button>
- <h4 class="modal-title" id="errorDialogTitle" style="text-align:center;"></h4>
- </div>
- <div class="modal-body" id = "errorDialogReason" style="margin-left:20px;margin-bottom:5px;margin-right:10px;"></div>
- <div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">close</button>
- </div>
- </div>
- </div>
-</div>
-
-</body>
-</html>
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/i18n/lcm-template-parameters-i18n-en-US.properties b/lifecyclemgr/src/main/webapp/lifecyclemgr/i18n/lcm-template-parameters-i18n-en-US.properties
deleted file mode 100644
index 31819ae4..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/i18n/lcm-template-parameters-i18n-en-US.properties
+++ /dev/null
@@ -1,95 +0,0 @@
-domainHost=Domain
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.ac1_ip=Left AC
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.ac1_peer_ip=Left CE IP
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.ac1_port=Left Port
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.ac1_route=Left Route
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.ac1_svlan=Left VLAN
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.ac2_ip=Right AC
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.ac2_peer_ip=Right CE IP
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.ac2_port=Right Port
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.ac2_route=Right Route
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.ac2_svlan=Right VLAN
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.description=Description
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.name=Service Name
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.pe1_ip=Left PE IP
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.pe2_ip=Right PE IP
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.serviceType=Service Type
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.technology=Technology
-tosca.nodes.sdn.ext.NS.ns_underlayervpn.topology=Topology
-tosca.nodes.sdn.ext.NS.enterprise2DC.dcFWIP=Firewall IP
-tosca.nodes.sdn.ext.NS.enterprise2DC.dcGWIP=Gateway IP
-tosca.nodes.sdn.ext.NS.enterprise2DC.dcLBIP=Load Balancer IP
-tosca.nodes.sdn.ext.NS.enterprise2DC.description=Description
-tosca.nodes.sdn.ext.NS.enterprise2DC.id=ID
-tosca.nodes.sdn.ext.NS.enterprise2DC.name=Service Name
-tosca.nodes.sdn.ext.NS.enterprise2DC.siteAccessPortVlan=ThinCPE VLAN
-tosca.nodes.sdn.ext.NS.enterprise2DC.siteCidr=Enterprise cidr
-tosca.nodes.sdn.ext.NS.enterprise2DC.siteThinCpeIP=ThinCPE IP
-tosca.nodes.sdn.ext.NS.enterprise2DC.siteVNI=ThinCPE VxLAN ID
-tosca.nodes.sdn.ext.NS.enterprise2DC.vCPE_MgrIp=vCPE IP
-tosca.nodes.sdn.ext.NS.enterprise2DC.vpcName=VPC Name
-tosca.nodes.sdn.ext.NS.enterprise2DC.vpcSubnetCidr=VPC cidr
-tosca.nodes.sdn.ext.NS.enterprise2DC.vpcSubnetName=VPC Subnet Name
-tosca.nodes.sdn.ext.NS.enterprise2DC.vpcVNI=VPC VxLAN ID
-tosca.nodes.nfv.NS.VBRAS_NS.externalDataNetworkName=External Data Network Name
-tosca.nodes.nfv.NS.VBRAS_NS.externalManageNetworkName=External Management Network Name
-tosca.nodes.nfv.NS.VCPE_NS.sfc_data_network=SFC Data Network Name
-tosca.nodes.nfv.NS.VCPE_NS.externalManageNetworkName=External Management Network Name
-tosca.nodes.nfv.NS.VCPE_NS.NatIpRange=Nat Ip Range
-tosca.nodes.nfv.NS.VCPE_NS.m6000_mng_ip=M6000 Mng IP
-tosca.nodes.nfv.NS.VCPE_NS.externalPluginManageNetworkName=External Plugin Management Network Name
-tosca.nodes.nfv.NS.VCPE_NS.externalDataNetworkName=External Data Network Name
-tosca.nodes.nfv.NS.POP_NS.sfc_data_network=SFC Data Network Name
-tosca.nodes.nfv.NS.POP_NS.externalManageNetworkName=External Management Network Name
-tosca.nodes.nfv.NS.POP_NS.NatIpRange=Nat Ip Range
-tosca.nodes.nfv.NS.POP_NS.m6000_mng_ip=M6000 Mng IP
-tosca.nodes.nfv.NS.POP_NS.externalPluginManageNetworkName=External Plugin Management Network Name
-tosca.nodes.nfv.NS.POP_NS.externalCompanyFtpDataNetworkName=External Company Ftp Data Network Name
-tosca.nodes.nfv.NS.POP_NS.externalDataNetworkName=External Data Network Name
-ac1_ip=Left AC
-ac1_peer_ip=Left CE IP
-ac1_port=Left Port
-ac1_route=Left Route
-ac1_svlan=Left VLAN
-ac2_ip=Right AC
-ac2_peer_ip=Right CE IP
-ac2_port=Right Port
-ac2_route=Right Route
-ac2_svlan=Right VLAN
-description=Description
-name=Service Name
-pe1_ip=Left PE IP
-pe2_ip=Right PE IP
-serviceType=Service Type
-technology=Technology
-topology=Topology
-dcFWIP=Firewall IP
-dcGWIP=Gateway IP
-dcLBIP=Load Balancer IP
-description=Description
-id=ID
-name=Service Name
-siteAccessPortVlan=ThinCPE VLAN
-siteCidr=Enterprise cidr
-siteThinCpeIP=ThinCPE IP
-siteVNI=ThinCPE VxLAN ID
-vCPE_MgrIp=vCPE IP
-vpcName=VPC Name
-vpcSubnetCidr=VPC cidr
-vpcSubnetName=VPC Subnet Name
-vpcVNI=VPC VxLAN ID
-externalDataNetworkName=External Data Network Name
-externalManageNetworkName=External Management Network Name
-sfc_data_network=SFC Data Network Name
-externalManageNetworkName=External Management Network Name
-NatIpRange=Nat Ip Range
-m6000_mng_ip=M6000 Mng IP
-externalPluginManageNetworkName=External Plugin Management Network Name
-externalDataNetworkName=External Data Network Name
-sfc_data_network=SFC Data Network Name
-externalManageNetworkName=External Management Network Name
-NatIpRange=Nat Ip Range
-m6000_mng_ip=M6000 Mng IP
-externalPluginManageNetworkName=External Plugin Management Network Name
-externalCompanyFtpDataNetworkName=External Company Ftp Data Network Name
-externalDataNetworkName=External Data Network Name \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/lcm_detail_nfvo_nodesinfo.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/lcm_detail_nfvo_nodesinfo.html
deleted file mode 100644
index 60fe26df..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/lcm_detail_nfvo_nodesinfo.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
-
- Copyright 2016-2017 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
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<html>
-<head>
- <head lang="en">
- <meta charset="UTF-8">
- <title></title>
- <link href="../common/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
- <link href="../common/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
- <link href="../common/thirdparty/uniform/css/uniform.default.min.css" rel="stylesheet"/>
- <link href="../common/css/style.css" rel="stylesheet"/>
- <link href="../common/css/ngict-component.css" rel="stylesheet"/>
- <link href="../common/css/plugins.css" rel="stylesheet"/>
- <link href="../catalog/css/platform/animate.min.css" rel="stylesheet"/>
- <link href="../catalog/css/datatable-sort.css" rel="stylesheet"/>
- <link href="../catalog/css/templateDetail.css" rel="stylesheet"/>
- <link href="../catalog/css/topology.css" rel="stylesheet"/>
- <style type="text/css">
- .ms-controller {
- visibility: hidden;
- }
-
- .ms-nodedetail {
- display: none;
- }
- </style>
- </head>
-<body>
-<div ms-controller="tmNodesController" class="container-fluid ms-controller">
- <div class="row">
- <div class="col-xs-6 col-md-6 col-sm-6 col-lg-6 titlefont">
- <span id="nfv-template-nodes-iui-title" name_i18n="com_zte_nfv_nsoc_i18n"></span>
- </div>
- </div>
- <div class="separator-line"></div>
- <div class="row-fluid" data-name="table_zone">
- <div class="col-xs-12" id='ict_nodes_template_table_div'></div>
- </div>
-
- <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/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
-
- <script type="text/javascript" src="../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>
- <script type="text/javascript" src="../common/thirdparty/avalon/avalon.modern.js"></script>
-
- <script type="text/javascript" src="../common/js/tools.js"></script>
-
- <script type="text/javascript" src="../catalog/js/component/commonUtil.js"></script>
- <script type="text/javascript" src="../catalog/js/component/serverPageTable.js"></script>
- <script type="text/javascript" src="../catalog/js/component/loadi18n_nsoc.js"></script>
-
- <script type="text/javascript" src="../catalog/js/template/tmNodesDetailUtil.js"></script>
- <script type="text/javascript" src="../catalog/js/template/tmUtil.js"></script>
- <script type="text/javascript" src="js/tmNodesController.js"></script>
- <script type="text/javascript" src="../catalog/js/template/topoUtil.js"></script>
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/lcm_detail_nfvo_topology.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/lcm_detail_nfvo_topology.html
deleted file mode 100644
index 9b6ffd75..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/lcm_detail_nfvo_topology.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!--
-
- Copyright 2016-2017 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
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<html>
-<head>
- <head lang="en">
- <meta charset="UTF-8">
- <title></title>
- <link href="../common/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
- <link href="../common/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
- <link href="../common/thirdparty/uniform/css/uniform.default.min.css" rel="stylesheet"/>
- <link href="../common/css/style.css" rel="stylesheet"/>
- <link href="../common/css/ngict-component.css" rel="stylesheet"/>
- <link href="../common/css/plugins.css" rel="stylesheet"/>
- <link href="../catalog/css/platform/animate.min.css" rel="stylesheet"/>
- <link href="../catalog/css/datatable-sort.css" rel="stylesheet"/>
- <link href="../catalog/css/templateDetail.css" rel="stylesheet"/>
- <link href="../catalog/css/topology.css" rel="stylesheet"/>
- <style type="text/css">
- .ms-controller {
- visibility: hidden;
- }
-
- .ms-nodedetail {
- display: none;
- }
- </style>
- </head>
-<body>
-<div ms-controller="tmTopoController" class="container-fluid ms-controller">
- <div class="row">
- <div class="col-xs-6 col-md-6 col-sm-6 col-lg-6 titlefont">
- <span id="nfv-template-topo-iui-title" name_i18n="com_zte_nfv_nsoc_i18n"></span>
- </div>
- </div>
- <div class="separator-line"></div>
- <div class="container-fluid">
- <div id="networks" style="float:left;display:inline-block">
- <div class="networksContainer">
- <div class="network" ms-repeat-network="topologyTab.networkTopoDatas">
- <div class="name" tooltip="" ms-attr-title="network.name" ms-if="network.name"
- ms-click="topologyTab.$showTopo(network.id, network.name)">
- <div ms-if="topologyTab.isShowNum" ms-text="network.num" class="badge">0</div>
- <span>{{network.name}}</span>
- </div>
- <div class="subnet" ms-repeat-subnet="network.subnets">
- <div class="line">
- <div class="vlan" ms-attr-id="subnet.id"
- ms-css-background-color="topologyTab.$getColor($index+$outer.$index)"
- ms-attr-title="subnet.name" ms-click="topologyTab.$showTopo(subnet.id, subnet.name)">
- <div ms-if="topologyTab.isShowNum" ms-text="subnet.num" class="badge">0</div>
- <p>{{subnet.name}}</p>
- <p class="cidr" ms-text="topologyTab.$getCidr(subnet.properties)"></p>
- </div>
- </div>
- </div><!--end repeat network.subnets-->
- </div><!--end repeat topologyTab.networkTopoDatas-->
- </div>
- </div>
- <div id="topo" style="float:left;display:inline-block">
- <div class="row-fluid" data-name="topo_zone">
- <div class="bpContainer" ms-each-host="topologyTab.boxTopoDatas">
- <div>
- <div class="box" ms-attr-id="host.id">
- <div class="piProgress" size="55">
- <div class="circle">
- <i class="gs-node-icon fa fa-desktop"></i>
- <div ms-if="topologyTab.isShowNum" ms-text="host.num" class="badge">1</div>
- </div>
- <div class="smallCircle" ms-repeat-cp="host.cp" ms-attr-id="cp.id" ms-title="cp.name"
- ms-click="topologyTab.$showTopo(cp.id,cp.name)"
- ms-css-top="topologyTab.$getCpTop($index,host.id)">
- <i class="gs-cp-icon fa fa-credit-card"></i>
- </div>
- </div>
- <div class="head" ms-hover="boxHover" tooltip ms-attr-title="host.name" ms-text="host.name"
- ms-click="topologyTab.$showTopo(host.id, host.name)">
- </div>
- <div class="holder">
- <div class="nest" ms-if="host.vnfdid" ms-click="topologyTab.$showVnfTopo(host.vnfdid)"
- ms-attr-title="topologyTab.vnfTip"><!-- only display nested ns template -->
- <div class="plus">
- <i class="fa fa-plus" style="color: #3aaeda;"></i>
- </div>
- </div>
- <div ms-each-box="host.children"><!-- ngRepeat: node in map track by node.name -->
- <div>
- <div class="box" ms-attr-id="box.id">
- <div class="piProgress" size="55">
- <div class="circle">
- <i class="gs-node-icon fa fa-cogs"></i>
- <div ms-if="topologyTab.isShowNum" ms-text="box.num" class="badge">
- 1
- </div>
- </div>
- <div class="smallCircle" ms-repeat-cp="box.cp" ms-attr-id="cp.id"
- ms-title="cp.name" ms-click="topologyTab.$showTopo(cp.id,cp.name)"
- ms-css-top="topologyTab.$getCpTop($index,box.id)">
- <i class="gs-cp-icon fa fa-credit-card"></i>
- </div>
- </div>
- <div class="head" ms-hover="boxHover"
- tooltip="" ms-click="topologyTab.$showTopo(box.id, box.name)"
- ms-attr-title="box.name" ms-text="box.name"></div>
- <div class="holder">
- <div ms-each-app="box.children">
- <!-- ngRepeat: node in map track by node.name -->
- <div>
- <div class="app" ms-attr-id="app.id"
- ms-click="topologyTab.$showTopo(app.id, app.name)"
- ms-hover="appHover">
- <div class="piProgress" size="55">
- <div class="circle">
- <i class="gs-node-icon fa fa-cog"></i>
- <div ms-if="topologyTab.isShowNum" ms-text="app.num"
- class="badge">1
- </div>
- </div>
- </div>
- <p tooltip="" ms-attr-id="app.id" ms-attr-title="app.name"
- ms-text="app.name"></p>
- </div>
- </div>
- <!-- end ngRepeat: node in map track by node.name -->
- </div>
- </div><!-- end ngIf: node.isApp == false -->
- </div><!-- end ngRepeat: node in map track by node.name -->
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div>
- <div class="coordinates">
- <svg id="svg_vl" width="100%" height="100%" fill="silver">
- <g transform="translate(0, 0)">
- </g>
- </svg>
- </div>
- <div class="coordinates" style="z-index:3;">
- <svg id="svg_vdu" width="100%" height="100%" fill="silver">
- <g transform="translate(0, 0)">
- </g>
- <defs>
- <marker id="arrowhead" viewBox="0 0 20 20" refX="16" refY="10" markerUnits="userSpaceOnUse"
- markerWidth="16" markerHeight="12" orient="auto" fill="#7A7A7A">
- <path d="M 0 0 L 20 10 L 0 20 z"></path>
- </marker>
- </defs>
- </svg>
- </div>
- </div>
- </div>
-
- <div id="right-menu" class="ms-nodedetail" ms-css-display="nodesDetail.isShow">
- <div>
- <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>
- </div>
- </div>
- <div>
- <div class="btn-group">
- <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="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="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="nodesDetail.detailIndex === 2">
- <div class="row-fluid" data-name="table_zone">
- <div id='ict_table_relationShips_div' class="nodesDetail"></div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <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/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
-
- <script type="text/javascript" src="../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>
- <script type="text/javascript" src="../common/thirdparty/avalon/avalon.modern.js"></script>
-
- <script type="text/javascript" src="../common/js/tools.js"></script>
-
- <script type="text/javascript" src="../catalog/js/component/commonUtil.js"></script>
- <script type="text/javascript" src="../catalog/js/component/serverPageTable.js"></script>
- <script type="text/javascript" src="../catalog/js/component/loadi18n_nsoc.js"></script>
-
- <script type="text/javascript" src="../js/template/tmDetailUtil.js"></script>
- <script type="text/javascript" src="../js/template/tmUtil.js"></script>
- <script type="text/javascript" src="js/tmTopoController.js"></script>
- <script type="text/javascript" src="../js/template/topoUtil.js"></script>
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/newShow.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/newShow.html
deleted file mode 100644
index 1f3b6412..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/newShow.html
+++ /dev/null
@@ -1,179 +0,0 @@
-
-<!-- /* Copyright 2016-2017, Huawei Technologies Co., Ltd.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<!DOCTYPE html>
-<html>
-
-<head>
-
- <head lang="en">
- <meta charset="UTF-8">
- <title></title>
- <link href="css/bootstrap.min.css" rel="stylesheet" />
- <link href="css/VMMain.css" rel="stylesheet" />
- <link href="css/bootstrap-table.min.css" rel="stylesheet" />
- <link rel="import" href="accorTables.html">
- <script type="text/javascript" src="js/jquery-1.11.2.min.js"></script>
- <script type="text/javascript" src="js/bootstrap.min.js"></script>
- <script type="text/javascript" src="js/rest.js"></script>
- <script type="text/javascript" src="js/bootstrap-table.min.js"></script>
- <!-- <script type="text/javascript" src="https://code.jquery.com/ui/1.11.3/jquery-ui.min.js">
- </script>
- <link href="https://code.jquery.com/ui/1.11.3/themes/smoothness/jquery-ui.css" rel="stylesheet" /> -->
- <script type="text/javascript">
- $(document).ready(function() {
- $("#detailCont").show();
- var jsondata = [];
- //jsondata = loadNeData();
- $('#sai').bootstrapTable({
- //Assigning data to table
- data: jsondata
- });
- $('.table tbody tr').click(function() {
- $(this).addClass('openoTable_row_selected').siblings().removeClass('openoTable_row_selected');
- })
- $('.detail-top ul li').click(function() {
- $(this).addClass('current').siblings().removeClass('current');
- });
- $("#topoCont").hide();
- $("#inpCont").hide();
-
- function operateFormatter(value, row, index) {
- return [
- '<img class="siteDeleteImg" src="images/delete.png" href="javascript:void(0)" style="cursor: pointer" name="title" title="Delete" />'
- ].join('');
- }
- window.operateEvents = {
- 'click .siteDeleteImg': function(e, value, row, index) {
- // TO DO ajex call for delete
- var result = deleteNe(row.id, row);
- }
- };
-
- function hideBasic() {
- $("#basicInfoTab").hide();
- }
-
- function showBasic() {
- $("#basicInfoTab").show();
- }
-
- function showTopoCont() {
- $("#topoCont").show();
- $("#detailCont").hide();
- $("#inpCont").hide();
- }
-
- function showDetCont() {
- $("#topoCont").hide();
- $("#detailCont").show();
- $("#inpCont").hide();
- }
-
- function showInpCont() {
- $("#topoCont").hide();
- $("#detailCont").hide();
- $("#inpCont").show();
- }
-
- function showTopoContMod() {
- $("#topoContMod").show();
- $("#detailContMod").hide();
- $("#inpContMod").hide();
- }
-
- function showDetContMod() {
- $("#topoContMod").hide();
- $("#detailContMod").show();
- $("#inpContMod").hide();
- }
-
- function showInpContMod() {
- $("#topoContMod").hide();
- $("#detailContMod").hide();
- $("#inpContMod").show();
- }
- </script>
-
- <style>
- .nav-tabs {
- border-bottom-style: none;
- }
- .mT15 {
- margin-top: 15px;
- }
- .fixed-table-container tbody td .th-inner,
- .fixed-table-container thead th .th-inner {
- line-height: 4px;
- }
- .fixed-table-pagination .pagination-info {
- display: none !important;
- }
- .table tbody tr:hover td,
- .table tbody tr.odd:hover td {
- background-color: #e6fbe0 !important;
- }
- /*.fixed-table-pagination .page-list{display:inline-block !important}*/
-
- .detail-top ul {
- background: #F8F6F6 !important;
- }
- .btn {
- padding: 4px;
- }
- </style>
- </head>
-
- <body id="open_base_site_cotentBody" class="cotentBody ng-scope">
- <div class="container-fluid ms-controller">
- <h3> Life Cycle Manager > Service Info</h3>
- <div class="separator-line"></div>
-
- <div class="detail" style="border-radius:5px;">
- <div class="detail-top" style="margin-top:2px;border-radius:5px;">
- <ul>
- <li style="border-radius:5px;" id="detHov" class="current" onClick="showDetCont();">Detail Info</li>
- <li style="border-radius:5px;" nClick="showTopoCont();">topo</li>
- <li style="border-radius:5px;" onClick="showInpCont();">InputData</li>
- </ul>
- </div>
-
- <div style="border-radius:5px;">
- <div id="detailCont" style="display:none;">
-
- <object data="accorTables.html" width="100%" height="300" type="text/html">
-
- </object>
- </div>
- <div id="topoCont" style="display:none;">downnn</div>
- <div id="inpCont" style="display:none;">
- <iframe src="inputData.html" name="" allowTransparency="true" scrolling="no" frameborder="0">
- </iframe>
- </div>
- </div>
-
- <div class="detail-bottom"></div>
- </div>
-
- </div>
- </br>
-
- </div>
-
- </body>
-
-</html> \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/overlayvpn.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/overlayvpn.html
deleted file mode 100644
index 058ff4f5..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/overlayvpn.html
+++ /dev/null
@@ -1,291 +0,0 @@
-<!--
-
- Copyright 2016-2017, Huawei Technologies Co., Ltd.
-
- 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
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-
-<!DOCTYPE html>
-<html>
-<head>
- <head lang="en">
- <meta charset="UTF-8">
- <title></title>
- <link href="css/bootstrap.min.css" rel="stylesheet"/>
- <link href="css/VMMain.css" rel="stylesheet"/>
- <link href="css/bootstrap-table.min.css" rel="stylesheet"/>
- <script type="text/javascript" src="js/jquery-1.11.2.min.js"></script>
- <script type="text/javascript" src="js/bootstrap.min.js"></script>
- <script type="text/javascript" src="js/brs.js"></script>
- <script type="text/javascript" src="js/underlay.js"></script>
- <script type="text/javascript" src="js/bootstrap-table.min.js"></script>
- <script type="text/javascript" src="js/bootstrap-table-filter-control.min.js"></script>
- <style type="text/css">
- </style>
- <script type="text/javascript">
- $(document).ready(function () {
- var jsondata = [];
- jsondata = loadOverlayData();
-
- $('#sai').bootstrapTable({
- //Assigning data to table
- data: jsondata
- });
- $('.table tbody tr').click(function () {
- $(this).addClass('openoTable_row_selected').siblings().removeClass('openoTable_row_selected');
- });
-
- $('#sai').on('sort.bs.table', function () {
-
-
- }).on('click-row.bs.table', function () {
-
-
- $('.table tbody tr').click(function() {
-
- $(this).addClass('openoTable_row_selected').siblings().removeClass('openoTable_row_selected');
- });
-
- });
-
- var serviceId = getQueryStringValue("serviceId");
- console.log("overlayvpn - serviceId : " + serviceId);
- });
-
- function getQueryStringValue (key) {
- var params = new URLSearchParams(window.location.search.slice(1));
- return params.get(key);
- }
-
- function operateFormatter(value, row, index) {
- return [
- '<img class="siteDeleteImg" src="images/delete.png" href="javascript:void(0)" style="cursor: pointer" name="title" title="Delete" />'
- ].join('');
- }
- window.operateEvents = {
- 'click .siteDeleteImg': function(e, value, row, index) {
- // TO DO ajex call for delete
- console.log(value, row, index);
- }
- };
- </script>
- <style>
- .dropdown-menu {
- min-width: 10px;
- }
- .btn {
- padding: 4px;
- }
- .fixed-table-container tbody td .th-inner,
- .fixed-table-container thead th .th-inner {
- line-height: 4px;
- }
- .fixed-table-pagination .pagination-info {
- display: none !important;
- }
- .table tbody tr:hover td,
- .table tbody tr.odd:hover td {
- background-color: #e6fbe0 !important;
- }
- table tr.openoTable_row_selected td {
- background: #e8f8fe!important;
- border-bottom: 1px solid #e8e8e8!important;
- }
- .container-fluid {
- padding-left: 30px;
- padding-right: 0px;
- }
-
- .clearfix {
- display: none;
- }
-
- .page-list{
- float:none !important;
- display:inline-block !important;
- margin-right: 10px;
- vertical-align: middle;
- margin-bottom: 25px;
-
- }
- .pull-left{
- float:none !important;
- display:inline-block !important;
- }
-
- .pull-right{
- float:none !important;
- display:inline-block !important;
- }
-
- .fixed-table-pagination{
- float:right;
- }
- </style>
-</head>
-
-<body id="open_base_vpn_cotentBody" class="ng-scope">
-<div class="container-fluid ms-controller">
-
- <h3> Overlay VPN </h3>
- <!-- <div class="row-fluid" data-name="table_zone">
- <div id='ict_virtualApplication_table_div'>
- <div>
- <div class="top">
- <table id="sai" class="table table-striped" data-pagination="true" data-page-size="5" data-pagination-first-text="First" data-pagination-pre-text="Previous" data-pagination-next-text="Next" data-pagination-last-text="Last">
- <thead id="soverlayTable_thead" class="openo-table-thead" style="background:#ECECEC">
- <tr class="active">
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="overlayName" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="overlayName_sorticon" class="openo-table-th-sorticon overflow_elip openoTable_sortable leftHeaderAlign openo-table-disable-element">Name
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="overlayDesc" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="overlayDesc_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element "> Description
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="overlayThincCPE" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="overlayThincCPE_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Thin CPE
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="overlayPortVlanID" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="overlayPortVlanID_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Port:Vlan ID
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="overlayDCName" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="overlayDCName_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">DC Name
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="overlayVPC" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="overlayVPC_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">VPC
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="overlayVPCCIDR" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="overlayVPCCIDR_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">VPC CIDR
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="overlayOperation" align="center" data-formatter="operateFormatter" data-events="operateEvents">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="portAction_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Action</span>
- </div>
- </th>
- </tr>
- </thead>
- <tbody>
-
- <tr>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>
- <button class="table-btn delete-btn"></button>
- </td>
- </tr>
- <tr>
- <td>data </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>
- <button class="table-btn delete-btn"></button>
- </td>
- </tr>
- <tr>
- <td>now </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>
- <button class="table-btn delete-btn"></button>
- </td>
- </tr>
- <tr>
- <td>then </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>Sample </td>
- <td>
- <button class="table-btn delete-btn"></button>
- </td>
- </tr>
- </tbody>
-
- </table>
- </div>
- </div>
- </div>
- </div> -->
-
- <div class="row-fluid" data-name="table_zone">
- <div id='ict_virtualApplication_table_div'>
- <div>
- <div class="top">
- <table class="table-striped table " id="sai" data-pagination="true" data-pagination-first-text="First"
- data-pagination-pre-text="Previous" data-pagination-next-text="Next" data-pagination-last-text="Last"
- data-filter-control="true">
- <thead style="background:#ECECEC">
- <tr>
- <th data-field="name" data-sortable="true" data-filter-control="input">Name</th>
- <th data-field="desc" data-sortable="true" data-filter-control="input">Description</th>
- <th data-field="thinCpe" data-sortable="true" data-filter-control="input">Thin CPE</th>
- <th data-field="port" data-sortable="true" data-filter-control="input">Port:Vlan ID</th>
- <th data-field="dcName" data-sortable="true" data-filter-control="input">DC Name</th>
- <th data-field="vpc" data-sortable="true" data-filter-control="input">VPC</th>
- <th data-field="vpcCidr" data-sortable="true" data-filter-control="input">VPC CIDR</th>
- <th data-field="action" data-sortable="">Action</th>
- </tr>
- </thead>
- </table>
- </div>
- </div>
- </div>
- </div>
-
-
-</body>
-</html> \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/overlayvpn_topo.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/overlayvpn_topo.html
deleted file mode 100644
index 5744c57c..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/overlayvpn_topo.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-
- Copyright 2016-2017, Huawei Technologies Co., Ltd.
-
- 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
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-<style type="text/css">
- #container {
- top: 55px;
- bottom: 0;
- left: 0;
- right: 0;
- position: absolute;
- }
- #title {
- font-size: 30px;
- text-align: center;
- }
-</style>
-</head>
-
-<body>
-<div id="title"></div>
-<hr/>
-<div id="container"></div>
-
-
-<script src="js/jquery-1.11.2.min.js"></script>
-
-<script src="js/topo/sigma/sigma.min.js"></script>
-<script src="js/topo/sigma/sigma.renderers.customShapes.min.js"></script>
-<script src="js/topo/sigma/sigma.renderers.edgeLabels.min.js"></script>
-
-<script src="js/topo/Node.js"></script>
-<script src="js/topo/Edge.js"></script>
-<script src="js/topo/OverlayTopology.js"></script>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/sdnovpn.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/sdnovpn.html
deleted file mode 100644
index fd5301f5..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/sdnovpn.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!--
-
- Copyright 2016-2017, Huawei Technologies Co., Ltd.
-
- 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
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-
-<!doctype html>
-<html>
-<head>
- <meta charset="utf-8">
- <title></title>
- <link href="css/bootstrap.min.css" rel="stylesheet"/>
- <link href="css/RMain.css" rel="stylesheet"/>
- <script type="text/javascript" src="js/jquery-1.11.2.min.js"></script>
- <script type="text/javascript" src="js/bootstrap.min.js"></script>
-</head>
-<script type="text/javascript">
- $(function () {
- $('.openo_accordion_ui-icon-expand,.header').click(function () {
- $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL').slideToggle(500);
- $('.openo_accordion_ui-icon-expand').toggleClass('current')
- });
- $('.openoAccordian_showHideArrow_hide').click(function () {
- // $('#open_base_openo').css('margin-left','-200px');
- // $('#open_base_openo').css('display','none');
- // $('.bar').css('display','block');
- if ($('#accordionmenuid').width() >= 200) {
- $('#accordionmenuid').width('18px');
- $('.openo_accordion_ui-icon-expand,.header,#accordionmenuid_ul_0_0_brAppTopMenuID_UL li a').css('display', 'none');
- $('#accordionmenuid_arrow').attr('classname', 'openoAccordian_showHideArrow_show');
- $('#iframeContainer').css('width', '1284px');
- } else if ($('#accordionmenuid').width() == 18) {
- $('#accordionmenuid').width('220px');
- $('.openo_accordion_ui-icon-expand,.header,#accordionmenuid_ul_0_0_brAppTopMenuID_UL li a').css('display', 'block');
- $('#accordionmenuid_arrow').attr('classname', 'openoAccordian_showHideArrow_hide');
- $('#iframeContainer').css('width', '1063px');
- }
-
- });
- $('.bar span').click(function () {
- $('#open_base_openo').css('display', 'block');
- $('.bar').css('display', 'none');
- $('#iframeContainer').css('width', '1063px');
- });
- $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL li').click(function () {
- $(this).addClass('openo_accordion_selected').siblings().removeClass('openo_accordion_selected');
- });
- $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_0_brAppSiteMenuID').click(function () {
- $('#accordionContent').attr('src', 'overlayvpn.html');
- });
- $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_1_brAppMeMenuID').click(function () {
- $('#accordionContent').attr('src', 'underlayvpn.html');
- });
- })
-</script>
-<body>
-<div id="febDiv" style="overflow: hidden;">
- <div id="open_base_feb">
- <!--use for store menu come from feb service, maybe just a temple plan-->
- <div id="app">
- <div id="iemp_layout_container" ng-controller="resourceCtrl" class="iemp_layout_container ng-scope">
-
- <table id="open_base_table" class="three-cols-layout">
- <tbody id="open_base_tbody">
- <tr id="open_base_tr">
- <td class="bar">
- <span></span>
- </td>
- <td id="open_base_openo" class="three-cols-column three-cols-left">
- <div id="accordionmenuid" allow-resize="true" dataset="dataArr" height="resHeight"
- listeners="callBacklisteners" resize-callback="resizehandler"
- current-select="currentselect" click="clickHandler"
- class="ng-isolate-scope accordion_parent openo_accordion_main_menu"
- style="height: 870px;">
- <div class="openo-accordion-resizable-handle" style="cursor: auto;"></div>
- <ul id="accordionmenuid_ul" class="openoAccordian_accordionmenu">
- <li id="accordionmenuid_ul_0_0_brAppTopMenuID" nodeid="brAppTopMenuID">
- <span class="openo_accordion_ui-icon-expand"
- style="padding-left: 20px; height: 60px;cursor: pointer;"></span>
- <span class="openoAccordian_showHideArrow_hide" id="accordionmenuid_arrow"
- style="cursor: pointer;"></span>
- <a title="brApp" class="header opened"
- style="padding-left: 10px; cursor: pointer;">VPN Manager</a>
- <ul id="accordionmenuid_ul_0_0_brAppTopMenuID_UL">
- <li id="accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_0_brAppSiteMenuID"
- nodeid="brAppSiteMenuID" class="" style="display: list-item;">
- <a title="Click to visit sites" class="" style="padding-left: 62px;">Overlay VPN</a>
- </li>
- <li id="accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_1_brAppMeMenuID"
- nodeid="brAppMeMenuID" style="display: list-item;">
- <a title="Click to visit network equipments" style="padding-left: 62px;">Underlay VPN</a>
- </li>
- </ul>
- </li>
- </ul>
- </div>
-
- </td>
- <td id="open_base_iframe" class="three-cols-column three-cols-center" style="padding: 0px;">
-
- <div id="iframeContainer" class="frame-class" style="height: 870px;">
- <iframe id="accordionContent" src="" height="870px"></iframe>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
-
- </div>
- </div>
- </div>
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/underlayvpn.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/underlayvpn.html
deleted file mode 100644
index 634901f6..00000000
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/underlayvpn.html
+++ /dev/null
@@ -1,291 +0,0 @@
-<!--
-
- Copyright 2016-2017, Huawei Technologies Co., Ltd.
-
- 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
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-
-<!DOCTYPE html>
-<html>
-<head>
- <head lang="en">
- <meta charset="UTF-8">
- <title></title>
- <link href="css/bootstrap.min.css" rel="stylesheet"/>
- <link href="css/jquery.dataTables.min.css" rel="stylesheet"/>
- <link href="css/VMMain.css" rel="stylesheet"/>
- <link href="css/bootstrap-table.min.css" rel="stylesheet"/>
- <script type="text/javascript" src="js/jquery-1.11.2.min.js"></script>
- <script type="text/javascript" src="js/bootstrap.min.js"></script>
- <script type="text/javascript" src="js/brs.js"></script>
- <script type="text/javascript" src="js/underlay.js"></script>
- <script type="text/javascript" src="js/bootstrap-table.min.js"></script>
- <script type="text/javascript" src="js/bootstrap-table-filter-control.min.js"></script>
- <style>
- .dropdown-menu {
- min-width: 10px;
- }
- .btn {
- padding: 4px;
- }
-
- .fixed-table-container tbody td .th-inner,
- .fixed-table-container thead th .th-inner {
- line-height: 4px;
- }
- .fixed-table-pagination .pagination-info {
- display: none !important;
- }
- .table tbody tr:hover td,
- .table tbody tr.odd:hover td {
- background-color: #e6fbe0 !important;
- }
- .delete-btn {
- background: url(delete.png) no-repeat !important;
- width: 16px;
- height: 16px;
- border: none;
- }
- table tr.openoTable_row_selected td {
- background: #e8f8fe!important;
- border-bottom: 1px solid #e8e8e8!important;
- }
- .container-fluid {
- padding-left: 10px;
- padding-right: 0px;
- }
-
- .clearfix {
- display: none;
- }
- .page-list{
- float:none !important;
- display:inline-block !important;
- margin-right: 10px;
- vertical-align: middle;
- margin-bottom: 25px;
-
- }
- .pull-left{
- float:none !important;
- display:inline-block !important;
- }
-
- .pull-right{
- float:none !important;
- display:inline-block !important;
- }
-
- .fixed-table-pagination{
- height:20px;
- float:right;
- }
- </style>
- <script type="text/javascript">
- $(document).ready(function () {
-
-
- var jsondata = loadUnderlayData();
- $('#tbl_overlay').bootstrapTable({
- //Assigning data to table
- data: jsondata
- });
- $('#underlayTpDataTable').bootstrapTable({
- //Assigning data to table
- data: {}
- });
- $('.table tbody tr').click(function () {
- $(this).addClass('openoTable_row_selected').siblings().removeClass('openoTable_row_selected');
- });
-
- $('#sai').on('sort.bs.table', function () {
-
-
- }).on('click-row.bs.table', function () {
-
-
- $('.table tbody tr').click(function() {
-
- $(this).addClass('openoTable_row_selected').siblings().removeClass('openoTable_row_selected');
- });
-
- });
-
- var serviceId = getQueryStringValue("serviceId");
- console.log("underlayvpn - serviceId : " + serviceId);
-
- });
-
- function getQueryStringValue (key) {
- var params = new URLSearchParams(window.location.search.slice(1));
- return params.get(key);
- }
-
- function operateFormatter(value, row, index) {
- return [
- '<img class="siteDeleteImg" src="images/delete.png" href="javascript:void(0)" style="cursor: pointer" name="title" title="Delete" />'
- ].join('');
- }
- window.operateEvents = {
- 'click .siteDeleteImg': function(e, value, row, index) {
- // TO DO ajex call for delete
- console.log(value, row, index);
- }
- };
- /* function nameFormatter(value, row) {
- jsonForTP = row.json.data;
- var name=JSON.stringify(row.json.data);
- var temp = "<a class='underlayNameLink' onclick='getMethod(this)' name='"+ name + "' data-events='operateEventsU'>" + value + "</a>";
- return temp;
- }*/
- function getMethod(obj) {
- //Update the lower table here
- $('#underlayTpDataTable').bootstrapTable(
- //Assigning data to table
- "append", JSON.parse(obj.name)
- );
- }
- </script>
-
-</head>
-
-<body id="open_base_vpn_cotentBody" class="cotentBody ng-scope">
- <div class="container-fluid ms-controller">
- <h3>Underlay VPN</h3>
- <!-- <div class="row-fluid" data-name="table_zone">
- <div id='ict_virtualApplication_table_div'>
- <div>
- <div class="top">
- <table class="table table-striped" id="tbl_overlay" data-pagination="true" data-page-size="5" data-pagination-first-text="First" data-pagination-pre-text="Previous" data-pagination-next-text="Next" data-pagination-last-text="Last">
- <thead id="sunderlayTable_thead" class="openo-table-thead" style="background:#ECECEC">
- <tr class="active">
-
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-formatter="nameFormatter" data-field="underlayName" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="underlayName_sorticon" class="openo-table-th-sorticon overflow_elip openoTable_sortable leftHeaderAlign openo-table-disable-element ">Name
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="underlayTenantName" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="underlayTenantName_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">State
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="underlayType" data-sortable="true">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="underlayType_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Description
- </span>
- </div>
- </th>
- <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign" data-field="underlayDescription" align="center" data-formatter="operateFormatter" data-events="operateEvents">
- <div class="openo-table-th-border"></div>
- <div class="DataTables_sort_wrapper openo-ellipsis ">
- <span id="underlayDescription_sorticon" class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Action
- </span>
- </div>
- </th>
-
- </tr>
- </thead>
- <tbody>
-
- <tr>
- <td>a_data </td>
- <td>data </td>
- <td>Sample1 </td>
- <td>
- <button class="table-btn delete-btn"></button>
- </td>
- </tr>
-
- <tr>
- <td>b_data </td>
- <td>new sample </td>
- <td>modified </td>
- <td>
- <button class="table-btn delete-btn"></button>
- </td>
- </tr>
-
- <tr>
- <td>data </td>
- <td>updated </td>
- <td>Sample </td>
- <td>
- <button class="table-btn delete-btn"></button>
- </td>
- </tr>
-
- <tr>
- <td>alarm </td>
- <td>deleted </td>
- <td>Sample </td>
- <td>
- <button class="table-btn delete-btn"></button>
- </td>
- </tr>
- </tbody>
-
- </table>
- </div>
- </div>
- </div>
- </div>
- -->
-
- <div class="row-fluid" data-name="table_zone">
- <div id='ict_virtualApplication_table_div'>
- <div>
- <div class="top">
- <table class="table-striped table " id="sai" data-pagination="true" data-pagination-first-text="First"
- data-pagination-pre-text="Previous" data-pagination-next-text="Next" data-pagination-last-text="Last"
- data-filter-control="true">
- <thead style="background:#ECECEC">
- <tr>
- <th data-field="name" data-sortable="true" data-filter-control="input">Name</th>
- <th data-field="state" data-sortable="true" data-filter-control="input">State</th>
- <th data-field="desc" data-sortable="true" data-filter-control="input">Description</th>
- <th data-field="action" data-sortable="">Action</th>
- </tr>
- </thead>
- </table>
- </div>
- </div>
- </div>
- </div>
-
- <div id="tpDiv">
- <iframe src="UnderLay_TP.html" style="width:100%;height:450px;" name="targetframe" allowTransparency="true" scrolling="no" frameborder="0">
- </iframe>
- </div>
- <div id="filterTpLogicalType_select_popupcontainer" class="openo openo-select-popup-container openo-hide"
- style="width: 155px; max-height: 130px; left: 628px; top: 104px; z-index: 1761;">
- <div class="openo-select-item openo-ellipsis " id="filterTpLogicalType_openo-select-id_0"><label
- class="openo-ellipsis openo-select-blank-item" style="width: 100%; display: block; height: 20px;"></label>
- </div>
- <div class="openo-select-item openo-ellipsis " id="filterTpLogicalType_openo-select-id_1"><label
- class="openo-ellipsis " style="width: 100%; display: block; height: 20px;">ETH</label></div>
- <div class="openo-select-item openo-ellipsis " id="filterTpLogicalType_openo-select-id_2"><label
- class="openo-ellipsis " style="width: 100%; display: block; height: 20px;" title="POS">POS</label></div>
- <div class="openo-select-item openo-ellipsis " id="filterTpLogicalType_openo-select-id_3"><label
- class="openo-ellipsis " style="width: 100%; display: block; height: 20px;">Trunk</label></div>
- <div class="openo-select-item openo-ellipsis " id="filterTpLogicalType_openo-select-id_4"><label
- class="openo-ellipsis " style="width: 100%; display: block; height: 20px;">Loopback</label></div>
- </div>
-</body>
-</html> \ No newline at end of file