diff options
| author |   Singal, Kapil (ks220y) <ks220y@att.com> | 2018-09-24 13:59:07 -0400 |
|---|---|---|
| committer |   Dan Timoney <dt5972@att.com> | 2018-09-27 17:49:57 +0000 |
| commit | 2d4e12553c315077ebeb4e12c72bf354f4880615 (patch) | |
| tree | 4d2f491ca8b5dc5080221ed1c851409093113080 /blueprints-processor/adaptors/rest-adaptor-provider | |
| parent | 4132c7648d0052a0c190750375a06bc210ee2946 (diff) | |
SDN Controller Blueprints Processor
Changing Date Format to consume Blueprints Model Artifact
Change-Id: I97c4c36f811cdd0738272efc88060fa8ca618384
Issue-ID: CCSDK-596
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Diffstat (limited to 'blueprints-processor/adaptors/rest-adaptor-provider')
2 files changed, 20 insertions, 20 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 da35c4bfa..adb00a305 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 +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 = "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 +/*
* 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.blueprints.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/test/resources/blueprints-processor-adaptor.properties b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/blueprints-processor-adaptor.properties index 66ee4c009..82f4fcb9d 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/blueprints-processor-adaptor.properties +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/blueprints-processor-adaptor.properties @@ -18,28 +18,28 @@ # Configuration file for SDNC Controller Module # -org.onap.ccsdk.features.rest.adaptors.envtype=solo +org.onap.ccsdk.features.blueprints.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 +org.onap.ccsdk.features.blueprints.adaptors.modelservice.type=generic +org.onap.ccsdk.features.blueprints.adaptors.modelservice.enable=true +org.onap.ccsdk.features.blueprints.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/ +org.onap.ccsdk.features.blueprints.adaptors.modelservice.user=admin +org.onap.ccsdk.features.blueprints.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/ +org.onap.ccsdk.features.blueprints.adaptors.restconf.type=generic +org.onap.ccsdk.features.blueprints.adaptors.restconf.enable=true +org.onap.ccsdk.features.blueprints.adaptors.restconf.user=admin +org.onap.ccsdk.features.blueprints.adaptors.restconf.passwd=admin +org.onap.ccsdk.features.blueprints.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 +org.onap.ccsdk.features.blueprints.adaptors.aai.propertyfile=aai.properties +org.onap.ccsdk.features.blueprints.adaptors.aai.type=ssl +org.onap.ccsdk.features.blueprints.adaptors.aai.enable=true +org.onap.ccsdk.features.blueprints.adaptors.aai.url=https://localhost:8443/onap-aai/ +org.onap.ccsdk.features.blueprints.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks +org.onap.ccsdk.features.blueprints.adaptors.aai.ssl.trust.psswd=changeme +org.onap.ccsdk.features.blueprints.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12 +org.onap.ccsdk.features.blueprints.adaptors.aai.ssl.key.psswd=changeme |