diff options
author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-04-03 11:51:58 +0200 |
---|---|---|
committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-04-03 17:22:22 +0200 |
commit | 2c41d11de03c07739ae395683c9d834ab282821c (patch) | |
tree | a2259956aa2fc83af2c2c6df50dacb89f1aee563 /sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java | |
parent | 0aae60b7882b816a6a7e32d4a91339935d61ff6b (diff) |
Allow SDC client to connect to SDC in HTTP
I've added a toggle which allow to connect to SDC using HTTP and not
only HTTPS.
By default, we're still on HTTPS.
Issue-ID: SDC-2721
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I48046c19aed7d81f9e03a30b3b081b9d8dd1495e
Diffstat (limited to 'sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java')
-rw-r--r-- | sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java index 0aa314e..de74831 100644 --- a/sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java +++ b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java @@ -7,9 +7,9 @@ * 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. @@ -41,6 +41,7 @@ public class TestConfiguration implements IConfiguration { private boolean activateServerTLSAuth; private boolean isFilterInEmptyResources; private boolean useHttpsWithDmaap; + private boolean useHttpsWithSDC; private List<String> msgBusAddress; public TestConfiguration(IConfiguration other) { @@ -74,6 +75,7 @@ public class TestConfiguration implements IConfiguration { this.keyStorePassword = "Aa123456"; this.activateServerTLSAuth = false; this.isFilterInEmptyResources = false; + this.useHttpsWithSDC = true; msgBusAddress = new ArrayList<String>(); msgBusAddress.add("www.cnn.com"); msgBusAddress.add("www.cnn.com"); @@ -281,7 +283,7 @@ public class TestConfiguration implements IConfiguration { return "TestConfiguration [asdcAddress=" + asdcAddress + ", user=" + user + ", password=" + password + ", pollingInterval=" + pollingInterval + ", pollingTimeout=" + pollingTimeout + ", relevantArtifactTypes=" + relevantArtifactTypes + ", consumerGroup=" + consumerGroup + ", environmentName=" + environmentName + ", comsumerID=" + comsumerID + "]"; } - + @Override public boolean isFilterInEmptyResources() { return isFilterInEmptyResources; @@ -296,4 +298,13 @@ public class TestConfiguration implements IConfiguration { public Boolean isUseHttpsWithDmaap() { return this.useHttpsWithDmaap; } + + @Override + public Boolean isUseHttpsWithSDC() { + return this.useHttpsWithSDC; + } + + public void setUseHttpsWithSDC(Boolean useHttpsWithSDC) { + this.useHttpsWithSDC = useHttpsWithSDC; + } } |