X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-inbound%2Fappc-design-services%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fappc%2Fdesign%2Fxinterface%2FXResponseProcessor.java;h=5d0154cdf1154360b569496908f3497636071fb8;hb=18e906c444f39b4df933ae9570dc4ee5df5e36df;hp=4340acca9c1e4b96907f487b5ff24780a46af44d;hpb=dfa107152577e88749eb5344a861279d09499ad4;p=appc.git diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/xinterface/XResponseProcessor.java b/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/xinterface/XResponseProcessor.java index 4340acca9..5d0154cdf 100644 --- a/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/xinterface/XResponseProcessor.java +++ b/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/xinterface/XResponseProcessor.java @@ -35,64 +35,64 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class XResponseProcessor { - private final EELFLogger log = EELFManager.getInstance().getLogger(XInterfaceService.class); - Dme2Client dme2Client; + private final EELFLogger log = EELFManager.getInstance().getLogger(XInterfaceService.class); + Dme2Client dme2Client; - public static XResponseProcessor getInstance() { - return new XResponseProcessor(); - } + public static XResponseProcessor getInstance() { + return new XResponseProcessor(); + } - public String parseResponse(String execute, String action) throws Exception { - ObjectMapper objectMapper = new ObjectMapper(); - JsonNode payloadObject = objectMapper.readTree(execute); - log.info("payloadObject " + payloadObject); + public String parseResponse(String execute, String action) throws Exception { + ObjectMapper objectMapper = new ObjectMapper(); + JsonNode payloadObject = objectMapper.readTree(execute); + log.info("payloadObject " + payloadObject); - // String queryParam = null; - String instarResponse = null; - HashMap payload = null; - String ipAddress = null; - String mask = null; + // String queryParam = null; + String instarResponse = null; + HashMap payload = null; + String ipAddress = null; + String mask = null; - try { + try { - // check the payload whether its having ipaddr along with subnet - ipAddress = payloadObject.get(DesignServiceConstants.INSTAR_V4_ADDRESS) != null - ? payloadObject.get(DesignServiceConstants.INSTAR_V4_ADDRESS).textValue() - : (payloadObject.get(DesignServiceConstants.INSTAR_V6_ADDRESS) != null) - ? payloadObject.get(DesignServiceConstants.INSTAR_V6_ADDRESS).textValue() - .toUpperCase() - : null; + // check the payload whether its having ipaddr along with subnet + ipAddress = payloadObject.get(DesignServiceConstants.INSTAR_V4_ADDRESS) != null + ? payloadObject.get(DesignServiceConstants.INSTAR_V4_ADDRESS).textValue() + : (payloadObject.get(DesignServiceConstants.INSTAR_V6_ADDRESS) != null) + ? payloadObject.get(DesignServiceConstants.INSTAR_V6_ADDRESS).textValue() + .toUpperCase() + : null; - mask = payloadObject.get(DesignServiceConstants.INSTAR_V4_MASK) != null - ? payloadObject.get(DesignServiceConstants.INSTAR_V4_MASK).textValue() - : (payloadObject.get(DesignServiceConstants.INSTAR_V6_MASK) != null) - ? payloadObject.get(DesignServiceConstants.INSTAR_V6_MASK).textValue().toUpperCase() - : null; + mask = payloadObject.get(DesignServiceConstants.INSTAR_V4_MASK) != null + ? payloadObject.get(DesignServiceConstants.INSTAR_V4_MASK).textValue() + : (payloadObject.get(DesignServiceConstants.INSTAR_V6_MASK) != null) + ? payloadObject.get(DesignServiceConstants.INSTAR_V6_MASK).textValue().toUpperCase() + : null; - // TODO -short format + // TODO -short format - /* - * if (mask != null) { queryParam = ipAddress + "," +mask ; - * log.info("Calling Instar with IpAddress "+ ipAddress + " Mask value: "+ mask ); } else { - * queryParam = "ipAddress "+ipAddress ; log.info("Calling Instar with IpAddress "+ - * ipAddress); } - */ + /* + * if (mask != null) { queryParam = ipAddress + "," +mask ; + * log.info("Calling Instar with IpAddress "+ ipAddress + " Mask value: "+ mask ); } else { + * queryParam = "ipAddress "+ipAddress ; log.info("Calling Instar with IpAddress "+ + * ipAddress); } + */ - payload = new HashMap(); - payload.put("ipAddress", ipAddress); - payload.put("mask", mask); - log.info("Calling Instar with IpAddress " + ipAddress + " Mask value: " + mask); - dme2Client = new Dme2Client("getVnfbyIpadress", "payload", payload); + payload = new HashMap(); + payload.put("ipAddress", ipAddress); + payload.put("mask", mask); + log.info("Calling Instar with IpAddress " + ipAddress + " Mask value: " + mask); + dme2Client = new Dme2Client("getVnfbyIpadress", "payload", payload); - instarResponse = dme2Client.send(); + instarResponse = dme2Client.send(); - log.debug("Resposne from Instar = " + instarResponse); - if (instarResponse == null || instarResponse.length() < 0) - throw new Exception("No Data received from Instar for this action " + action); - } catch (Exception e) { - e.printStackTrace(); - throw e; + log.debug("Resposne from Instar = " + instarResponse); + if (instarResponse == null || instarResponse.length() < 0) + throw new Exception("No Data received from Instar for this action " + action); + } catch (Exception e) { + e.printStackTrace(); + throw e; + } + return instarResponse; } - return instarResponse; - } }