Allow handling of legact model artifacts

Change-Id: I3d4c5e51140d4d05b3fd871d58c2590421c0e9db
Signed-off-by: Blimkie, Steven (sb787e) <steven.blimkie@amdocs.com>

1 files changed, 23 insertions, 43 deletions

diff --git a/src/test/resources/model-loader.properties b/src/test/resources/model-loader.properties
index 34432a4..91fd527 100644
--- a/src/test/resources/model-loader.properties
+++ b/src/test/resources/model-loader.properties
@@ -1,43 +1,23 @@
-###

-# ============LICENSE_START=======================================================
-# MODEL LOADER SERVICE
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# 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.
-# ============LICENSE_END=========================================================

-###

-

-# Model Loader Distribution Client Configuration

-ml.distribution.ACTIVE_SERVER_TLS_AUTH=false

-ml.distribution.ASDC_ADDRESS=

-ml.distribution.CONSUMER_GROUP=aai-ml-group-test

-ml.distribution.CONSUMER_ID=aai-ml-id-test

-ml.distribution.ENVIRONMENT_NAME=

-ml.distribution.KEYSTORE_PASSWORD=

-ml.distribution.KEYSTORE_FILE=asdc-client.jks

-ml.distribution.PASSWORD=

-ml.distribution.POLLING_INTERVAL=30

-ml.distribution.POLLING_TIMEOUT=20

-ml.distribution.USER=ci

-ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG

-

-# Model Loader AAI REST Client Configuration

-ml.aai.BASE_URL=

-ml.aai.MODEL_URL=/aai/v8/service-design-and-creation/models/model/

-ml.aai.NAMED_QUERY_URL=/aai/v8/service-design-and-creation/named-queries/named-query/

-ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images

-ml.aai.KEYSTORE_FILE=aai-client-cert.p12

-ml.aai.KEYSTORE_PASSWORD=

-ml.aai.AUTH_USER=ModelLoader

-ml.aai.AUTH_PASSWORD=

+# Model Loader Distribution Client Configuration
+ml.distribution.ACTIVE_SERVER_TLS_AUTH=false
+ml.distribution.ASDC_ADDRESS=
+ml.distribution.CONSUMER_GROUP=aai-ml-group-test
+ml.distribution.CONSUMER_ID=aai-ml-id-test
+ml.distribution.ENVIRONMENT_NAME=
+ml.distribution.KEYSTORE_PASSWORD=
+ml.distribution.KEYSTORE_FILE=asdc-client.jks
+ml.distribution.PASSWORD=
+ml.distribution.POLLING_INTERVAL=30
+ml.distribution.POLLING_TIMEOUT=20
+ml.distribution.USER=ci
+ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG
+
+# Model Loader AAI REST Client Configuration
+ml.aai.BASE_URL=
+ml.aai.MODEL_URL=/aai/v8/service-design-and-creation/models/model/
+ml.aai.NAMED_QUERY_URL=/aai/v8/service-design-and-creation/named-queries/named-query/
+ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images
+ml.aai.KEYSTORE_FILE=aai-client-cert.p12
+ml.aai.KEYSTORE_PASSWORD=
+ml.aai.AUTH_USER=ModelLoader
+ml.aai.AUTH_PASSWORD=