Properties file name change: controllerblueprint

Change-Id: I94c3564c73251a39b96640a960072e6f99e83c20
Issue-ID: CCSDK-589
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

4 files changed, 48 insertions, 116 deletions

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java
index 2f1ad0af2..da35c4bfa 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java
@@ -1,69 +1 @@
-/*

- * 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.

- */

-

-package org.onap.ccsdk.features.rest.adaptor;

-

-public class ConfigRestAdaptorConstants {

-    private ConfigRestAdaptorConstants() {

-

-    }

-

-    public static final String SDNC_ROOT_DIR_ENV_VAR_KEY = "SDNC_CONFIG_DIR";

-    public static final String REST_ADAPTOR_PROPERTIES_FILE_NAME = "config-rest-adaptor.properties";

-    public static final String PROXY_URL_KEY = "proxyUrl";

-    public static final String PROXY_URLS_VALUE_SEPARATOR = ",";

-    public static final String AAF_USERNAME_KEY = "aafUserName";

-    public static final String AAF_PSSWD_KEY = "aafPassword";

-    public static final String COMMON_SERVICE_VERSION_KEY = "commonServiceVersion";

-

-    public static final String PROPERTY_ENV_PROD = "field";

-    public static final String PROPERTY_ENV_SOLO = "solo";

-

-    public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.features.rest.adaptors.";

-    public static final String REST_ADAPTOR_ENV_TYPE = "envtype";

-    public static final String REST_ADAPTOR_TYPE_GENERIC = "generic";

-    public static final String REST_ADAPTOR_TYPE_SSL = "ssl";

-

-    public static final String SSL_SERVICE_BASEURL = ".url";

-    public static final String SSL_SERVICE_APP = ".application";

-    public static final String SSL_SERVICE_TRUST = ".ssl.trust";

-    public static final String SSL_SERVICE_TRUST_PSSWD = ".ssl.trust.psswd";

-    public static final String SSL_SERVICE_KEY = ".ssl.key";

-    public static final String SSL_SERVICE_KEY_PSSWD = ".ssl.key.psswd";

-

-    public static final String SERVICE_TYPE_PROPERTY = ".type";

-    public static final String SERVICE_EANABLED_PROPERTY = ".enable";

-    public static final String SERVICE_ENV_PROPERTY = ".env";

-    public static final String SERVICE_BASEURL_PROPERTY = ".url";

-    public static final String SERVICE_PROPERTYFILE = ".propertyfile";

-    public static final String SERVICE_USER_PROPERTY = ".user";

-    public static final String SERVICE_APPID_PROPERTY = ".appId";

-    public static final String SERVICE_PSSWD_PROPERTY = ".passwd";

-    public static final String SERVICE_CLIENTAUTH_PROPERTY = ".clientAuth";

-    public static final String SERVICE_AUTHORIZATION_PROPERTY = ".authorization";

-

-    public static final String SELECTOR_AAI = "aai";

-    public static final String SELECTOR_ALTS = "alts";

-    public static final String SELECTOR_EIPAM = "eipam";

-    public static final String SELECTOR_COSMS = "cosms";

-    public static final String SELECTOR_RESTCONF = "restconf";

-    public static final String SELECTOR_MODEL_SERVICE = "modelservice";

-    public static final String SELECTOR_POLICY_MANAGER = "policymanager";

-    public static final String SELECTOR_NRD = "networkresourcediscovery";

-    public static final String SELECTOR_NSM = "nsm";

-

-}

+/*
 * 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.
 */

package org.onap.ccsdk.features.rest.adaptor;

public class ConfigRestAdaptorConstants {
    private ConfigRestAdaptorConstants() {

    }

    public static final String SDNC_ROOT_DIR_ENV_VAR_KEY = "SDNC_CONFIG_DIR";
    public static final String REST_ADAPTOR_PROPERTIES_FILE_NAME = "blueprints-processor-adaptor.properties";
    public static final String PROXY_URL_KEY = "proxyUrl";
    public static final String PROXY_URLS_VALUE_SEPARATOR = ",";
    public static final String AAF_USERNAME_KEY = "aafUserName";
    public static final String AAF_PSSWD_KEY = "aafPassword";
    public static final String COMMON_SERVICE_VERSION_KEY = "commonServiceVersion";

    public static final String PROPERTY_ENV_PROD = "field";
    public static final String PROPERTY_ENV_SOLO = "solo";

    public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.features.rest.adaptors.";
    public static final String REST_ADAPTOR_ENV_TYPE = "envtype";
    public static final String REST_ADAPTOR_TYPE_GENERIC = "generic";
    public static final String REST_ADAPTOR_TYPE_SSL = "ssl";

    public static final String SSL_SERVICE_BASEURL = ".url";
    public static final String SSL_SERVICE_APP = ".application";
    public static final String SSL_SERVICE_TRUST = ".ssl.trust";
    public static final String SSL_SERVICE_TRUST_PSSWD = ".ssl.trust.psswd";
    public static final String SSL_SERVICE_KEY = ".ssl.key";
    public static final String SSL_SERVICE_KEY_PSSWD = ".ssl.key.psswd";

    public static final String SERVICE_TYPE_PROPERTY = ".type";
    public static final String SERVICE_EANABLED_PROPERTY = ".enable";
    public static final String SERVICE_ENV_PROPERTY = ".env";
    public static final String SERVICE_BASEURL_PROPERTY = ".url";
    public static final String SERVICE_PROPERTYFILE = ".propertyfile";
    public static final String SERVICE_USER_PROPERTY = ".user";
    public static final String SERVICE_APPID_PROPERTY = ".appId";
    public static final String SERVICE_PSSWD_PROPERTY = ".passwd";
    public static final String SERVICE_CLIENTAUTH_PROPERTY = ".clientAuth";
    public static final String SERVICE_AUTHORIZATION_PROPERTY = ".authorization";

    public static final String SELECTOR_AAI = "aai";
    public static final String SELECTOR_ALTS = "alts";
    public static final String SELECTOR_EIPAM = "eipam";
    public static final String SELECTOR_COSMS = "cosms";
    public static final String SELECTOR_RESTCONF = "restconf";
    public static final String SELECTOR_MODEL_SERVICE = "modelservice";
    public static final String SELECTOR_POLICY_MANAGER = "policymanager";
    public static final String SELECTOR_NRD = "networkresourcediscovery";
    public static final String SELECTOR_NSM = "nsm";

}
\ No newline at end of file
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index dbc8b5231..09c9a4ca8 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -24,7 +24,7 @@
 

 	<bean id="configRestAdaptorService"

 		class="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl">

-		<argument value="/opt/sdnc/data/properties" />

+		<argument value="/opt/onap/sdnc/data/properties" />

 	</bean>

 

 	<service ref="configRestAdaptorService"

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