From c0b9695b0992951d3de5ec91923c598f4d8072c9 Mon Sep 17 00:00:00 2001 From: Seshu-Kumar-M Date: Wed, 2 Nov 2016 14:52:17 +0800 Subject: SDNO-843 Change-Id: Idc3dbbc5c714a0cedf918ac6f32c92849c5a58b8 Signed-off-by: Seshu-Kumar-M --- .../src/main/webapp/lifecyclemgr/TopoAccor.html | 143 +++++++++++++++++++++ .../src/main/webapp/lifecyclemgr/accorTables.html | 42 +++++- .../src/main/webapp/lifecyclemgr/chartTopo.html | 28 +--- .../src/main/webapp/lifecyclemgr/gsolcmmain.html | 7 +- .../src/main/webapp/lifecyclemgr/underlayvpn.html | 95 +++++++------- 5 files changed, 239 insertions(+), 76 deletions(-) create mode 100644 openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/TopoAccor.html (limited to 'openo-portal') diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/TopoAccor.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/TopoAccor.html new file mode 100644 index 00000000..4b4ae9ef --- /dev/null +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/TopoAccor.html @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + JS Bin + + + + +
+ +
+ +
+
+

+ + SDNO + +

+
+
+
+ + + + +
+
+
+ + +
+
+

+ +

+
+
+
+ + + +
+
+
+
+ +
+ + + + + \ No newline at end of file diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html index d23807f4..d3df215a 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html @@ -54,6 +54,11 @@ } } + + $("#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() { @@ -81,6 +86,7 @@ el.classList.add('selected'); switch (panelType) { case "sdno": + $("#nfvo_dashboard").hide(); if(el.id == "overLink") { $("#dashboard").show(); $("#overDiv").show(); @@ -97,11 +103,13 @@ 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; @@ -138,7 +146,7 @@ content += '
  • OPEN-O
    • '; } else if(type == "nfvo"){ - content += '
  • ZTE
    • '; + //content += '
  • ZTE
    • '; } content += ''; return content; @@ -268,22 +276,42 @@ -
    -
    +
    +

    SDNO-VPN Manager

    - + --> + + +
    - + --> + + + +
    +
    +
    +
    + +
    +
    +

    NFVO

    +
    +
    +
    + + +

    diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/chartTopo.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/chartTopo.html index 53fa5709..ab0d71f3 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/chartTopo.html +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/chartTopo.html @@ -96,27 +96,7 @@ var serviceId = getQueryStringValue("serviceId"); console.log("TOPO - serviceId : "+ serviceId); - var jsonData = loadServiceDetails(serviceId); - console.log("jsonData length: "+jsonData.length); - for(i = 0; i < jsonData.length; i++) { - console.log("jsonData Name: "+jsonData[i].name); - if(jsonData[i].name == "sdno") { - //$("#sdnoLink").text(jsonData[i].name.toUpperCase()); - console.log("Adding Accordian to SDNO"); - $("#accordion").append(addAccordionData("sdno", jsonData[i].name.toUpperCase())); - } - else if(jsonData[i].name == "gso") { - console.log("Adding Accordian to GSO"); - $("#accordion").append(addAccordionData("gso", jsonData[i].name.toUpperCase())); - } - else if(jsonData[i].name == "nfvo") { - console.log("Adding Accordian to NFVO"); - $("#accordion").append(addAccordionData("nfvo", jsonData[i].name.toUpperCase())); - } - else { - - } - } + $('#container').highcharts({ chart: { @@ -149,7 +129,7 @@ ren.path(rightArrow) .attr({ 'stroke-width': 1, - stroke: colors[3] + stroke: colors[1] }) .translate(95, 95) .add(); @@ -211,7 +191,7 @@ ren.path(rightArrow) .attr({ 'stroke-width': 1, - stroke: colors[3] + stroke: colors[1] }) .translate(300, 95) .add(); @@ -219,7 +199,7 @@ ren.path(rightArrow) .attr({ 'stroke-width': 1, - stroke: colors[3] + stroke: colors[1] }) .translate(500, 95) .add(); diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html index ad3b5977..d20c55b1 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html @@ -70,7 +70,7 @@ document.getElementById("tabContainer").style.display = "block"; //loadIframe("topoFrame", "chartTopo.html?serviceId="+row.serviceId); - document.getElementById("topoCont").setAttribute('data', 'chartTopo.html?serviceId='+row.serviceId); + document.getElementById("topoContObj").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)); }); @@ -429,7 +429,10 @@