From 11e9f72aa953516053d867e09a0e95c77d7d1a88 Mon Sep 17 00:00:00 2001 From: tragait Date: Fri, 27 Aug 2021 15:01:27 +0100 Subject: fix getforentity in onap DMI plugin Issue-ID: CPS-573 Signed-off-by: tragait Change-Id: Idb2186e6f3275530513bbd5e788c98b4ceda9d10 --- src/main/java/org/onap/cps/ncmp/dmi/model/ModuleSchemas.java | 2 ++ .../java/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClient.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/org/onap/cps/ncmp/dmi/model/ModuleSchemas.java b/src/main/java/org/onap/cps/ncmp/dmi/model/ModuleSchemas.java index 1794dedf..5945168b 100644 --- a/src/main/java/org/onap/cps/ncmp/dmi/model/ModuleSchemas.java +++ b/src/main/java/org/onap/cps/ncmp/dmi/model/ModuleSchemas.java @@ -20,6 +20,7 @@ package org.onap.cps.ncmp.dmi.model; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; import lombok.Setter; @@ -30,5 +31,6 @@ import lombok.Setter; @Setter public class ModuleSchemas { + @JsonProperty("ietf-netconf-monitoring:schemas") private ModuleSchemaList schemas; } diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClient.java b/src/main/java/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClient.java index fe13a38d..bbc39da5 100644 --- a/src/main/java/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClient.java +++ b/src/main/java/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClient.java @@ -23,6 +23,7 @@ package org.onap.cps.ncmp.dmi.service.client; import org.onap.cps.ncmp.dmi.config.DmiConfiguration.SdncProperties; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; @@ -60,7 +61,8 @@ public class SdncRestconfClient { final String sdncRestconfUrl = sdncBaseUrl.concat(getResourceUrl); httpHeaders.setBasicAuth(sdncProperties.getAuthUsername(), sdncProperties.getAuthPassword()); final var httpEntity = new HttpEntity<>(httpHeaders); - return restTemplate.getForEntity(sdncRestconfUrl, String.class, httpEntity); + return restTemplate.exchange(sdncRestconfUrl, + HttpMethod.GET, httpEntity, String.class); } /** -- cgit 1.2.3-korg