Update for SNI Chcecking

SNI checking is now supproted in Jersey.

Issue-ID: POLICY-4474
Change-Id: Ifd6aa0718e0d3fcb7eec49f19fac7ab5065f54b5
Signed-off-by: liamfallon <liam.fallon@est.tech>

diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderParametersTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderParametersTest.java
index 73cf646..1904edc 100644 (file)
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderParametersTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderParametersTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2022 Nordix Foundation.
- *  Modifications Copyright (C) 2022 Nordix Foundation.
+ *  Modifications Copyright (C) 2022-2023 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ import org.onap.policy.distribution.forwarding.testclasses.CommonTestData;
  */
 public class LifecycleApiAutomationCompositionForwarderParametersTest {
 
-    private static final String AUTOMATION_COMPOSITION_RUNTIME_HOST_NAME = "0.0.0.0";
+    private static final String AUTOMATION_COMPOSITION_RUNTIME_HOST_NAME = "localhost";
     private static final int AUTOMATION_COMPOSITION_RUNTIME_PORT = 6969;
     private static final String AUTOMATION_COMPOSITION_RUNTIME_USER = "policyadmin";
     private static final String AUTOMATION_COMPOSITION_RUNTIME_PASSWORD = "zb!XztG34";

diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderTest.java
index 672cb6b..0c9a8f6 100644 (file)
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderTest.java
@@ -1,7 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2022 Nordix Foundation.
- *  Modifications Copyright (C) 2022 Nordix Foundation.
+ *  Copyright (C) 2022-2023 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,7 +67,7 @@ public class LifecycleApiAutomationCompositionForwarderTest {
                 LifecycleApiAutomationCompositionForwarderParameters.class);
         ParameterService.register(parameterGroup);
         simulator.startLifecycycleApiSimulator();
-        if (!NetworkUtil.isTcpPortOpen("0.0.0.0", 6969, 50, 200L)) {
+        if (!NetworkUtil.isTcpPortOpen("localhost", 6969, 50, 200L)) {
             throw new IllegalStateException("cannot connect to port 6969");
         }
     }

diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java
index 6d4ab36..42602cf 100644 (file)
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019-2021 Nordix Foundation.
+ *  Copyright (C) 2019-2021,2023 Nordix Foundation.
  *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,11 +37,11 @@ import org.onap.policy.distribution.forwarding.testclasses.CommonTestData;
  */
 public class LifecycleApiForwarderParametersTest {
 
-    private static final String POLICY_API_HOST_NAME = "0.0.0.0";
+    private static final String POLICY_API_HOST_NAME = "localhost";
     private static final int POLICY_API_PORT = 6969;
     private static final String POLICY_API_USER = "policyadmin";
     private static final String POLICY_API_PASSWORD = "zb!XztG34";
-    private static final String POLICY_PAP_HOST_NAME = "0.0.0.0";
+    private static final String POLICY_PAP_HOST_NAME = "localhost";
     private static final int POLICY_PAP_PORT = 6969;
     private static final String POLICY_PAP_USER = "policyadmin";
     private static final String POLICY_PAP_PASSWORD = "zb!XztG34";

diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java
index 759ec1d..604445e 100644 (file)
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019-2021 Nordix Foundation.
+ *  Copyright (C) 2019-2021,2023 Nordix Foundation.
  *  Modifications Copyright (C) 2020 AT&T Inc.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -68,7 +68,7 @@ public class LifecycleApiPolicyForwarderTest {
                 LifecycleApiForwarderParameters.class);
         ParameterService.register(parameterGroup);
         simulator.startLifecycycleApiSimulator();
-        if (!NetworkUtil.isTcpPortOpen("0.0.0.0", 6969, 50, 200L)) {
+        if (!NetworkUtil.isTcpPortOpen("localhost", 6969, 50, 200L)) {
             throw new IllegalStateException("cannot connect to port 6969");
         }
     }

diff --git a/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiAutomationCompositionForwarderParameters.json b/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiAutomationCompositionForwarderParameters.json
index d9d6dbb..28b0223 100644 (file)
--- a/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiAutomationCompositionForwarderParameters.json
+++ b/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiAutomationCompositionForwarderParameters.json
@@ -1,7 +1,7 @@
 {
   "automationCompositionRuntimeParameters": {
     "clientName": "policy-clamp-runtime-acm",
-    "hostname": "0.0.0.0",
+    "hostname": "localhost",
     "port": 6969,
     "useHttps": false,
     "userName": "policyadmin",

diff --git a/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json b/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json
index 13e4d88..804c841 100644 (file)
--- a/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json
+++ b/plugins/forwarding-plugins/src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json
@@ -1,7 +1,7 @@
 {
   "apiParameters": {
     "clientName": "policy-api",
-    "hostname": "0.0.0.0",
+    "hostname": "localhost",
     "port": 6969,
     "useHttps": false,
     "userName": "policyadmin",
@@ -9,7 +9,7 @@
   },
   "papParameters": {
     "clientName": "policy-pap",
-    "hostname": "0.0.0.0",
+    "hostname": "localhost",
     "port": 6969,
     "useHttps": false,
     "userName": "policyadmin",

diff --git a/plugins/forwarding-plugins/src/test/resources/parameters/RestServerParameters.json b/plugins/forwarding-plugins/src/test/resources/parameters/RestServerParameters.json
index 8d3bc58..73de62f 100644 (file)
--- a/plugins/forwarding-plugins/src/test/resources/parameters/RestServerParameters.json
+++ b/plugins/forwarding-plugins/src/test/resources/parameters/RestServerParameters.json
@@ -1,5 +1,5 @@
 {
-    "host": "0.0.0.0",
+    "host": "localhost",
     "port": 6969,
     "userName": "policyadmin",
     "password": "zb!XztG34"