diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2020-03-05 13:24:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-03-05 13:24:05 +0000 |
| commit | 78fea6421c5126b19767e23db0c926bd351062ed (patch) | |
| tree | 450cf1f95654afccd31496cbecf212d129c36248 /models-interactions/model-actors | |
| parent | 6926aa36f0167efb4d6b25c6e3fd76846379150f (diff) | |
| parent | cb35d8306a90e50355bbdb662a26dbd836ef7e62 (diff) | |
Merge "SDNC Actor doesn't use full URL"
Diffstat (limited to 'models-interactions/model-actors')
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) { |