diff options
Diffstat (limited to 'src/main/java/org/onap/dcae/controller')
3 files changed, 16 insertions, 2 deletions
diff --git a/src/main/java/org/onap/dcae/controller/AccessController.java b/src/main/java/org/onap/dcae/controller/AccessController.java index c2ed5e3..bd80d97 100644 --- a/src/main/java/org/onap/dcae/controller/AccessController.java +++ b/src/main/java/org/onap/dcae/controller/AccessController.java @@ -71,6 +71,7 @@ public class AccessController { .setController_subscriptionUrl(controller.get("controller_subscriptionUrl").toString()) .setController_accessTokenMethod(controller.get("controller_accessTokenMethod").toString()) .setController_subsMethod(controller.get("controller_subsMethod").toString()) + .setController_disableSsl(controller.get("controller_disableSsl").toString()) .createControllerConfigInfo(); this.properties = properties; this.ctx = new RestConfContext(); @@ -237,6 +238,7 @@ public class AccessController { String KeyPassword = getKeyStorePassword(toAbsolutePath(this.getProperties().keystorePasswordFileLocation())); paraMap.put(Constants.KSETTING_KEY_STORE_PASSWD, KeyPassword); + paraMap.put(Constants.KDEFAULT_DISABLE_SSL, "true"); } private Path toAbsolutePath(final String path) { diff --git a/src/main/java/org/onap/dcae/controller/ControllerConfigInfo.java b/src/main/java/org/onap/dcae/controller/ControllerConfigInfo.java index 52cfc83..68eb162 100644 --- a/src/main/java/org/onap/dcae/controller/ControllerConfigInfo.java +++ b/src/main/java/org/onap/dcae/controller/ControllerConfigInfo.java @@ -29,7 +29,7 @@ public class ControllerConfigInfo { private String controller_subscriptionUrl; private String controller_accessTokenMethod; private String controller_subsMethod; - + private String controller_disableSsl; public static class ControllerConfigInfoBuilder { @@ -42,6 +42,7 @@ public class ControllerConfigInfo { private String controller_subscriptionUrl; private String controller_accessTokenMethod; private String controller_subsMethod; + private String controller_disableSsl; public ControllerConfigInfoBuilder setController_name(String controller_name) { this.controller_name = controller_name; @@ -88,6 +89,11 @@ public class ControllerConfigInfo { return this; } + public ControllerConfigInfoBuilder setController_disableSsl(String controller_disableSsl) { + this.controller_disableSsl = controller_disableSsl; + return this; + } + public ControllerConfigInfo createControllerConfigInfo() { return new ControllerConfigInfo(this); } @@ -104,7 +110,7 @@ public class ControllerConfigInfo { this.controller_subscriptionUrl = controllerConfigInfoBuilder.controller_subscriptionUrl; this.controller_accessTokenMethod = controllerConfigInfoBuilder.controller_accessTokenMethod; this.controller_subsMethod = controllerConfigInfoBuilder.controller_subsMethod; - + this.controller_disableSsl = controllerConfigInfoBuilder.controller_disableSsl; } @@ -143,4 +149,9 @@ public class ControllerConfigInfo { public String getController_subscriptionUrl() { return controller_subscriptionUrl; } + + public String getController_disableSsl() { + return controller_disableSsl; + } + }
\ No newline at end of file diff --git a/src/main/java/org/onap/dcae/controller/PersistentEventConnection.java b/src/main/java/org/onap/dcae/controller/PersistentEventConnection.java index c963129..2fb782f 100644 --- a/src/main/java/org/onap/dcae/controller/PersistentEventConnection.java +++ b/src/main/java/org/onap/dcae/controller/PersistentEventConnection.java @@ -175,6 +175,7 @@ public class PersistentEventConnection implements Runnable { modifyEventParamMap(Constants.KSETTING_REST_UNAME, parentCtrllr.getCfgInfo().getController_restapiUser()); modifyEventParamMap(Constants.KSETTING_REST_PASSWD, parentCtrllr.getCfgInfo().getController_restapiPassword()); modifyEventParamMap(Constants.KSETTING_HTTP_METHOD, parentCtrllr.getCfgInfo().getController_subsMethod()); + modifyEventParamMap(Constants.KDEFAULT_DISABLE_SSL, parentCtrllr.getCfgInfo().getController_disableSsl()); parentCtrllr.getRestApiCallNode().sendRequest(eventParaMap, ctx, null); } catch (Exception e) { |