diff options
| author |   Hockla, Ali (ah999m) <ah999m@att.com> | 2017-10-30 11:14:54 -0500 |
|---|---|---|
| committer | Hockla, Ali (ah999m) <ah999m@att.com> | 2017-10-30 11:44:07 -0500 |
| commit | 94bd5b50a2d945824e51d5148d888fd0f46acc99 (patch) | |
| tree | 80ee1e573b77a4d369ca7f55c5decbbfd7014830 /controlloop/common | |
| parent | 039c4d4d3bc00c129554b3761258d06e6ef87b58 (diff) | |
Update SO url from v2 to v5
Issue-ID: POLICY-401
Change-Id: Id1be63d2f61bc0d9d8f15df7573af2c7307c1c31
Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
Diffstat (limited to 'controlloop/common')
3 files changed, 3 insertions, 3 deletions
diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java index c6d0994ad..fb2cc3d60 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java @@ -149,7 +149,7 @@ public final class SOManager { String username = PolicyEngine.manager.getEnvironmentProperty("so.username"); String password = PolicyEngine.manager.getEnvironmentProperty("so.password"); - String url = serverRoot + "/serviceInstances/v2/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/vfModulesHTTPS/1.1"; + String url = serverRoot + "/serviceInstances/v5/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/vfModulesHTTPS/1.1"; String auth = username + ":" + password; diff --git a/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java b/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java index b9e657764..a0435cf8f 100644 --- a/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java +++ b/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java @@ -34,7 +34,7 @@ import org.onap.policy.so.util.Serialization; public class SoSimulatorJaxRs { @POST - @Path("/v2/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModulesHTTPS/1.1") + @Path("/v5/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModulesHTTPS/1.1") @Consumes(MediaType.APPLICATION_JSON) @Produces("application/json") public String SoPostQuery(@PathParam("serviceInstanceId") String serviceInstanceId, @PathParam("vnfInstanceId") String vnfInstanceId, String req) diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java index 683da86b7..d989ba025 100644 --- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java +++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java @@ -138,7 +138,7 @@ public class SoSimulatorTest { public void testResponse() { final String request = Serialization.gsonPretty.toJson(this.createTestRequest()); final Pair<Integer, String> httpDetails = RESTManager.post( - "http://localhost:6667/serviceInstances/v2/12345/vnfs/12345/vfModulesHTTPS/1.1", "username", + "http://localhost:6667/serviceInstances/v5/12345/vnfs/12345/vfModulesHTTPS/1.1", "username", "password", new HashMap<>(), "application/json", request); assertNotNull(httpDetails); final SOResponse response = Serialization.gsonPretty.fromJson(httpDetails.b, SOResponse.class); |