diff options
| author |   mark.j.leonard <mark.j.leonard@gmail.com> | 2018-06-06 14:47:42 +0100 |
|---|---|---|
| committer | mark.j.leonard <mark.j.leonard@gmail.com> | 2018-06-06 15:37:53 +0100 |
| commit | c5aea4a8bc398fc1c6220875e55b9520fd7f7524 (patch) | |
| tree | b0aeef15bed28487c5827990d60fc3bdcf95b67e /appconfig-local | |
| parent | ce332032dd208c5c769a2297409d8aca3f780fa8 (diff) | |
Refactor for Sonar smells and code coverage
Various code formatting and style fixes (to address Sonar code smells).
Introduce a BabelServiceClientException to replace the use of the base
Exception class.
Make both the BabelServiceClient class and its Factory class use an
interface, to allow for Spring injection (using annotations) and for
simplified mocking.
Refactor the Notification Publishing by making this the responsibility
of the main Service classes and not the deployment manager.
Issue-ID: AAI-1207
Change-Id: I6bf8a504fa7b98e9158c9976fd1d88c6c54027c1
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Diffstat (limited to 'appconfig-local')
| -rw-r--r-- | appconfig-local/auth/README.txt | 5 | ||||
| -rw-r--r-- | appconfig-local/model-loader.properties | 36 |
2 files changed, 41 insertions, 0 deletions
diff --git a/appconfig-local/auth/README.txt b/appconfig-local/auth/README.txt new file mode 100644 index 0000000..ab75a02 --- /dev/null +++ b/appconfig-local/auth/README.txt @@ -0,0 +1,5 @@ +In this folder you should have the following files: + +1. The Model Loader Client Certificate keystore (ml.aai.KEYSTORE_FILE) for communicating with the Model Loader REST API (ml.aai.BASE_URL) +2. The Babel Service Client Certificate keystore (ml.babel.KEYSTORE_FILE) for communicating with Babel's generate artifacts API (ml.babel.BASE_URL) +3. The Babel Service Trust Store keystore (ml.babel.TRUSTSTORE_FILE) for verifying Babel's Server Certificate diff --git a/appconfig-local/model-loader.properties b/appconfig-local/model-loader.properties new file mode 100644 index 0000000..b2234d6 --- /dev/null +++ b/appconfig-local/model-loader.properties @@ -0,0 +1,36 @@ +# This is a sample config file; for use by a developer to perform application integration tests. +# +# Please replace the <PLACEHOLDER> values with real values. + +# Model Loader Distribution Client Configuration +ml.distribution.ACTIVE_SERVER_TLS_AUTH=false +ml.distribution.ASDC_ADDRESS=<ASDC_HOST_NAME>:8443 +ml.distribution.MSG_BUS_ADDRESSES=localhost +ml.distribution.CONSUMER_GROUP=<CONSUMER_GROUP> +ml.distribution.CONSUMER_ID=<CONSUMER_ID> +ml.distribution.ENVIRONMENT_NAME=<ENV> +ml.distribution.KEYSTORE_PASSWORD=<OBF:1234> +ml.distribution.KEYSTORE_FILE=asdc-client.jks +ml.distribution.PASSWORD=<OBF:1234> +ml.distribution.POLLING_INTERVAL=30 +ml.distribution.POLLING_TIMEOUT=20 +ml.distribution.USER=<DIST_USER> +ml.distribution.ARTIFACT_TYPES=MODEL_QUERY_SPEC,TOSCA_CSAR + +# Model Loader Client Configuration for the A&AI REST interface +ml.aai.BASE_URL=https://<AAI_HOST>:8443 +ml.aai.MODEL_URL=/aai/v*/service-design-and-creation/models/model/ +ml.aai.NAMED_QUERY_URL=/aai/v*/service-design-and-creation/named-queries/named-query/ +ml.aai.VNF_IMAGE_URL=/aai/v*/service-design-and-creation/vnf-images +ml.aai.KEYSTORE_FILE=<AAI_KEYSTORE> +ml.aai.KEYSTORE_PASSWORD=<OBF:1234> +ml.aai.AUTH_USER=ModelLoader +ml.aai.AUTH_PASSWORD= + +# Model Loader Client Configuration for the Babel Service +ml.babel.BASE_URL=https://<BABEL_HOST>:9516 +ml.babel.GENERATE_ARTIFACTS_URL=/services/babel-service/v1/app/generateArtifacts +ml.babel.KEYSTORE_FILE=<BABEL_KEYSTORE> +ml.babel.KEYSTORE_PASSWORD=<OBF:1234> +ml.babel.TRUSTSTORE_FILE=<BABEL_TRUSTSTORE> +ml.babel.TRUSTSTORE_PASSWORD=<OBF:1234> |