summaryrefslogtreecommitdiffstats
path: root/controlloop/common
diff options
context:
space:
mode:
authorHockla, Ali (ah999m) <ah999m@att.com>2017-11-08 13:38:51 -0600
committerHockla, Ali (ah999m) <ah999m@att.com>2017-11-08 13:39:23 -0600
commit9cbbe8c6abd790ab84ff47214db1f63bb5c2e1d7 (patch)
tree1581af5c20985616102f94487cc41f6bd7ddd609 /controlloop/common
parent788954ff3d8ee41927a2a11ebc9a9bdbd7ed2e2c (diff)
Fix SO url to remove suffix HTTPS/1.1
Issue-ID: POLICY-437 Change-Id: I19679d9782f78ff73e3a90d0c8c95b2b6e9d319f Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
Diffstat (limited to 'controlloop/common')
-rw-r--r--controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java2
-rw-r--r--controlloop/common/simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java2
-rw-r--r--controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java2
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 6d78b64c3..c3828bb79 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
@@ -146,7 +146,7 @@ public final class SOManager {
String username = PolicyEngine.manager.getEnvironmentProperty("so.username");
String password = PolicyEngine.manager.getEnvironmentProperty("so.password");
- String url = serverRoot + "/serviceInstances/v5/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/vfModulesHTTPS/1.1";
+ String url = serverRoot + "/serviceInstances/v5/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/vfModules";
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 a0435cf8f..2dd4d0908 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("/v5/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModulesHTTPS/1.1")
+ @Path("/v5/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules")
@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 d989ba025..090236c40 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/v5/12345/vnfs/12345/vfModulesHTTPS/1.1", "username",
+ "http://localhost:6667/serviceInstances/v5/12345/vnfs/12345/vfModules", "username",
"password", new HashMap<>(), "application/json", request);
assertNotNull(httpDetails);
final SOResponse response = Serialization.gsonPretty.fromJson(httpDetails.b, SOResponse.class);