2 files changed, 46 insertions, 46 deletions
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
index 2e091591b..201623d49 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java
@@ -35,7 +35,7 @@ public class AbstractConfigRestClientAdapterTest {
 
     @Before
     public void setup() throws Exception {
-        String propertyfile = "src/test/resources/config-rest-adaptor.properties";
+        String propertyfile = "src/test/resources/blueprints-processor-adaptor.properties";
 
         Properties restProperties = new Properties();
         restProperties.load(new FileInputStream(propertyfile));
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/blueprints-processor-adaptor.properties
index 22748259b..66ee4c009 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/blueprints-processor-adaptor.properties
@@ -1,45 +1,45 @@
-###
-# Copyright © 2017-2018 AT&T Intellectual Property.
-# Modifications Copyright © 2018 IBM.
-# 
-# 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.
-###
-#
-# Configuration file for SDNC Controller Module
-#
-
-org.onap.ccsdk.features.rest.adaptors.envtype=solo
-
-# Config Generator Microservices
-org.onap.ccsdk.features.rest.adaptors.modelservice.type=generic
-org.onap.ccsdk.features.rest.adaptors.modelservice.enable=true
-org.onap.ccsdk.features.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/
-org.onap.ccsdk.features.rest.adaptors.modelservice.user=admin
-org.onap.ccsdk.features.rest.adaptors.modelservice.passwd=admin
-
-# Generic RESTCONF Adaptor
-org.onap.ccsdk.features.rest.adaptors.restconf.type=generic
-org.onap.ccsdk.features.rest.adaptors.restconf.enable=true
-org.onap.ccsdk.features.rest.adaptors.restconf.user=admin
-org.onap.ccsdk.features.rest.adaptors.restconf.passwd=admin
-org.onap.ccsdk.features.rest.adaptors.restconf.url=http://localhost:8181/restconf/
-
-# SSL AAI Adaptor
-org.onap.ccsdk.features.rest.adaptors.aai.propertyfile=aai.properties
-org.onap.ccsdk.features.rest.adaptors.aai.type=ssl
-org.onap.ccsdk.features.rest.adaptors.aai.enable=true
-org.onap.ccsdk.features.rest.adaptors.aai.url=https://localhost:8443/onap-aai/
-org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks
-org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust.psswd=changeme
-org.onap.ccsdk.features.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12
-org.onap.ccsdk.features.rest.adaptors.aai.ssl.key.psswd=changeme
+###
+# Copyright © 2017-2018 AT&T Intellectual Property.
+# Modifications Copyright © 2018 IBM.
+# 
+# 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.
+###
+#
+# Configuration file for SDNC Controller Module
+#
+
+org.onap.ccsdk.features.rest.adaptors.envtype=solo
+
+# Config Generator Microservices
+org.onap.ccsdk.features.rest.adaptors.modelservice.type=generic
+org.onap.ccsdk.features.rest.adaptors.modelservice.enable=true
+org.onap.ccsdk.features.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/
+org.onap.ccsdk.features.rest.adaptors.modelservice.user=admin
+org.onap.ccsdk.features.rest.adaptors.modelservice.passwd=admin
+
+# Generic RESTCONF Adaptor
+org.onap.ccsdk.features.rest.adaptors.restconf.type=generic
+org.onap.ccsdk.features.rest.adaptors.restconf.enable=true
+org.onap.ccsdk.features.rest.adaptors.restconf.user=admin
+org.onap.ccsdk.features.rest.adaptors.restconf.passwd=admin
+org.onap.ccsdk.features.rest.adaptors.restconf.url=http://localhost:8181/restconf/
+
+# SSL AAI Adaptor
+org.onap.ccsdk.features.rest.adaptors.aai.propertyfile=aai.properties
+org.onap.ccsdk.features.rest.adaptors.aai.type=ssl
+org.onap.ccsdk.features.rest.adaptors.aai.enable=true
+org.onap.ccsdk.features.rest.adaptors.aai.url=https://localhost:8443/onap-aai/
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust.psswd=changeme
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.key.psswd=changeme