Revisions made to the Model Loader to use Babel

Change the Model Loader to use the Babel micro service.
Responsibility for transformation of ASDC TOSCA models,
the yaml files, has been moved from ASDC and placed into
the Bable microservice. Model Loader will forward any
CSAR received from ASDC and delegate transformation to
Babel. Babel will return the transformed TOSCA models
to Model Loader which will then ingest them into the
A&AI Inventory.

Issue-ID: AAI-987

Change-Id: I99594770b51b00cb7dcc0f30706060ae27cd94c5
Signed-off-by: Blackwell, Ian (ib733q) <IanB@amdocs.com>

1 files changed, 53 insertions, 31 deletions

diff --git a/src/main/resources/org/openecomp/modelloader/service/ModelLoaderMsgs.properties b/src/main/resources/org/openecomp/modelloader/service/ModelLoaderMsgs.properties
index 8e2d043..112b48c 100644
--- a/src/main/resources/org/openecomp/modelloader/service/ModelLoaderMsgs.properties
+++ b/src/main/resources/org/openecomp/modelloader/service/ModelLoaderMsgs.properties
@@ -1,21 +1,22 @@
 ###

-# ============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=========================================================

+#  ============LICENSE_START==========================================

+#  org.onap.aai

+#  ===================================================================

+#  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.

+#  Copyright © 2017-2018 Amdocs

+#  ===================================================================

+#  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============================================

 ###

 

 #Resource key=Error Code|Message text|Resolution text |Description text

@@ -45,74 +46,95 @@ LOADING_CONFIGURATION=\
                   MDLSVC0001I|\

                   Loading configuration |\

                   None. Attempting to load configuration|\

-                  Attempting to load Model Loader Service configuration

+                  Attempting to load Model Loader Service configuration.|\

                   

 STOPPING_CLIENT=\

                   MDLSVC0002I|\

                   Stopping distribution client|\

                   None. Stopping service|\

-                  Stopping the Model Service distribution client

+                  Stopping the Model Service distribution client.|\

                   

 DISTRIBUTION_EVENT=\

                   MDLSVC0003I|\

                   Distribution event: {0}|\

                   None. Processing distribution.|\

-                  A distribution event was received from the ASDC

+                  A distribution event was received from the ASDC.|\

                   

 AAI_REST_REQUEST_SUCCESS=\

                   MDLSVC0004I|\

                   Sent {0} request to {1}.  Response: {2}|\

                   None. Successfully sent REST request to AAI.|\

-                  The given request was sent to the specified endpoint.

+                  The given request was sent to the specified endpoint.|\

                   

 AAI_REST_REQUEST_UNSUCCESSFUL=\

                   MDLSVC0005I|\

                   Sent {0} request to {1}.  Response code: {2}, Response message: {3}|\

                   REST request to AAI unsuccessful. Check response code, and message. |\

-                  The given request was unsuccessful.                                        

+                  The given request was unsuccessful.|\

 

 DOWNLOAD_COMPLETE=\

                   MDLSVC0006I|\

-                  Download of artifact {0} from ASDC complete.  Result: {1}|\

-                  None.|\

-                  An artifact was downloaded from the ASDC

+                  Download of artifact {0} from ASDC complete. An artifact was downloaded from the ASDC. Payload: {1}|\

                   

 EVENT_PUBLISHED=\

                   MDLSVC0007I|\

                   Published {0} event for artifact {1}.  Result: {2}|\

                   None.|\

-                  An event was published to the event bus

+                  An event was published to the event bus|\

+                  

+

+BABEL_REST_REQUEST_PAYLOAD=\

+                  MDLSVC0008I|\

+                  Sending request to Babel. {0}|\

+

+BABEL_RESPONSE_PAYLOAD=\

+                  MDLSVC0009I|\

+                  Received response from Babel. {0}|\

+

+AAI_REST_REQUEST_PAYLOAD=\

+                 MDLSVC0010I|\

+                 A&AI request payload: {0}|\

+                 

+UNSUPPORTED_ARTIFACT_TYPE=\

+                 MDLSVC0011I|\

+                 The downloaded artifact: {0} has an unsupported type of: {1}|\

                   

 # ERROR Level Logs                  

 ASDC_CONNECTION_ERROR=\

                   MDLSVC2001E|\

                   Unable to register with ASDC: {0}|\

                   Check configuration.  Check network connection to ASDC|\

-                  During initialization, was not able to register with the configured ASDC instance

+                  During initialization, was not able to register with the configured ASDC instance|\

                   

 DISTRIBUTION_EVENT_ERROR=\

                   MDLSVC2002E|\

                   Distribution event error: {0}|\

                   Check configuration.  Check network connection to ASDC and UEB|\

-                  A failure occurred processing a distribution event

+                  A failure occurred processing a distribution event|\

                   

 AAI_REST_REQUEST_ERROR=\

                   MDLSVC2003E|\

                   Failed to send {0} request to {1}: {2}|\

                   Check configuration.  Check network connection to AAI.|\

-                  A failure occurred attempting to send a request to the AAI

+                  A failure occurred attempting to send a request to the AAI|\

 

 ARTIFACT_PARSE_ERROR=\

                   MDLSVC2004E|\

                   Failed to parse artifact: {0}|\

                   Check artifact. |\

-                  A failure occurred attempting to parse artifact from SDC

+                  A failure occurred attempting to parse artifact from SDC|\

+

+BABEL_REST_REQUEST_ERROR=\

+                  MDLSVC2005E|\

+                  Failed to send {0} request to {1}: {2}|\

+                  Check configuration.  Check network connection to Babel.|\

+                  A failure occurred attempting to send a request to the Babel|\

                                                     

 # DEBUG Level Logs                  

 INITIALIZING=\

                   MDLSVC0001D|\

                   init(): {0}|\

                   None. Initializing service|\

-                  Debug information during model loader initialization

+                  Debug information during model loader initialization|\