From 3d02271058d2e59a71e49afdd866462f7b6ab1c6 Mon Sep 17 00:00:00 2001 From: Aijana Schumann Date: Wed, 12 Aug 2020 12:28:06 +0200 Subject: Switch odlux from Biermann-RestConf to RFC8040 interface Switched rest-calls in odlux to use RFC8040 interface Issue-ID: CCSDK-2565 Signed-off-by: Aijana Schumann Change-Id: Ia59dd02bc6456bad648083146c0256f204e134d1 --- .../odlux/apps/faultApp/src/services/faultStatusService.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sdnr/wt/odlux/apps/faultApp/src/services') diff --git a/sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts b/sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts index d3409e095..d1236d2e7 100644 --- a/sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts +++ b/sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts @@ -16,12 +16,12 @@ * ============LICENSE_END========================================================================== */ import { requestRest } from "../../../../framework/src/services/restService"; -import { Result, PostResponse } from "../../../../framework/src/models/elasticSearch"; +import { Result, SingeResult } from "../../../../framework/src/models/elasticSearch"; import { FaultType, Faults, DeletedStuckAlarms } from "../models/fault"; export const getFaultStateFromDatabase = async (): Promise => { - const path = 'restconf/operations/data-provider:read-status'; + const path = 'rests/operations/data-provider:read-status'; const result = await requestRest>(path, { method: "POST" }); let faultType: FaultType = { @@ -32,8 +32,8 @@ export const getFaultStateFromDatabase = async (): Promise => } let faults: Faults[] | null = null; - if (result && result.output && result.output.data) { - faults = result.output.data; + if (result && result["data-provider:output"] && result["data-provider:output"].data) { + faults = result["data-provider:output"].data; faultType = { Critical: faults[0].faults.criticals, Major: faults[0].faults.majors, @@ -46,8 +46,8 @@ export const getFaultStateFromDatabase = async (): Promise => } export const clearStuckAlarms = async (nodeNames: string[]) => { - const path = 'restconf/operations/devicemanager:clear-current-fault-by-nodename' - const result = await requestRest(path, { method: 'Post', body: JSON.stringify({ input: { nodenames: nodeNames } }) }) + const path = 'rests/operations/devicemanager:clear-current-fault-by-nodename' + const result = await requestRest>(path, { method: 'Post', body: JSON.stringify({ input: { nodenames: nodeNames } }) }) return result; } \ No newline at end of file -- cgit 1.2.3-korg