Properties file name change: controllerblueprint

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

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 2f1ad0a..da35c4b 100644 (file)
--- 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 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- * \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.features.rest.adaptor;\r
-\r
-public class ConfigRestAdaptorConstants {\r
-    private ConfigRestAdaptorConstants() {\r
-\r
-    }\r
-\r
-    public static final String SDNC_ROOT_DIR_ENV_VAR_KEY = "SDNC_CONFIG_DIR";\r
-    public static final String REST_ADAPTOR_PROPERTIES_FILE_NAME = "config-rest-adaptor.properties";\r
-    public static final String PROXY_URL_KEY = "proxyUrl";\r
-    public static final String PROXY_URLS_VALUE_SEPARATOR = ",";\r
-    public static final String AAF_USERNAME_KEY = "aafUserName";\r
-    public static final String AAF_PSSWD_KEY = "aafPassword";\r
-    public static final String COMMON_SERVICE_VERSION_KEY = "commonServiceVersion";\r
-\r
-    public static final String PROPERTY_ENV_PROD = "field";\r
-    public static final String PROPERTY_ENV_SOLO = "solo";\r
-\r
-    public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.features.rest.adaptors.";\r
-    public static final String REST_ADAPTOR_ENV_TYPE = "envtype";\r
-    public static final String REST_ADAPTOR_TYPE_GENERIC = "generic";\r
-    public static final String REST_ADAPTOR_TYPE_SSL = "ssl";\r
-\r
-    public static final String SSL_SERVICE_BASEURL = ".url";\r
-    public static final String SSL_SERVICE_APP = ".application";\r
-    public static final String SSL_SERVICE_TRUST = ".ssl.trust";\r
-    public static final String SSL_SERVICE_TRUST_PSSWD = ".ssl.trust.psswd";\r
-    public static final String SSL_SERVICE_KEY = ".ssl.key";\r
-    public static final String SSL_SERVICE_KEY_PSSWD = ".ssl.key.psswd";\r
-\r
-    public static final String SERVICE_TYPE_PROPERTY = ".type";\r
-    public static final String SERVICE_EANABLED_PROPERTY = ".enable";\r
-    public static final String SERVICE_ENV_PROPERTY = ".env";\r
-    public static final String SERVICE_BASEURL_PROPERTY = ".url";\r
-    public static final String SERVICE_PROPERTYFILE = ".propertyfile";\r
-    public static final String SERVICE_USER_PROPERTY = ".user";\r
-    public static final String SERVICE_APPID_PROPERTY = ".appId";\r
-    public static final String SERVICE_PSSWD_PROPERTY = ".passwd";\r
-    public static final String SERVICE_CLIENTAUTH_PROPERTY = ".clientAuth";\r
-    public static final String SERVICE_AUTHORIZATION_PROPERTY = ".authorization";\r
-\r
-    public static final String SELECTOR_AAI = "aai";\r
-    public static final String SELECTOR_ALTS = "alts";\r
-    public static final String SELECTOR_EIPAM = "eipam";\r
-    public static final String SELECTOR_COSMS = "cosms";\r
-    public static final String SELECTOR_RESTCONF = "restconf";\r
-    public static final String SELECTOR_MODEL_SERVICE = "modelservice";\r
-    public static final String SELECTOR_POLICY_MANAGER = "policymanager";\r
-    public static final String SELECTOR_NRD = "networkresourcediscovery";\r
-    public static final String SELECTOR_NSM = "nsm";\r
-\r
-}\r
+/*\r * Copyright © 2017-2018 AT&T Intellectual Property.\r * Modifications Copyright © 2018 IBM.\r * \r * Licensed under the Apache License, Version 2.0 (the "License");\r * you may not use this file except in compliance with the License.\r * You may obtain a copy of the License at\r * \r * http://www.apache.org/licenses/LICENSE-2.0\r * \r * Unless required by applicable law or agreed to in writing, software\r * distributed under the License is distributed on an "AS IS" BASIS,\r * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r * See the License for the specific language governing permissions and\r * limitations under the License.\r */\r\rpackage org.onap.ccsdk.features.rest.adaptor;\r\rpublic class ConfigRestAdaptorConstants {\r    private ConfigRestAdaptorConstants() {\r\r    }\r\r    public static final String SDNC_ROOT_DIR_ENV_VAR_KEY = "SDNC_CONFIG_DIR";\r    public static final String REST_ADAPTOR_PROPERTIES_FILE_NAME = "blueprints-processor-adaptor.properties";\r    public static final String PROXY_URL_KEY = "proxyUrl";\r    public static final String PROXY_URLS_VALUE_SEPARATOR = ",";\r    public static final String AAF_USERNAME_KEY = "aafUserName";\r    public static final String AAF_PSSWD_KEY = "aafPassword";\r    public static final String COMMON_SERVICE_VERSION_KEY = "commonServiceVersion";\r\r    public static final String PROPERTY_ENV_PROD = "field";\r    public static final String PROPERTY_ENV_SOLO = "solo";\r\r    public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.features.rest.adaptors.";\r    public static final String REST_ADAPTOR_ENV_TYPE = "envtype";\r    public static final String REST_ADAPTOR_TYPE_GENERIC = "generic";\r    public static final String REST_ADAPTOR_TYPE_SSL = "ssl";\r\r    public static final String SSL_SERVICE_BASEURL = ".url";\r    public static final String SSL_SERVICE_APP = ".application";\r    public static final String SSL_SERVICE_TRUST = ".ssl.trust";\r    public static final String SSL_SERVICE_TRUST_PSSWD = ".ssl.trust.psswd";\r    public static final String SSL_SERVICE_KEY = ".ssl.key";\r    public static final String SSL_SERVICE_KEY_PSSWD = ".ssl.key.psswd";\r\r    public static final String SERVICE_TYPE_PROPERTY = ".type";\r    public static final String SERVICE_EANABLED_PROPERTY = ".enable";\r    public static final String SERVICE_ENV_PROPERTY = ".env";\r    public static final String SERVICE_BASEURL_PROPERTY = ".url";\r    public static final String SERVICE_PROPERTYFILE = ".propertyfile";\r    public static final String SERVICE_USER_PROPERTY = ".user";\r    public static final String SERVICE_APPID_PROPERTY = ".appId";\r    public static final String SERVICE_PSSWD_PROPERTY = ".passwd";\r    public static final String SERVICE_CLIENTAUTH_PROPERTY = ".clientAuth";\r    public static final String SERVICE_AUTHORIZATION_PROPERTY = ".authorization";\r\r    public static final String SELECTOR_AAI = "aai";\r    public static final String SELECTOR_ALTS = "alts";\r    public static final String SELECTOR_EIPAM = "eipam";\r    public static final String SELECTOR_COSMS = "cosms";\r    public static final String SELECTOR_RESTCONF = "restconf";\r    public static final String SELECTOR_MODEL_SERVICE = "modelservice";\r    public static final String SELECTOR_POLICY_MANAGER = "policymanager";\r    public static final String SELECTOR_NRD = "networkresourcediscovery";\r    public static final String SELECTOR_NSM = "nsm";\r\r}\r
\ 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 dbc8b52..09c9a4c 100644 (file)
--- 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 @@
 \r
        <bean id="configRestAdaptorService"\r
                class="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl">\r
-               <argument value="/opt/sdnc/data/properties" />\r
+               <argument value="/opt/onap/sdnc/data/properties" />\r
        </bean>\r
 \r
        <service ref="configRestAdaptorService"\r

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 2e09159..201623d 100644 (file)
--- 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 {
 \r
     @Before\r
     public void setup() throws Exception {\r
-        String propertyfile = "src/test/resources/config-rest-adaptor.properties";\r
+        String propertyfile = "src/test/resources/blueprints-processor-adaptor.properties";\r
 \r
         Properties restProperties = new Properties();\r
         restProperties.load(new FileInputStream(propertyfile));\r

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
similarity index 97%
rename from blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties
rename to blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/blueprints-processor-adaptor.properties
index 2274825..66ee4c0 100644 (file)
--- 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 @@
-###\r
-# Copyright © 2017-2018 AT&T Intellectual Property.\r
-# Modifications Copyright © 2018 IBM.\r
-# \r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-# \r
-#     http://www.apache.org/licenses/LICENSE-2.0\r
-# \r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-###\r
-#\r
-# Configuration file for SDNC Controller Module\r
-#\r
-\r
-org.onap.ccsdk.features.rest.adaptors.envtype=solo\r
-\r
-# Config Generator Microservices\r
-org.onap.ccsdk.features.rest.adaptors.modelservice.type=generic\r
-org.onap.ccsdk.features.rest.adaptors.modelservice.enable=true\r
-org.onap.ccsdk.features.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/\r
-org.onap.ccsdk.features.rest.adaptors.modelservice.user=admin\r
-org.onap.ccsdk.features.rest.adaptors.modelservice.passwd=admin\r
-\r
-# Generic RESTCONF Adaptor\r
-org.onap.ccsdk.features.rest.adaptors.restconf.type=generic\r
-org.onap.ccsdk.features.rest.adaptors.restconf.enable=true\r
-org.onap.ccsdk.features.rest.adaptors.restconf.user=admin\r
-org.onap.ccsdk.features.rest.adaptors.restconf.passwd=admin\r
-org.onap.ccsdk.features.rest.adaptors.restconf.url=http://localhost:8181/restconf/\r
-\r
-# SSL AAI Adaptor\r
-org.onap.ccsdk.features.rest.adaptors.aai.propertyfile=aai.properties\r
-org.onap.ccsdk.features.rest.adaptors.aai.type=ssl\r
-org.onap.ccsdk.features.rest.adaptors.aai.enable=true\r
-org.onap.ccsdk.features.rest.adaptors.aai.url=https://localhost:8443/onap-aai/\r
-org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks\r
-org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust.psswd=changeme\r
-org.onap.ccsdk.features.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12\r
-org.onap.ccsdk.features.rest.adaptors.aai.ssl.key.psswd=changeme\r
+###
+# 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