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>

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 6d78b64..c3828bb 100644 (file)
--- 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 a0435cf..2dd4d09 100644 (file)
--- 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 d989ba0..090236c 100644 (file)
--- 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);