aboutsummaryrefslogtreecommitdiffstats
path: root/models-interactions
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-03-04 15:02:45 -0500
committerJim Hahn <jrh3@att.com>2020-03-04 15:02:45 -0500
commitcb35d8306a90e50355bbdb662a26dbd836ef7e62 (patch)
tree7d2931dbd91e34eb8b0d6ee9edf85180fc0392b4 /models-interactions
parent4eeea438faf24af9d21c3167806734a65d0ae6c6 (diff)
SDNC Actor doesn't use full URL
Issue-ID: POLICY-1625 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: Ib9e6e4d988013966317df5b7c15867e3691b5748
Diffstat (limited to 'models-interactions')
-rw-r--r--models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncOperation.java5
-rw-r--r--models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncOperationTest.java5
2 files changed, 8 insertions, 2 deletions
diff --git a/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncOperation.java b/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncOperation.java
index a83faa724..018578829 100644
--- a/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncOperation.java
+++ b/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncOperation.java
@@ -67,13 +67,14 @@ public abstract class SdncOperation extends HttpOperation<SdncResponse> {
Map<String, Object> headers = makeHeaders();
headers.put("Accept", MediaType.APPLICATION_JSON);
- String url = makeUrl();
+ String path = getPath() + request.getUrl();
+ String url = getClient().getBaseUrl() + path;
logMessage(EventType.OUT, CommInfrastructure.REST, url, request);
// @formatter:off
return handleResponse(outcome, url,
- callback -> getClient().post(callback, makePath(), entity, headers));
+ callback -> getClient().post(callback, path, entity, headers));
// @formatter:on
}
diff --git a/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncOperationTest.java b/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncOperationTest.java
index b7f71715c..1a1cc5559 100644
--- a/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncOperationTest.java
+++ b/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncOperationTest.java
@@ -33,6 +33,8 @@ import org.onap.policy.sdnc.SdncRequest;
public class SdncOperationTest extends BasicSdncOperation {
+ private static final String MY_URI = "/my-uri";
+
private SdncRequest request;
private SdncOperation oper;
@@ -43,6 +45,9 @@ public class SdncOperationTest extends BasicSdncOperation {
public void setUp() throws Exception {
super.setUp();
+ request = new SdncRequest();
+ request.setUrl(MY_URI);
+
oper = new SdncOperation(params, config) {
@Override
protected SdncRequest makeRequest(int attempt) {