From db1a18820fa4ab7bdc99b6f0ab5a07216835c3d3 Mon Sep 17 00:00:00 2001 From: Michael Hwang Date: Fri, 27 Oct 2017 14:05:07 -0400 Subject: Fix setting of useHttpsWithDmaap config Change-Id: I91c6a0fe72c66fca3a740206753f9bcff10825a3 Issue-Id: DCAEGEN2-183 Signed-off-by: Michael Hwang --- src/sch/core.clj | 2 +- test/sch/core_test.clj | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 test/sch/core_test.clj diff --git a/src/sch/core.clj b/src/sch/core.clj index a5e1998..d83d266 100644 --- a/src/sch/core.clj +++ b/src/sch/core.clj @@ -110,7 +110,7 @@ (getKeyStorePassword [] (str (:keyStorePassword config-asdc))) (activateServerTLSAuth [] (boolean (:activateServerTLSAuth config-asdc))) (isFilterInEmptyResources [] (boolean (:isFilterInEmptyResources config-asdc))) - (isUseHttpsWithDmaap [] (contains? config-asdc :useHttpsWithDmaap) (Boolean/valueOf(str (:useHttpsWithDmaap config-asdc))) true) + (isUseHttpsWithDmaap [] (boolean (:useHttpsWithDmaap config-asdc false))) ))) (defn run-distribution-client! diff --git a/test/sch/core_test.clj b/test/sch/core_test.clj new file mode 100644 index 0000000..c0682f4 --- /dev/null +++ b/test/sch/core_test.clj @@ -0,0 +1,46 @@ +; ============LICENSE_START======================================================= +; org.onap.dcae +; ================================================================================ +; Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +; ================================================================================ +; Licensed under the Apache License, Version 2.0 (the "License"); +; you may not use this file except in compliance with the License. +; You may obtain a copy of the License at +; +; http://www.apache.org/licenses/LICENSE-2.0 +; +; Unless required by applicable law or agreed to in writing, software +; distributed under the License is distributed on an "AS IS" BASIS, +; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +; See the License for the specific language governing permissions and +; limitations under the License. +; ============LICENSE_END========================================================= +; +; ECOMP is a trademark and service mark of AT&T Intellectual Property. + +(ns sch.core-test + (:use (clojure test)) + (:require [sch.core :refer [create-distribution-client-config]]) + ) + +(deftest test-create-distribution-client-config + (let [config { :asdcDistributionClient { :environmentName "ONAP-AMDOCS" + :asdcAddress "10.0.3.1:8443" + :keyStorePassword nil + :pollingInterval 20 + :consumerGroup "dcae" + :asdcUri "https://10.0.3.1:8443" + :consumerId "dcae-sch" + :pollingTimeout 20 + :user "dcae" + :keyStorePath nil + :password "some-password" + :isFilterInEmptyResources false + :activateServerTLSAuth false + :useHttpsWithDmaap true }} + + dcc (create-distribution-client-config config) + ] + (is (= (. dcc isUseHttpsWithDmaap) true)) + ) + ) -- cgit 1.2.3-korg