From 562b91c16ea3670bf0c4f7a2bf4d578207eecf07 Mon Sep 17 00:00:00 2001 From: Aijana Schumann Date: Fri, 23 Oct 2020 11:58:02 +0200 Subject: Update NetworkMap Change how pnfs/nodes are discovered; new lookup uses node-name Issue-ID: CCSDK-2940 Signed-off-by: Aijana Schumann Change-Id: I2561d5a2478664fc975b25f08a7ef57122756e0a --- .../apps/networkMapApp/src/actions/detailsAction.ts | 13 +++++-------- .../apps/networkMapApp/src/components/denseTable.tsx | 18 ++++-------------- 2 files changed, 9 insertions(+), 22 deletions(-) (limited to 'sdnr/wt/odlux/apps') diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/actions/detailsAction.ts b/sdnr/wt/odlux/apps/networkMapApp/src/actions/detailsAction.ts index 5288f61d9..afa8ee41e 100644 --- a/sdnr/wt/odlux/apps/networkMapApp/src/actions/detailsAction.ts +++ b/sdnr/wt/odlux/apps/networkMapApp/src/actions/detailsAction.ts @@ -102,12 +102,10 @@ running=true; dispatcher(new IsBusyCheckingDeviceListAction(true)); const promises = list.map((device)=>{ - if(device.simulatorId){ - return requestRest("/rests/operational/network-topology:network-topology/topology/topology-netconf/node/"+device.simulatorId, { method: "GET" }) - + if(device.name){ + return requestRest("/rests/data/network-topology:network-topology/topology=topology-netconf/node="+device.name, { method: "GET" }) }else{ - return requestRest("/rests/operational/network-topology:network-topology/topology/topology-netconf/node/"+device.name, { method: "GET" }) - + return device; } }) @@ -117,9 +115,8 @@ running=true; result.forEach((res: any, index)=>{ - if(res !==null && res.node!==null){ - - list[index].status = res.node[0]["netconf-node-topology:connection-status"]; + if(res !==null && res["network-topology:node"]){ + list[index].status = res["network-topology:node"][0]["netconf-node-topology:connection-status"]; }else{ list[index].status = "Not connected"; } diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/components/denseTable.tsx b/sdnr/wt/odlux/apps/networkMapApp/src/components/denseTable.tsx index 1506df5ab..72fe79ee3 100644 --- a/sdnr/wt/odlux/apps/networkMapApp/src/components/denseTable.tsx +++ b/sdnr/wt/odlux/apps/networkMapApp/src/components/denseTable.tsx @@ -71,15 +71,8 @@ const DenseTable: React.FunctionComponent = (props) => { - {props.data.map((row, index) => { - - - var filteredRows = Object.keys(row).filter(function(e) { if(e!=="simulatorId") return row }); - - //var filteredRows = Object.keys(row).filter(function(e) { if(e!=="simulatorId") return row[e] }); - var values = Object.keys(row).map(function(e) { if(e!=="simulatorId"){ return row[e];} else return undefined }); - - + {props.data.map((row, index) => { + var values = Object.keys(row).map(function(e) { return row[e] }); return ( handleHover(e,row.name)} onClick={ e => handleClick(e, row.name)}> @@ -96,14 +89,11 @@ const DenseTable: React.FunctionComponent = (props) => { props.actions &&
- - - - + - +
-- cgit 1.2.3-korg