From: Seshu-Kumar-M Date: Wed, 2 Nov 2016 14:31:21 +0000 (+0800) Subject: Issue related to the underlay VPN details loading from the Service. X-Git-Tag: release/sun~10 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5b1899c5c6088dc980712e67f5509f4525abaa81;p=vnfsdk%2Frefrepo.git Issue related to the underlay VPN details loading from the Service. Accordion loading from the GSO tabbed pane SDNO-847 Change-Id: I5d9e39ff86ca1b4052eba36977f9d72d70ed71eb Signed-off-by: Seshu-Kumar-M --- 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 826fc049..09c27904 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html @@ -43,12 +43,12 @@ debugger; if("SSAR" === serviceType) { - object.name = "sdno" + object.nodeType = "sdn" jsonData[0] = object; } else if("NSAR" == serviceType || "NFAR" == serviceType || "NFVO" == serviceType) { - object.name = "nfvo"; + object.nodeType = "nfv"; jsonData[0] = object; } else{ @@ -60,19 +60,19 @@ //TODO check for the 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") { + // 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", jsonData[i].name.toUpperCase())); + $("#accordion").append(addAccordionData("sdno", "SDNO")); } - else if (jsonData[i].name == "gso") { + else if (jsonData[i].nodeType.indexOf('gso') != -1) { console.log("Adding Accordian to GSO"); - $("#accordion").append(addAccordionData("gso", jsonData[i].name.toUpperCase())); + $("#accordion").append(addAccordionData("gso", "GSO")); } - else if (jsonData[i].name == "nfvo") { + else if (jsonData[i].nodeType.indexOf('nfv') != -1) { console.log("Adding Accordian to NFVO"); - $("#accordion").append(addAccordionData("nfvo", jsonData[i].name.toUpperCase())); + $("#accordion").append(addAccordionData("nfvo", "NFVO")); } else {