Revisions made to the Model Loader to use Babel 49/40749/1
authorBlackwell, Ian (ib733q) <IanB@amdocs.com>
Tue, 3 Apr 2018 16:28:44 +0000 (17:28 +0100)
committerBlackwell, Ian (ib733q) <IanB@amdocs.com>
Tue, 3 Apr 2018 16:28:44 +0000 (17:28 +0100)
commit7b1f813441f94261f43ec4f5bb0944ad2570fbdf
tree7c5a2d1f378b2a0b358905e82d21cce73f3e1d6d
parent4dd316529148d07059d844197cdb676806bdc0c6
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>
105 files changed:
Readme.md
ajsc-shared-config/etc/aft.properties
ajsc-shared-config/etc/basic-logback_root_logger_level_off.xml
ajsc-shared-config/etc/logback.xml
ajsc-shared-config/etc/spm2.jks [new file with mode: 0644]
antBuild/build.xml
bundleconfig-local/etc/appprops/AAFUserRoles.properties
bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties
bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties
bundleconfig-local/etc/appprops/app-intercepts.properties
bundleconfig-local/etc/appprops/methodMapper.properties
bundleconfig-local/etc/sysprops/sys-props.properties
pom.xml
src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy
src/main/ajsc/model-loader_v1/model-loader/v1/docs/README.txt
src/main/ajsc/model-loader_v1/model-loader/v1/lib/README.txt
src/main/ajsc/model-loader_v1/model-loader/v1/props/module.props
src/main/ajsc/model-loader_v1/model-loader/v1/routes/modelLoader.route
src/main/assemble/ajsc_module_assembly.xml
src/main/assemble/ajsc_props_assembly.xml
src/main/assemble/ajsc_runtime_assembly.xml
src/main/bin/start.sh
src/main/config/ajsc-jetty.xml
src/main/config/ajsc-override-web.xml
src/main/config/jul-redirect.properties
src/main/config/runner-web.xml
src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java
src/main/java/org/onap/aai/modelloader/entity/Artifact.java
src/main/java/org/onap/aai/modelloader/entity/ArtifactHandler.java
src/main/java/org/onap/aai/modelloader/entity/ArtifactType.java
src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifact.java
src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandler.java
src/main/java/org/onap/aai/modelloader/entity/catalog/VnfImageException.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java
src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifactParser.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/entity/model/BabelArtifactParsingException.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/entity/model/IModelArtifact.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/entity/model/IModelId.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/entity/model/IModelParser.java
src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifact.java
src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactHandler.java
src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactParser.java
src/main/java/org/onap/aai/modelloader/entity/model/ModelParserFactory.java [deleted file]
src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java
src/main/java/org/onap/aai/modelloader/entity/model/ModelV8Artifact.java [deleted file]
src/main/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParser.java [deleted file]
src/main/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifact.java
src/main/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParser.java
src/main/java/org/onap/aai/modelloader/entity/model/Pair.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/extraction/ArtifactInfoExtractor.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/extraction/InvalidArchiveException.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/notification/ArtifactDeploymentManager.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/notification/ArtifactDownloadManager.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/notification/BabelArtifactConverter.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/notification/CompDoneStatusMessageBuilder.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/notification/CompDoneStatusMsg.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/notification/DistributionStatusMessageBuilder.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/notification/DistributionStatusMsg.java
src/main/java/org/onap/aai/modelloader/notification/DownloadFailureException.java [moved from src/test/java/org/onap/aai/modelloader/notification/DistributionStatusMsgTest.java with 58% similarity]
src/main/java/org/onap/aai/modelloader/notification/EventCallback.java
src/main/java/org/onap/aai/modelloader/notification/NotificationPublisher.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/notification/ProcessToscaArtifactsException.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/restclient/AaiRestClient.java
src/main/java/org/onap/aai/modelloader/restclient/BabelServiceClient.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/service/ArtifactInfoImpl.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/service/ModelLoaderInterface.java
src/main/java/org/onap/aai/modelloader/service/ModelLoaderMsgs.java
src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java
src/main/java/org/onap/aai/modelloader/service/NotificationDataImpl.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/service/SdcConnectionJob.java
src/main/java/org/onap/aai/modelloader/util/JsonXmlConverter.java
src/main/resources/org/openecomp/modelloader/service/ModelLoaderMsgs.properties
src/main/resources/schema/aai_schema_v8.xsd [deleted file]
src/main/resources/schema/vnfcatalog.xsd [deleted file]
src/test/java/org/onap/aai/modelloader/config/ModelLoaderConfigTest.java
src/test/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java
src/test/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandler_noMock_Test.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/entity/model/AAIRestClientTest.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/entity/model/ModelArtifactParserTest.java
src/test/java/org/onap/aai/modelloader/entity/model/ModelParserFactoryTest.java [deleted file]
src/test/java/org/onap/aai/modelloader/entity/model/ModelSorterTest.java
src/test/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParserTest.java [deleted file]
src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java
src/test/java/org/onap/aai/modelloader/extraction/ArtifactInfoExtractorTest.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/fixture/ArtifactInfoBuilder.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/fixture/NotificationDataFixtureBuilder.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/fixture/ResourceInstanceBuilder.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/fixture/TestNotificationDataImpl.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/fixture/TestResourceInstanceImpl.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/notification/ArtifactDeploymentManagerMockTest.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/notification/ArtifactDeploymentManagerTest.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/notification/ArtifactDownloadManagerNoMockTest.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/notification/ArtifactDownloadManagerTest.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/notification/BabelArtifactConverterTest.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/notification/EventCallbackNoMockTest.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/notification/EventCallbackTest.java
src/test/java/org/onap/aai/modelloader/notification/TestConfiguration.java [deleted file]
src/test/java/org/onap/aai/modelloader/restclient/AaiRestClientTest.java [deleted file]
src/test/java/org/onap/aai/modelloader/restclient/TestAaiRestClient.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/restclient/TestBabelServiceClient.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/service/ModelLoaderServiceTest.java [deleted file]
src/test/java/org/onap/aai/modelloader/util/ArtifactTestUtils.java [new file with mode: 0644]
src/test/java/org/onap/aai/modelloader/util/JsonXmlConverterTest.java
src/test/resources/imagedataexample.json [new file with mode: 0644]
version.properties