X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=nokia%2Fvnfmdriver%2Fvfcadaptorservice%2Fvfcadaptor%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fvfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm%2Faai%2Fimpl%2FAaiMgmrInfImpl.java;h=ddc78ebe28775efef3e2efdce9e80f59009f3066;hb=0ed7945aedd982d171d1d430b1dc116e29b0127b;hp=a8286f86b21325c92fdb0b7a654d469b23d5b84b;hpb=ad168f1c43063da685c3745bffe62283cf7f2bd3;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/aai/impl/AaiMgmrInfImpl.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/aai/impl/AaiMgmrInfImpl.java index a8286f86..ddc78ebe 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/aai/impl/AaiMgmrInfImpl.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/aai/impl/AaiMgmrInfImpl.java @@ -19,6 +19,7 @@ package org.onap.vfc.nfvo.driver.vnfm.svnfm.aai.impl; import java.io.IOException; import java.util.HashMap; +import org.apache.commons.codec.binary.Base64; import org.apache.http.client.ClientProtocolException; import org.onap.vfc.nfvo.driver.vnfm.svnfm.aai.bo.AaiVnfmInfo; import org.onap.vfc.nfvo.driver.vnfm.svnfm.aai.inf.AaiMgmrInf; @@ -28,7 +29,6 @@ import org.onap.vfc.nfvo.driver.vnfm.svnfm.http.client.HttpClientProcessorInf; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestMethod; @@ -62,10 +62,19 @@ public class AaiMgmrInfImpl implements AaiMgmrInf{ private String operateHttpTask(Object httpBodyObj, String httpPath, RequestMethod method) throws ClientProtocolException, IOException { String url=adaptorEnv.getAaiApiUriFront() + httpPath; - HashMap map = new HashMap<>(); - map.put(CommonConstants.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE); + HashMap headerMap = new HashMap<>(); + headerMap.put("Content-Type", "application/json"); + headerMap.put("Accept", "application/json"); + headerMap.put("X-TransactionId", "9999"); + headerMap.put("X-FromAppId", "esr-server"); + + Base64 token = new Base64(); + String authen = new String(token.encode(("AAI:AAI").getBytes())); + headerMap.put("Authorization", "Basic " + authen); + logger.info("getVimById headerMap: {}", headerMap.toString()); + - String responseStr = httpClientProcessor.process(url, method, map, gson.toJson(httpBodyObj)).getContent(); + String responseStr = httpClientProcessor.process(url, method, headerMap, gson.toJson(httpBodyObj)).getContent(); return responseStr; }