X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-config%2Fappc-flow-controller%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fappc%2Fflow%2Fcontroller%2Fnode%2FResourceUriExtractor.java;h=051d22fc61133d99b70859da6f9f486254f9c896;hb=HEAD;hp=22011e7738aeeab92e6575c8b0366d77a4e8f9fb;hpb=07fcbfcd2e65135556fce021748aa6c338cf710d;p=appc.git

diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/ResourceUriExtractor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/ResourceUriExtractor.java
index 22011e773..051d22fc6 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/ResourceUriExtractor.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/ResourceUriExtractor.java
@@ -2,9 +2,9 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2018 Nokia. All rights reserved. 
+ * Copyright (C) 2018 Nokia. All rights reserved.
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,16 +24,13 @@ package org.onap.appc.flow.controller.node;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.HTTP;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_CONTEXT;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_HOST_IP_ADDRESS;
+import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_HOST_IP_ADDRESS_ALT;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_REQUEST_ACTION;
-import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_SUB_CONTEXT;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_URL;
-import static org.onap.appc.flow.controller.utils.FlowControllerConstants.VNF_TYPE;
-import static org.onap.appc.flow.controller.utils.FlowControllerConstants.REST_PROTOCOL;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.REST_PORT;
 import static org.onap.appc.flow.controller.utils.FlowControllerConstants.REST_CONTEXT_URL;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import java.util.Properties;
 import org.apache.commons.lang.StringUtils;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
@@ -44,51 +41,39 @@ class ResourceUriExtractor {
 
     private static final EELFLogger log = EELFManager.getInstance().getLogger(RestServiceNode.class);
 
-    String extractResourceUri(SvcLogicContext ctx, Properties prop) throws Exception {
+    String extractResourceUri(SvcLogicContext ctx) throws Exception {
         String resourceUri = ctx.getAttribute(INPUT_URL);
 
         if (StringUtils.isBlank(resourceUri)) {
-            resourceUri = getAddress(ctx, prop);
+            resourceUri = getAddress(ctx);
             log.info("resourceUri= " + resourceUri);
-            resourceUri += getContext(ctx, prop);
+            resourceUri += getContext(ctx);
             log.info("resourceUri= " + resourceUri);
-            resourceUri += getSubContext(ctx, prop);
+
         }
         log.info("resourceUri= " + resourceUri);
 
         return resourceUri;
     }
 
-    private String getAddress(SvcLogicContext ctx, Properties prop) {
+    private String getAddress(SvcLogicContext ctx) {
         String address = ctx.getAttribute(INPUT_HOST_IP_ADDRESS);
-        String portPath = ctx.getAttribute(VNF_TYPE) + "." + (REST_PROTOCOL) + "."
-                + ctx.getAttribute(INPUT_REQUEST_ACTION) + "." + (REST_PORT);
-        String port = prop.getProperty(portPath);
+        if (address == null || address.length() == 0)
+            address = ctx.getAttribute(INPUT_HOST_IP_ADDRESS_ALT);
+        String port = ctx.getAttribute(REST_PORT);
         return HTTP + address + ":" + port;
     }
 
-    private String getContext(SvcLogicContext ctx, Properties prop) throws Exception {
+    private String getContext(SvcLogicContext ctx) throws Exception {
         String context;
-        String urlPath = ctx.getAttribute(VNF_TYPE) + "." + REST_PROTOCOL + "." + ctx.getAttribute(INPUT_REQUEST_ACTION)
-                + "." + REST_CONTEXT_URL;
         if (StringUtils.isNotBlank(ctx.getAttribute(INPUT_CONTEXT))) {
             context = "/" + ctx.getAttribute(INPUT_CONTEXT);
-        } else if (prop.getProperty(urlPath) != null) {
-            context = "/" + prop.getProperty(urlPath);
+        } else if (StringUtils.isNotBlank(ctx.getAttribute(REST_CONTEXT_URL))) {
+            context = "/" + ctx.getAttribute(REST_CONTEXT_URL);
         } else {
             throw new Exception("Could not find the context for operation " + ctx.getAttribute(INPUT_REQUEST_ACTION));
         }
         return context;
     }
 
-    private String getSubContext(SvcLogicContext ctx, Properties prop) throws Exception {
-        String subContext = "";
-        if (StringUtils.isNotBlank(ctx.getAttribute(INPUT_SUB_CONTEXT))) {
-            subContext = "/" + ctx.getAttribute(INPUT_SUB_CONTEXT);
-        } else if (prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + ".sub-context") != null) {
-            subContext = "/" + prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + ".sub-context");
-        } 
-        return subContext;
-    }
-
 }