From f83411a86e2277adae69e780e8511913d61a0f17 Mon Sep 17 00:00:00 2001 From: Sirisha_Manchikanti Date: Fri, 7 May 2021 15:17:52 +0100 Subject: [PATCH] Modular structure of clamp including controlloop This commit is the first commit that puts in multi module structure while changing the existing CLAMP code as little as possible. It adds a structure where common, models, participant and runtime are direct children under clamp, and current clamp code is moved under runtime. This runtime directory will host controlloop runtime code in later commits. Issue-ID: POLICY-3215 Signed-off-by: Sirisha_Manchikanti Change-Id: I15bc8be92ed020343bff4024c4718fec462c40d7 Signed-off-by: liamfallon --- common/pom.xml | 36 + docs/_static/favicon.ico | Bin docs/images/user-guide/blueprint_node_type.png | Bin docs/images/user-guide/clamp-cds-operation.png | Bin docs/images/user-guide/config-policy-tca.png | Bin docs/images/user-guide/deploy-params.png | Bin docs/images/user-guide/op-policy-box-policy.png | Bin docs/images/user-guide/open-menu-prop.png | Bin docs/images/user-guide/policy-submitted.png | Bin docs/swagger/swagger.json | 4 +- docs/swagger/swagger.pdf | 4 +- models/pom.xml | 35 + .../participant-impl/participant-impl-cds/pom.xml | 34 + .../participant-impl/participant-impl-dcae/pom.xml | 34 + .../participant-impl-kubernetes/pom.xml | 34 + .../participant-impl-policy/pom.xml | 34 + .../participant-impl-simulator/pom.xml | 34 + participant/participant-impl/pom.xml | 43 + participant/participant-intermediary/pom.xml | 37 + participant/pom.xml | 42 + pom.xml | 1332 +------------------- .../extra}/bin-for-dev/start-backend.sh | 0 {extra => runtime/extra}/bin-for-dev/start-db.sh | 0 .../extra}/bin-for-dev/start-emulator.sh | 0 .../extra}/bin-for-dev/start-frontend.sh | 0 {extra => runtime/extra}/docker/clamp/clamp.env | 0 .../extra}/docker/clamp/docker-compose.yml | 0 .../extra}/docker/mariadb/conf1/my.cnf | 0 .../extra}/docker/mariadb/conf2/my.cnf | 0 .../extra}/docker/mariadb/conf3/my.cnf | 0 {extra => runtime/extra}/sql/bootstrap-database.sh | 0 .../extra}/sql/bulkload/create-db.sql | 0 .../extra}/sql/bulkload/create-tables.sql | 0 .../extra}/sql/dump/backup-data-only.sh | 0 .../extra}/sql/dump/backup-database.sh | 0 .../extra}/sql/dump/load-fake-data.sh | 0 {extra => runtime/extra}/sql/dump/test-data.sql | 0 runtime/pom.xml | 1250 ++++++++++++++++++ .../main/resources/META-INF/resources/swagger.html | 454 +++++++ .../src}/main/docker/backend/Dockerfile | 1 + .../src}/main/docker/backend/backend-files.xml | 0 .../src}/main/docker/frontend/Dockerfile | 141 ++- .../src}/main/docker/frontend/frontend-files.xml | 0 .../src}/main/docker/frontend/nginx/default.conf | 0 .../src}/main/docker/frontend/nginx/nginx.conf | 0 .../authorization/AuthorizationController.java | 0 .../onap/policy/clamp/authorization/CldsUser.java | 0 .../authorization/SecureServicePermission.java | 0 .../SecureServicePermissionDeserializer.java | 0 .../policy/clamp/authorization/UserService.java | 0 .../org/onap/policy/clamp/clds/Application.java | 0 .../policy/clamp/clds/ClampInUserAuditorAware.java | 0 .../org/onap/policy/clamp/clds/ClampServlet.java | 0 ...EmbeddedServletContainerFactoryRedirection.java | 0 .../onap/policy/clamp/clds/client/CdsServices.java | 458 +++---- .../clamp/clds/client/DcaeInventoryServices.java | 288 ++--- .../policy/clamp/clds/config/AafConfiguration.java | 0 .../clamp/clds/config/CamelConfiguration.java | 0 .../policy/clamp/clds/config/ClampProperties.java | 0 .../clamp/clds/config/CldsUserJsonDecoder.java | 0 .../clds/config/DefaultDictionaryElements.java | 0 .../clds/config/DefaultUserConfiguration.java | 0 .../onap/policy/clamp/clds/config/SslConfig.java | 0 .../clamp/clds/config/SystemPropertiesLoader.java | 0 .../config/sdc/SdcControllersConfiguration.java | 0 .../sdc/SdcSingleControllerConfiguration.java | 0 .../clds/config/spring/CldsConfiguration.java | 0 .../config/spring/SdcControllerConfiguration.java | 0 .../clamp/clds/exception/CldsConfigException.java | 0 .../clamp/clds/exception/CldsUsersException.java | 0 .../clds/exception/NotAuthorizedException.java | 0 .../clds/exception/cds/CdsParametersException.java | 0 .../exception/dcae/DcaeDeploymentException.java | 0 .../sdc/controller/BlueprintParserException.java | 0 .../sdc/controller/CsarHandlerException.java | 0 .../controller/SdcArtifactInstallerException.java | 0 .../sdc/controller/SdcControllerException.java | 0 .../sdc/controller/SdcDownloadException.java | 0 .../sdc/controller/SdcParametersException.java | 0 .../policy/clamp/clds/filter/ClampCadiFilter.java | 0 .../policy/clamp/clds/model/ClampInformation.java | 0 .../policy/clamp/clds/model/CldsHealthCheck.java | 0 .../clds/model/cds/CdsBpWorkFlowListResponse.java | 0 .../clamp/clds/model/dcae/DcaeInventoryCache.java | 0 .../clds/model/dcae/DcaeInventoryResponse.java | 0 .../policy/clamp/clds/model/dcae/DcaeLinks.java | 0 .../model/dcae/DcaeOperationStatusResponse.java | 0 .../sdc/controller/DistributionStatusMessage.java | 0 .../clds/sdc/controller/SdcSingleController.java | 0 .../sdc/controller/SdcSingleControllerStatus.java | 0 .../controller/installer/BlueprintArtifact.java | 0 .../installer/BlueprintMicroService.java | 0 .../sdc/controller/installer/BlueprintParser.java | 0 .../sdc/controller/installer/ChainGenerator.java | 0 .../clds/sdc/controller/installer/CsarHandler.java | 0 .../clamp/clds/service/CldsHealthcheckService.java | 0 .../clds/tosca/JsonEditorSchemaConstants.java | 0 .../clamp/clds/tosca/ToscaSchemaConstants.java | 0 .../ToscaConverterWithDictionarySupport.java | 0 .../tosca/update/UnknownComponentException.java | 0 .../clds/tosca/update/elements/ArrayField.java | 144 +-- .../clds/tosca/update/elements/Constraint.java | 442 +++---- .../clds/tosca/update/elements/ToscaElement.java | 0 .../update/elements/ToscaElementProperty.java | 0 .../update/execution/ToscaMetadataExecutor.java | 0 .../update/execution/ToscaMetadataProcess.java | 0 .../execution/ToscaMetadataTargetProcess.java | 0 .../execution/cds/ToscaMetadataCdsProcess.java | 0 .../update/parser/ToscaConverterToJsonSchema.java | 0 .../tosca/update/parser/ToscaElementParser.java | 0 .../parser/metadata/ToscaMetadataParser.java | 0 .../ToscaMetadataParserWithDictionarySupport.java | 0 .../clds/tosca/update/templates/JsonTemplate.java | 0 .../tosca/update/templates/JsonTemplateField.java | 0 .../update/templates/JsonTemplateManager.java | 0 .../policy/clamp/clds/util/ClampVersioning.java | 0 .../org/onap/policy/clamp/clds/util/JsonUtils.java | 0 .../onap/policy/clamp/clds/util/LogMessages.java | 0 .../onap/policy/clamp/clds/util/LoggingUtils.java | 0 .../policy/clamp/clds/util/OnapLogConstants.java | 0 .../policy/clamp/clds/util/ResourceFileUtils.java | 0 .../clamp/configuration/ClampGsonDataFormat.java | 0 .../model/gson/converter/InstantDeserializer.java | 0 .../model/gson/converter/InstantSerializer.java | 0 .../jsontype/JsonStringSqlTypeDescriptor.java | 0 .../dao/model/jsontype/JsonTypeDescriptor.java | 0 .../dao/model/jsontype/StringJsonUserType.java | 0 .../policy/clamp/flow/log/FlowLogOperation.java | 0 .../org/onap/policy/clamp/loop/CsarInstaller.java | 0 .../main/java/org/onap/policy/clamp/loop/Loop.java | 0 .../org/onap/policy/clamp/loop/LoopController.java | 0 .../org/onap/policy/clamp/loop/LoopService.java | 0 .../java/org/onap/policy/clamp/loop/LoopState.java | 0 .../onap/policy/clamp/loop/LoopsRepository.java | 0 .../policy/clamp/loop/cds/CdsDataInstaller.java | 0 .../onap/policy/clamp/loop/common/AuditEntity.java | 0 .../loop/components/external/DcaeComponent.java | 0 .../components/external/ExternalComponent.java | 0 .../external/ExternalComponentState.java | 0 .../loop/components/external/PolicyComponent.java | 0 .../clamp/loop/deploy/DcaeDeployParameters.java | 0 .../org/onap/policy/clamp/loop/log/LogType.java | 0 .../org/onap/policy/clamp/loop/log/LoopLog.java | 0 .../policy/clamp/loop/log/LoopLogRepository.java | 0 .../onap/policy/clamp/loop/log/LoopLogService.java | 0 .../clamp/loop/service/CsarServiceInstaller.java | 0 .../onap/policy/clamp/loop/service/Service.java | 0 .../clamp/loop/service/ServicesRepository.java | 0 .../clamp/loop/template/LoopElementModel.java | 0 .../loop/template/LoopElementModelsRepository.java | 0 .../policy/clamp/loop/template/LoopTemplate.java | 0 .../template/LoopTemplateLoopElementModel.java | 0 .../template/LoopTemplateLoopElementModelId.java | 0 .../loop/template/LoopTemplatesRepository.java | 0 .../clamp/loop/template/LoopTemplatesService.java | 0 .../onap/policy/clamp/loop/template/LoopType.java | 0 .../clamp/loop/template/LoopTypeConvertor.java | 0 .../policy/clamp/loop/template/PolicyModel.java | 0 .../policy/clamp/loop/template/PolicyModelId.java | 0 .../loop/template/PolicyModelsRepository.java | 0 .../clamp/loop/template/PolicyModelsService.java | 0 .../java/org/onap/policy/clamp/policy/Policy.java | 0 .../policy/clamp/policy/PolicyEngineServices.java | 0 .../onap/policy/clamp/policy/PolicyPayload.java | 0 .../onap/policy/clamp/policy/PolicyService.java | 0 .../policy/downloader/PolicyEngineController.java | 0 .../policy/microservice/MicroServicePolicy.java | 0 .../microservice/MicroServicePolicyRepository.java | 0 .../microservice/MicroServicePolicyService.java | 0 .../policy/operational/OperationalPolicy.java | 0 .../operational/OperationalPolicyRepository.java | 0 .../OperationalPolicyRepresentationBuilder.java | 0 .../operational/OperationalPolicyService.java | 0 .../clamp/policy/pdpgroup/PdpGroupPayload.java | 0 .../policy/pdpgroup/PdpGroupPayloadException.java | 0 .../clamp/policy/pdpgroup/PdpGroupsAnalyzer.java | 0 .../clamp/policy/pdpgroup/PoliciesPdpMerger.java | 0 .../org/onap/policy/clamp/tosca/Dictionary.java | 0 .../onap/policy/clamp/tosca/DictionaryElement.java | 0 .../clamp/tosca/DictionaryElementsRepository.java | 0 .../policy/clamp/tosca/DictionaryRepository.java | 0 .../onap/policy/clamp/tosca/DictionaryService.java | 0 .../org/onap/policy/clamp/util/PassDecoder.java | 0 .../onap/policy/clamp/util/SemanticVersioning.java | 0 .../main/resources/META-INF/resources/swagger.html | 6 +- .../org/apache/camel/dataformat/clamp-gson | 0 .../main/resources/application-noaaf.properties | 0 .../src}/main/resources/application.properties | 0 .../src}/main/resources/asciidoc/swagger.adoc | 0 .../src}/main/resources/boot-message.txt | 0 .../src}/main/resources/clds-version.properties | 0 .../main/resources/clds/aaf/org.onap.clamp.keyfile | 0 .../src}/main/resources/clds/aaf/ssl/ca-certs.pem | 0 .../src}/main/resources/clds/aaf/ssl/clamp.key | 0 .../src}/main/resources/clds/aaf/ssl/clamp.pem | 0 .../main/resources/clds/aaf/truststoreONAPall.jks | Bin .../resources/clds/camel/rest/clamp-api-v2.xml | 0 .../resources/clds/camel/rest/clds-services.xml | 0 .../main/resources/clds/camel/routes/cds-flows.xml | 0 .../resources/clds/camel/routes/dcae-flows.xml | 0 .../resources/clds/camel/routes/loop-flows.xml | 0 .../resources/clds/camel/routes/policy-flows.xml | 0 .../resources/clds/camel/routes/utils-flows.xml | 0 .../src}/main/resources/clds/clds-users.json | 0 .../operational_policies/operational_policy.json | 0 .../resources/clds/sdc-controllers-config.json | 0 .../clds/tosca-converter/default-tosca-types.yaml | 0 .../resources/clds/tosca-converter/templates.json | 0 .../src}/main/resources/logback-default.xml | 0 .../src}/main/resources/logback-spring.xml | 0 .../src}/main/resources/logmessages.properties | 0 .../src}/main/resources/system.properties | 0 .../src}/main/script/SelectNpmRepo.groovy | 0 {src => runtime/src}/main/script/TagVersion.groovy | 0 {src => runtime/src}/main/script/checkLibIndex.sh | 6 +- .../policy/clamp/clds/client/CdsServicesTest.java | 0 .../clamp/clds/config/CldsUserJsonDecoderTest.java | 0 .../sdc/SdcSingleControllerConfigurationTest.java | 0 .../clds/it/AuthorizationControllerItCase.java | 0 .../clds/it/CldsHealthcheckServiceItCase.java | 0 .../org/onap/policy/clamp/clds/it/HttpsItCase.java | 0 .../org/onap/policy/clamp/clds/it/RobotItCase.java | 0 .../it/config/CldsReferencePropertiesItCase.java | 0 .../config/SdcControllersConfigurationItCase.java | 0 .../sdc/controller/SdcSingleControllerItCase.java | 0 .../dcae/DcaeInventoryResponseCacheTestItCase.java | 0 .../clds/model/dcae/DcaeInventoryResponseTest.java | 0 .../model/jsontype/JsonTypeDescriptorTest.java | 0 .../controller/installer/BlueprintParserTest.java | 0 .../controller/installer/ChainGeneratorTest.java | 0 .../sdc/controller/installer/CsarHandlerTest.java | 0 .../tosca/DictionaryRepositoriesTestItCase.java | 0 .../clamp/clds/tosca/update/ArrayFieldTest.java | 0 .../clamp/clds/tosca/update/ConstraintTest.java | 0 .../clds/tosca/update/JsonTemplateFieldTest.java | 0 .../clds/tosca/update/JsonTemplateManagerTest.java | 0 .../clamp/clds/tosca/update/JsonTemplateTest.java | 0 .../ToscaConverterWithDictionarySupportItCase.java | 0 .../tosca/update/ToscaElementPropertyTest.java | 0 .../clamp/clds/tosca/update/ToscaElementTest.java | 104 +- .../onap/policy/clamp/clds/util/JsonUtilsTest.java | 0 .../policy/clamp/clds/util/LoggingUtilsTest.java | 0 .../onap/policy/clamp/clds/util/TestObject.java | 0 .../onap/policy/clamp/clds/util/TestObject2.java | 0 .../policy/clamp/flow/FlowLogOperationTest.java | 0 .../policy/clamp/loop/CsarInstallerItCase.java | 0 .../onap/policy/clamp/loop/DcaeComponentTest.java | 0 .../policy/clamp/loop/DeployFlowTestItCase.java | 0 .../clamp/loop/ExternalComponentStateTest.java | 0 .../clamp/loop/LoopControllerTestItCase.java | 0 .../clamp/loop/LoopLogServiceTestItCase.java | 0 .../policy/clamp/loop/LoopRepositoriesItCase.java | 0 .../policy/clamp/loop/LoopServiceTestItCase.java | 0 .../loop/LoopTemplateLoopElementModelTest.java | 0 .../clamp/loop/LoopTemplatesServiceItCase.java | 292 ++--- .../org/onap/policy/clamp/loop/LoopToJsonTest.java | 0 .../policy/clamp/loop/PolicyComponentTest.java | 0 .../clamp/loop/PolicyModelServiceItCase.java | 0 .../org/onap/policy/clamp/loop/ServiceTest.java | 0 .../loop/deploy/BlueprintInputParametersTest.java | 0 .../PolicyEngineControllerTestItCase.java | 0 .../microservice/MicroServicePayloadTest.java | 0 ...OperationalPolicyRepresentationBuilderTest.java | 0 .../policy/pdpgroup/PdpGroupAnalyzerTest.java | 0 .../pdpgroup/PdpGroupPayloadExceptionTest.java | 0 .../clamp/policy/pdpgroup/PdpGroupPayloadTest.java | 0 .../policy/pdpgroup/PoliciesPdpMergerTest.java | 0 .../clamp/tosca/DictionaryServiceItCase.java | 0 .../onap/policy/clamp/util/PassDecoderTest.java | 0 .../policy/clamp/util/SemanticVersioningTest.java | 0 .../src}/test/resources/application.properties | 0 .../clds/blueprint-with-microservice-chain.yaml | 0 .../test/resources/clds/clds-parse-exception.json | 0 .../clds/clds-users-incomplete-permissions.json | 0 .../resources/clds/clds-users-no-permission.json | 0 .../test/resources/clds/clds-users-two-users.json | 0 .../src}/test/resources/clds/new-microservice.yaml | 0 .../src}/test/resources/clds/policy-merger.json | 0 .../resources/clds/sdc-controller-config-NULL.json | 0 .../resources/clds/sdc-controller-config-TLS.json | 0 .../resources/clds/sdc-controller-config-bad.json | 0 .../sdc-controller-config-empty-encrypted.json | 0 .../resources/clds/sdc-controllers-config-bad.json | 0 .../clds/sdc-controllers-config-missing-param.json | 0 .../resources/clds/sdc-controllers-config.json | 0 .../clds/single-microservice-fragment-invalid.yaml | 0 ...e-microservice-fragment-valid-with-version.yaml | 0 .../single-microservice-fragment-without-name.yaml | 0 ...e-microservice-fragment-without-properties.yaml | 0 ...icroservice-fragment-without-relationships.yaml | 0 .../clds/templates/dcae-deployment-template.json | 0 .../resources/clds/templates/dcae-template.json | 0 .../resources/clds/templates/globalProperties.json | 0 .../clds/templates/sdc-decode-service_ids.json | 0 .../resources/clds/templates/sdc-template.json | 0 .../clds/templates/tca-policy-template.json | 0 .../resources/clds/templates/tca-template.json | 0 .../clds/templates/tca-thresholds-template.json | 0 .../clds/templates/ui-location-default.json | 0 .../src}/test/resources/clds/util/file.xml | 0 .../vFW-CDS-modify-config-wf-expected-result.json | 0 .../vFW-CDS-modify-config-workflow.json | 0 ...CDS-resource-assignment-wf-expected-result.json | 0 .../vFW-CDS-resource-assignment-workflow.json | 0 .../resources/example/dcae/inventory-response.json | 0 .../policy/pdp-deployment-testos-1_0_0.json | 0 .../policy/pdp-deployment-testos-2_0_0.json | 0 .../policy/pdp-group-multi-policies-payload.json | 0 .../example/policy/pdp-group-policy-payload.json | 0 .../resources/example/policy/policy-merger.json | 0 .../example/policy/single-policy-enriched.json | 0 .../example/sdc/blueprint-dcae/tca-bad-policy.yaml | 0 .../example/sdc/blueprint-dcae/tca-guilin.yaml | 0 .../resources/example/sdc/blueprint-dcae/tca.yaml | 0 .../example/sdc/blueprint-dcae/tca_2.yaml | 0 .../example/sdc/blueprint-dcae/tca_3.yaml | 0 .../deployment-parameters-multi-blueprints.json | 0 .../deployment-parameters-single-blueprint.json | 0 .../example/sdc/expected-result/policy-data.yaml | 0 .../example/sdc/service-Simsfoimap0112.csar | Bin .../example/sdc/service-without-policy.csar | Bin .../example/sdc/service_Vloadbalancerms_cds.csar | Bin .../sdc/service_Vloadbalancerms_no_cds.csar | Bin .../api/v1/blueprint-model/workflow-spec/.file | 0 .../api/v1/blueprint-model/workflow-spec/.header | 0 .../baseconfiguration/version/1.0.0/.file | 0 .../baseconfiguration/version/1.0.0/.header | 0 .../example/policy/api/v1/policies/.file | 0 .../example/policy/api/v1/policies/.header | 0 .../example/policy/api/v1/policytypes/.file | 0 .../example/policy/api/v1/policytypes/.header | 0 .../onap.policies.Naming/versions/1.0.0/.file | 0 .../onap.policies.Naming/versions/1.0.0/.header | 0 .../versions/1.0.0/.file | 0 .../versions/1.0.0/.header | 0 .../versions/1.0.0/.file | 0 .../versions/1.0.0/.header | 0 .../versions/1.0.0/.file | 0 .../versions/1.0.0/.header | 0 .../versions/2.0.0/.file | 0 .../versions/2.0.0/.header | 0 .../versions/1.0.0/.file | 0 .../versions/1.0.0/.header | 0 .../versions/1.0.0/.file | 0 .../versions/1.0.0/.header | 0 .../versions/1.0.0/.file | 0 .../versions/1.0.0/.header | 0 .../versions/1.0.0/.file | 0 .../versions/1.0.0/.header | 0 .../http-cache/example/policy/pap/v1/pdps/.file | 0 .../http-cache/example/policy/pap/v1/pdps/.header | 0 .../test/resources/http-cache/start_http_cache.sh | 0 .../test/resources/http-cache/third_party_proxy.py | 0 .../test/resources/https/https-test.properties | 0 .../src}/test/resources/https/keystore-test.jks | Bin {src => runtime/src}/test/resources/logback.xml | 0 .../src}/test/resources/robotframework/Dockerfile | 3 +- .../test/resources/robotframework/requirements.txt | 0 .../robotframework/robotframework-test.properties | 0 .../robotframework/tests/01_healthcheck.robot | 0 .../robotframework/tests/02_policy_queries.robot | 0 .../tosca/micro-service-policy-payload.json | 0 .../tosca/micro-service-policy-properties.json | 0 .../test/resources/tosca/model-properties-cds.json | 0 .../tosca/model-properties-operational-policy.json | 0 .../test/resources/tosca/model-properties.json | 0 .../resources/tosca/new-converter/constraints.yaml | 120 +- .../new-converter/sampleOperationalPolicies.yaml | 320 ++--- .../sampleOperationalPoliciesEXTENTED.yaml | 0 .../tosca/new-converter/tca-with-metadata.json | 0 .../new-converter/tosca_apex_with_metadata.json | 0 .../tosca_metadata_clamp_possible_values.yaml | 0 .../operational-policy-cds-payload-with-list.json | 0 .../tosca/operational-policy-json-schema.json | 0 .../operational-policy-no-guard-properties.json | 0 .../tosca/operational-policy-properties.json | 0 .../test/resources/tosca/resource-details-cds.json | 0 .../test/resources/tosca/resource-details.json | 0 .../src}/test/resources/tosca/service-details.json | 0 .../src}/test/resources/tosca/tca_hi_lo.json | 0 .../src}/test/resources/tosca/tosca_example.yaml | 0 .../tosca/tosca_with_date_time_json_schema.json | 0 .../test/resources/tosca/tosca_with_metadata.yaml | 0 .../ui-react-lib}/libExportExclusions.dat | 0 {ui-react-lib => runtime/ui-react-lib}/libIndex.js | 0 .../ui-react-lib}/package.json | 0 .../ui-react-lib}/rollup.config.js | 0 {ui-react => runtime/ui-react}/package.json | 0 {ui-react => runtime/ui-react}/public/index.html | 0 .../ui-react}/public/manifest.json | 0 {ui-react => runtime/ui-react}/public/onap.ico | Bin {ui-react => runtime/ui-react}/src/LoopUI.js | 0 {ui-react => runtime/ui-react}/src/LoopUI.test.js | 0 {ui-react => runtime/ui-react}/src/NotFound.js | 0 .../ui-react}/src/NotFound.test.js | 0 {ui-react => runtime/ui-react}/src/OnapClamp.js | 0 .../ui-react}/src/OnapClamp.test.js | 0 .../src/__snapshots__/LoopUI.test.js.snap | 0 .../src/__snapshots__/NotFound.test.js.snap | 0 .../src/__snapshots__/OnapClamp.test.js.snap | 0 .../ui-react}/src/api/LoopActionService.js | 0 .../ui-react}/src/api/LoopCache.js | 0 .../ui-react}/src/api/LoopCache.test.js | 0 .../ui-react}/src/api/LoopCacheMockFile.json | 0 .../ui-react}/src/api/LoopService.js | 0 .../src/api/PoliciesListCacheMockFile.json | 0 .../ui-react}/src/api/PolicyService.js | 0 .../ui-react}/src/api/PolicyToscaService.js | 0 .../ui-react}/src/api/TemplateService.js | 0 .../ui-react}/src/api/UserService.js | 0 .../src/components/dialogs/Loop/CreateLoopModal.js | 0 .../dialogs/Loop/CreateLoopModal.test.js | 0 .../src/components/dialogs/Loop/DeployLoopModal.js | 0 .../dialogs/Loop/DeployLoopModal.test.js | 0 .../components/dialogs/Loop/LoopPropertiesModal.js | 0 .../dialogs/Loop/LoopPropertiesModal.test.js | 0 .../src/components/dialogs/Loop/ModifyLoopModal.js | 0 .../dialogs/Loop/ModifyLoopModal.test.js | 0 .../src/components/dialogs/Loop/OpenLoopModal.js | 0 .../components/dialogs/Loop/OpenLoopModal.test.js | 0 .../__snapshots__/CreateLoopModal.test.js.snap | 0 .../__snapshots__/DeployLoopModal.test.js.snap | 0 .../__snapshots__/LoopPropertiesModal.test.js.snap | 0 .../Loop/__snapshots__/OpenLoopModal.test.js.snap | 0 .../ManageDictionaries/ManageDictionaries.js | 0 .../ManageDictionaries/ManageDictionaries.test.js | 0 .../__snapshots__/ManageDictionaries.test.js.snap | 0 .../src/components/dialogs/PerformActions.js | 0 .../src/components/dialogs/PerformActions.test.js | 0 .../dialogs/Policy/PoliciesTreeViewer.js | 0 .../dialogs/Policy/PolicyDeploymentEditor.js | 0 .../src/components/dialogs/Policy/PolicyEditor.js | 0 .../components/dialogs/Policy/PolicyEditor.test.js | 0 .../src/components/dialogs/Policy/PolicyModal.js | 0 .../components/dialogs/Policy/PolicyModal.test.js | 0 .../dialogs/Policy/PolicyToscaFileSelector.js | 0 .../src/components/dialogs/Policy/ToscaViewer.js | 0 .../components/dialogs/Policy/ToscaViewer.test.js | 0 .../components/dialogs/Policy/ViewAllPolicies.js | 0 .../Policy/__snapshots__/PolicyEditor.test.js.snap | 0 .../Policy/__snapshots__/PolicyModal.test.js.snap | 0 .../Policy/__snapshots__/ToscaViewer.test.js.snap | 0 .../components/dialogs/Policy/toscaData.test.json | 0 .../components/dialogs/Policy/toscaData.test.yaml | 0 .../src/components/dialogs/RefreshStatus.js | 0 .../src/components/dialogs/RefreshStatus.test.js | 0 .../dialogs/Tosca/ViewLoopTemplatesModal.js | 0 .../dialogs/Tosca/ViewLoopTemplatesModal.test.js | 0 .../ViewLoopTemplatesModal.test.js.snap | 0 .../src/components/dialogs/UserInfoModal.js | 0 .../src/components/dialogs/UserInfoModal.test.js | 0 .../__snapshots__/UserInfoModal.test.js.snap | 0 .../src/components/loop_viewer/logs/LoopLogs.js | 0 .../components/loop_viewer/logs/LoopLogs.test.js | 0 .../logs/__snapshots__/LoopLogs.test.js.snap | 0 .../components/loop_viewer/status/LoopStatus.js | 0 .../loop_viewer/status/LoopStatus.test.js | 0 .../status/__snapshots__/LoopStatus.test.js.snap | 0 .../src/components/loop_viewer/svg/SvgGenerator.js | 0 .../ui-react}/src/components/menu/MenuBar.js | 0 .../ui-react}/src/components/menu/MenuBar.test.js | 0 .../menu/__snapshots__/MenuBar.test.js.snap | 0 {ui-react => runtime/ui-react}/src/index.js | 0 {ui-react => runtime/ui-react}/src/logo.png | Bin {ui-react => runtime/ui-react}/src/setupTests.js | 0 .../ui-react}/src/theme/globalStyle.js | 0 .../ui-react}/src/utils/CsvToJson.js | 0 .../ui-react}/src/utils/CsvToJson.test.js | 0 .../ui-react}/src/utils/OnapConstants.js | 0 .../ui-react}/src/utils/OnapUtils.js | 0 version.properties | 4 +- 471 files changed, 3274 insertions(+), 2462 deletions(-) create mode 100644 common/pom.xml mode change 100755 => 100644 docs/_static/favicon.ico mode change 100755 => 100644 docs/images/user-guide/blueprint_node_type.png mode change 100755 => 100644 docs/images/user-guide/clamp-cds-operation.png mode change 100755 => 100644 docs/images/user-guide/config-policy-tca.png mode change 100755 => 100644 docs/images/user-guide/deploy-params.png mode change 100755 => 100644 docs/images/user-guide/op-policy-box-policy.png mode change 100755 => 100644 docs/images/user-guide/open-menu-prop.png mode change 100755 => 100644 docs/images/user-guide/policy-submitted.png create mode 100644 models/pom.xml create mode 100644 participant/participant-impl/participant-impl-cds/pom.xml create mode 100644 participant/participant-impl/participant-impl-dcae/pom.xml create mode 100644 participant/participant-impl/participant-impl-kubernetes/pom.xml create mode 100644 participant/participant-impl/participant-impl-policy/pom.xml create mode 100644 participant/participant-impl/participant-impl-simulator/pom.xml create mode 100644 participant/participant-impl/pom.xml create mode 100644 participant/participant-intermediary/pom.xml create mode 100644 participant/pom.xml rename {extra => runtime/extra}/bin-for-dev/start-backend.sh (100%) rename {extra => runtime/extra}/bin-for-dev/start-db.sh (100%) rename {extra => runtime/extra}/bin-for-dev/start-emulator.sh (100%) rename {extra => runtime/extra}/bin-for-dev/start-frontend.sh (100%) rename {extra => runtime/extra}/docker/clamp/clamp.env (100%) rename {extra => runtime/extra}/docker/clamp/docker-compose.yml (100%) rename {extra => runtime/extra}/docker/mariadb/conf1/my.cnf (100%) rename {extra => runtime/extra}/docker/mariadb/conf2/my.cnf (100%) rename {extra => runtime/extra}/docker/mariadb/conf3/my.cnf (100%) rename {extra => runtime/extra}/sql/bootstrap-database.sh (100%) rename {extra => runtime/extra}/sql/bulkload/create-db.sql (100%) rename {extra => runtime/extra}/sql/bulkload/create-tables.sql (100%) rename {extra => runtime/extra}/sql/dump/backup-data-only.sh (100%) rename {extra => runtime/extra}/sql/dump/backup-database.sh (100%) rename {extra => runtime/extra}/sql/dump/load-fake-data.sh (100%) rename {extra => runtime/extra}/sql/dump/test-data.sql (100%) create mode 100644 runtime/pom.xml create mode 100644 runtime/runtime/src/main/resources/META-INF/resources/swagger.html rename {src => runtime/src}/main/docker/backend/Dockerfile (97%) rename {src => runtime/src}/main/docker/backend/backend-files.xml (100%) rename {src => runtime/src}/main/docker/frontend/Dockerfile (95%) rename {src => runtime/src}/main/docker/frontend/frontend-files.xml (100%) rename {src => runtime/src}/main/docker/frontend/nginx/default.conf (100%) rename {src => runtime/src}/main/docker/frontend/nginx/nginx.conf (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/authorization/CldsUser.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/authorization/UserService.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/Application.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/ClampServlet.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/client/CdsServices.java (97%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java (98%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/config/SslConfig.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java (97%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java (97%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataTargetProcess.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/util/LogMessages.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/CsarInstaller.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/Loop.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/LoopController.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/LoopService.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/LoopState.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/LoopsRepository.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/log/LogType.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/log/LoopLog.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/service/Service.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/LoopType.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/Policy.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/PolicyEngineServices.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/PolicyPayload.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/PolicyService.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayload.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadException.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/tosca/Dictionary.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/tosca/DictionaryService.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/util/PassDecoder.java (100%) rename {src => runtime/src}/main/java/org/onap/policy/clamp/util/SemanticVersioning.java (100%) rename {src => runtime/src}/main/resources/META-INF/resources/swagger.html (99%) rename {src => runtime/src}/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson (100%) rename {src => runtime/src}/main/resources/application-noaaf.properties (100%) rename {src => runtime/src}/main/resources/application.properties (100%) rename {src => runtime/src}/main/resources/asciidoc/swagger.adoc (100%) rename {src => runtime/src}/main/resources/boot-message.txt (100%) rename {src => runtime/src}/main/resources/clds-version.properties (100%) rename {src => runtime/src}/main/resources/clds/aaf/org.onap.clamp.keyfile (100%) rename {src => runtime/src}/main/resources/clds/aaf/ssl/ca-certs.pem (100%) rename {src => runtime/src}/main/resources/clds/aaf/ssl/clamp.key (100%) rename {src => runtime/src}/main/resources/clds/aaf/ssl/clamp.pem (100%) rename {src => runtime/src}/main/resources/clds/aaf/truststoreONAPall.jks (100%) rename {src => runtime/src}/main/resources/clds/camel/rest/clamp-api-v2.xml (100%) rename {src => runtime/src}/main/resources/clds/camel/rest/clds-services.xml (100%) rename {src => runtime/src}/main/resources/clds/camel/routes/cds-flows.xml (100%) rename {src => runtime/src}/main/resources/clds/camel/routes/dcae-flows.xml (100%) rename {src => runtime/src}/main/resources/clds/camel/routes/loop-flows.xml (100%) rename {src => runtime/src}/main/resources/clds/camel/routes/policy-flows.xml (100%) rename {src => runtime/src}/main/resources/clds/camel/routes/utils-flows.xml (100%) rename {src => runtime/src}/main/resources/clds/clds-users.json (100%) rename {src => runtime/src}/main/resources/clds/json-schema/operational_policies/operational_policy.json (100%) rename {src => runtime/src}/main/resources/clds/sdc-controllers-config.json (100%) rename {src => runtime/src}/main/resources/clds/tosca-converter/default-tosca-types.yaml (100%) rename {src => runtime/src}/main/resources/clds/tosca-converter/templates.json (100%) rename {src => runtime/src}/main/resources/logback-default.xml (100%) rename {src => runtime/src}/main/resources/logback-spring.xml (100%) rename {src => runtime/src}/main/resources/logmessages.properties (100%) rename {src => runtime/src}/main/resources/system.properties (100%) rename {src => runtime/src}/main/script/SelectNpmRepo.groovy (100%) rename {src => runtime/src}/main/script/TagVersion.groovy (100%) rename {src => runtime/src}/main/script/checkLibIndex.sh (95%) mode change 100755 => 100644 rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java (97%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/util/TestObject.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/clds/util/TestObject2.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java (97%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/ServiceTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupAnalyzerTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadExceptionTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMergerTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/util/PassDecoderTest.java (100%) rename {src => runtime/src}/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java (100%) rename {src => runtime/src}/test/resources/application.properties (100%) rename {src => runtime/src}/test/resources/clds/blueprint-with-microservice-chain.yaml (100%) rename {src => runtime/src}/test/resources/clds/clds-parse-exception.json (100%) rename {src => runtime/src}/test/resources/clds/clds-users-incomplete-permissions.json (100%) rename {src => runtime/src}/test/resources/clds/clds-users-no-permission.json (100%) rename {src => runtime/src}/test/resources/clds/clds-users-two-users.json (100%) rename {src => runtime/src}/test/resources/clds/new-microservice.yaml (100%) rename {src => runtime/src}/test/resources/clds/policy-merger.json (100%) rename {src => runtime/src}/test/resources/clds/sdc-controller-config-NULL.json (100%) rename {src => runtime/src}/test/resources/clds/sdc-controller-config-TLS.json (100%) rename {src => runtime/src}/test/resources/clds/sdc-controller-config-bad.json (100%) rename {src => runtime/src}/test/resources/clds/sdc-controller-config-empty-encrypted.json (100%) rename {src => runtime/src}/test/resources/clds/sdc-controllers-config-bad.json (100%) rename {src => runtime/src}/test/resources/clds/sdc-controllers-config-missing-param.json (100%) rename {src => runtime/src}/test/resources/clds/sdc-controllers-config.json (100%) rename {src => runtime/src}/test/resources/clds/single-microservice-fragment-invalid.yaml (100%) rename {src => runtime/src}/test/resources/clds/single-microservice-fragment-valid-with-version.yaml (100%) rename {src => runtime/src}/test/resources/clds/single-microservice-fragment-without-name.yaml (100%) rename {src => runtime/src}/test/resources/clds/single-microservice-fragment-without-properties.yaml (100%) rename {src => runtime/src}/test/resources/clds/single-microservice-fragment-without-relationships.yaml (100%) rename {src => runtime/src}/test/resources/clds/templates/dcae-deployment-template.json (100%) rename {src => runtime/src}/test/resources/clds/templates/dcae-template.json (100%) rename {src => runtime/src}/test/resources/clds/templates/globalProperties.json (100%) rename {src => runtime/src}/test/resources/clds/templates/sdc-decode-service_ids.json (100%) rename {src => runtime/src}/test/resources/clds/templates/sdc-template.json (100%) rename {src => runtime/src}/test/resources/clds/templates/tca-policy-template.json (100%) rename {src => runtime/src}/test/resources/clds/templates/tca-template.json (100%) rename {src => runtime/src}/test/resources/clds/templates/tca-thresholds-template.json (100%) rename {src => runtime/src}/test/resources/clds/templates/ui-location-default.json (100%) rename {src => runtime/src}/test/resources/clds/util/file.xml (100%) rename {src => runtime/src}/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json (100%) rename {src => runtime/src}/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json (100%) rename {src => runtime/src}/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json (100%) rename {src => runtime/src}/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json (100%) rename {src => runtime/src}/test/resources/example/dcae/inventory-response.json (100%) rename {src => runtime/src}/test/resources/example/policy/pdp-deployment-testos-1_0_0.json (100%) rename {src => runtime/src}/test/resources/example/policy/pdp-deployment-testos-2_0_0.json (100%) rename {src => runtime/src}/test/resources/example/policy/pdp-group-multi-policies-payload.json (100%) rename {src => runtime/src}/test/resources/example/policy/pdp-group-policy-payload.json (100%) rename {src => runtime/src}/test/resources/example/policy/policy-merger.json (100%) rename {src => runtime/src}/test/resources/example/policy/single-policy-enriched.json (100%) rename {src => runtime/src}/test/resources/example/sdc/blueprint-dcae/tca-bad-policy.yaml (100%) rename {src => runtime/src}/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml (100%) rename {src => runtime/src}/test/resources/example/sdc/blueprint-dcae/tca.yaml (100%) rename {src => runtime/src}/test/resources/example/sdc/blueprint-dcae/tca_2.yaml (100%) rename {src => runtime/src}/test/resources/example/sdc/blueprint-dcae/tca_3.yaml (100%) rename {src => runtime/src}/test/resources/example/sdc/expected-result/deployment-parameters-multi-blueprints.json (100%) rename {src => runtime/src}/test/resources/example/sdc/expected-result/deployment-parameters-single-blueprint.json (100%) rename {src => runtime/src}/test/resources/example/sdc/expected-result/policy-data.yaml (100%) rename {src => runtime/src}/test/resources/example/sdc/service-Simsfoimap0112.csar (100%) rename {src => runtime/src}/test/resources/example/sdc/service-without-policy.csar (100%) rename {src => runtime/src}/test/resources/example/sdc/service_Vloadbalancerms_cds.csar (100%) rename {src => runtime/src}/test/resources/example/sdc/service_Vloadbalancerms_no_cds.csar (100%) rename {src => runtime/src}/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policies/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policies/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.header (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/pap/v1/pdps/.file (100%) rename {src => runtime/src}/test/resources/http-cache/example/policy/pap/v1/pdps/.header (100%) rename {src => runtime/src}/test/resources/http-cache/start_http_cache.sh (100%) rename {src => runtime/src}/test/resources/http-cache/third_party_proxy.py (100%) mode change 100755 => 100644 rename {src => runtime/src}/test/resources/https/https-test.properties (100%) rename {src => runtime/src}/test/resources/https/keystore-test.jks (100%) rename {src => runtime/src}/test/resources/logback.xml (100%) rename {src => runtime/src}/test/resources/robotframework/Dockerfile (58%) rename {src => runtime/src}/test/resources/robotframework/requirements.txt (100%) rename {src => runtime/src}/test/resources/robotframework/robotframework-test.properties (100%) rename {src => runtime/src}/test/resources/robotframework/tests/01_healthcheck.robot (100%) rename {src => runtime/src}/test/resources/robotframework/tests/02_policy_queries.robot (100%) rename {src => runtime/src}/test/resources/tosca/micro-service-policy-payload.json (100%) rename {src => runtime/src}/test/resources/tosca/micro-service-policy-properties.json (100%) rename {src => runtime/src}/test/resources/tosca/model-properties-cds.json (100%) rename {src => runtime/src}/test/resources/tosca/model-properties-operational-policy.json (100%) rename {src => runtime/src}/test/resources/tosca/model-properties.json (100%) rename {src => runtime/src}/test/resources/tosca/new-converter/constraints.yaml (97%) rename {src => runtime/src}/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml (97%) rename {src => runtime/src}/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml (100%) rename {src => runtime/src}/test/resources/tosca/new-converter/tca-with-metadata.json (100%) rename {src => runtime/src}/test/resources/tosca/new-converter/tosca_apex_with_metadata.json (100%) rename {src => runtime/src}/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml (100%) rename {src => runtime/src}/test/resources/tosca/operational-policy-cds-payload-with-list.json (100%) rename {src => runtime/src}/test/resources/tosca/operational-policy-json-schema.json (100%) rename {src => runtime/src}/test/resources/tosca/operational-policy-no-guard-properties.json (100%) rename {src => runtime/src}/test/resources/tosca/operational-policy-properties.json (100%) rename {src => runtime/src}/test/resources/tosca/resource-details-cds.json (100%) rename {src => runtime/src}/test/resources/tosca/resource-details.json (100%) rename {src => runtime/src}/test/resources/tosca/service-details.json (100%) rename {src => runtime/src}/test/resources/tosca/tca_hi_lo.json (100%) rename {src => runtime/src}/test/resources/tosca/tosca_example.yaml (100%) rename {src => runtime/src}/test/resources/tosca/tosca_with_date_time_json_schema.json (100%) rename {src => runtime/src}/test/resources/tosca/tosca_with_metadata.yaml (100%) rename {ui-react-lib => runtime/ui-react-lib}/libExportExclusions.dat (100%) rename {ui-react-lib => runtime/ui-react-lib}/libIndex.js (100%) rename {ui-react-lib => runtime/ui-react-lib}/package.json (100%) rename {ui-react-lib => runtime/ui-react-lib}/rollup.config.js (100%) rename {ui-react => runtime/ui-react}/package.json (100%) rename {ui-react => runtime/ui-react}/public/index.html (100%) rename {ui-react => runtime/ui-react}/public/manifest.json (100%) rename {ui-react => runtime/ui-react}/public/onap.ico (100%) rename {ui-react => runtime/ui-react}/src/LoopUI.js (100%) rename {ui-react => runtime/ui-react}/src/LoopUI.test.js (100%) rename {ui-react => runtime/ui-react}/src/NotFound.js (100%) rename {ui-react => runtime/ui-react}/src/NotFound.test.js (100%) rename {ui-react => runtime/ui-react}/src/OnapClamp.js (100%) rename {ui-react => runtime/ui-react}/src/OnapClamp.test.js (100%) rename {ui-react => runtime/ui-react}/src/__snapshots__/LoopUI.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/__snapshots__/NotFound.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/__snapshots__/OnapClamp.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/api/LoopActionService.js (100%) rename {ui-react => runtime/ui-react}/src/api/LoopCache.js (100%) rename {ui-react => runtime/ui-react}/src/api/LoopCache.test.js (100%) rename {ui-react => runtime/ui-react}/src/api/LoopCacheMockFile.json (100%) rename {ui-react => runtime/ui-react}/src/api/LoopService.js (100%) rename {ui-react => runtime/ui-react}/src/api/PoliciesListCacheMockFile.json (100%) rename {ui-react => runtime/ui-react}/src/api/PolicyService.js (100%) rename {ui-react => runtime/ui-react}/src/api/PolicyToscaService.js (100%) rename {ui-react => runtime/ui-react}/src/api/TemplateService.js (100%) rename {ui-react => runtime/ui-react}/src/api/UserService.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/CreateLoopModal.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/CreateLoopModal.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/DeployLoopModal.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/DeployLoopModal.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/LoopPropertiesModal.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/LoopPropertiesModal.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/ModifyLoopModal.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/ModifyLoopModal.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/OpenLoopModal.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/OpenLoopModal.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/ManageDictionaries/ManageDictionaries.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/PerformActions.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/PerformActions.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/PoliciesTreeViewer.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/PolicyDeploymentEditor.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/PolicyEditor.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/PolicyEditor.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/PolicyModal.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/PolicyModal.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/PolicyToscaFileSelector.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/ToscaViewer.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/ToscaViewer.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/ViewAllPolicies.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/__snapshots__/PolicyEditor.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/__snapshots__/PolicyModal.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/__snapshots__/ToscaViewer.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/toscaData.test.json (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Policy/toscaData.test.yaml (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/RefreshStatus.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/RefreshStatus.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/UserInfoModal.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/UserInfoModal.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/components/loop_viewer/logs/LoopLogs.js (100%) rename {ui-react => runtime/ui-react}/src/components/loop_viewer/logs/LoopLogs.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/components/loop_viewer/status/LoopStatus.js (100%) rename {ui-react => runtime/ui-react}/src/components/loop_viewer/status/LoopStatus.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/components/loop_viewer/svg/SvgGenerator.js (100%) rename {ui-react => runtime/ui-react}/src/components/menu/MenuBar.js (100%) rename {ui-react => runtime/ui-react}/src/components/menu/MenuBar.test.js (100%) rename {ui-react => runtime/ui-react}/src/components/menu/__snapshots__/MenuBar.test.js.snap (100%) rename {ui-react => runtime/ui-react}/src/index.js (100%) rename {ui-react => runtime/ui-react}/src/logo.png (100%) rename {ui-react => runtime/ui-react}/src/setupTests.js (100%) rename {ui-react => runtime/ui-react}/src/theme/globalStyle.js (100%) rename {ui-react => runtime/ui-react}/src/utils/CsvToJson.js (100%) rename {ui-react => runtime/ui-react}/src/utils/CsvToJson.test.js (100%) rename {ui-react => runtime/ui-react}/src/utils/OnapConstants.js (100%) rename {ui-react => runtime/ui-react}/src/utils/OnapUtils.js (100%) diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 000000000..d962fc74a --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,36 @@ + + + + + 4.0.0 + + + org.onap.policy.clamp + policy-clamp + 6.1.2-SNAPSHOT + + + policy-clamp-common + ${project.artifactId} + Common utilities and code for the TOSCA Control Loop system + diff --git a/docs/_static/favicon.ico b/docs/_static/favicon.ico old mode 100755 new mode 100644 diff --git a/docs/images/user-guide/blueprint_node_type.png b/docs/images/user-guide/blueprint_node_type.png old mode 100755 new mode 100644 diff --git a/docs/images/user-guide/clamp-cds-operation.png b/docs/images/user-guide/clamp-cds-operation.png old mode 100755 new mode 100644 diff --git a/docs/images/user-guide/config-policy-tca.png b/docs/images/user-guide/config-policy-tca.png old mode 100755 new mode 100644 diff --git a/docs/images/user-guide/deploy-params.png b/docs/images/user-guide/deploy-params.png old mode 100755 new mode 100644 diff --git a/docs/images/user-guide/op-policy-box-policy.png b/docs/images/user-guide/op-policy-box-policy.png old mode 100755 new mode 100644 diff --git a/docs/images/user-guide/open-menu-prop.png b/docs/images/user-guide/open-menu-prop.png old mode 100755 new mode 100644 diff --git a/docs/images/user-guide/policy-submitted.png b/docs/images/user-guide/policy-submitted.png old mode 100755 new mode 100644 diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json index 5a958e29b..75c629562 100644 --- a/docs/swagger/swagger.json +++ b/docs/swagger/swagger.json @@ -1,7 +1,7 @@ { "swagger" : "2.0", "info" : { - "version" : "6.1.1-SNAPSHOT", + "version" : "6.1.2-SNAPSHOT", "title" : "Clamp Rest API" }, "host" : "localhost:37747", @@ -1802,4 +1802,4 @@ } } } -} \ No newline at end of file +} diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf index 99dca1882..9d51932ef 100644 --- a/docs/swagger/swagger.pdf +++ b/docs/swagger/swagger.pdf @@ -4,8 +4,8 @@ << /Title (Clamp Rest API) /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0) -/CreationDate (D:20210426134156+02'00') -/ModDate (D:20210426134156+02'00') +/CreationDate (D:20210510121240+01'00') +/ModDate (D:20210510121240+01'00') >> endobj 2 0 obj diff --git a/models/pom.xml b/models/pom.xml new file mode 100644 index 000000000..380ae0c03 --- /dev/null +++ b/models/pom.xml @@ -0,0 +1,35 @@ + + + + + 4.0.0 + + + org.onap.policy.clamp + policy-clamp + 6.1.2-SNAPSHOT + + + policy-clamp-models + ${project.artifactId} + diff --git a/participant/participant-impl/participant-impl-cds/pom.xml b/participant/participant-impl/participant-impl-cds/pom.xml new file mode 100644 index 000000000..ccdd8bee7 --- /dev/null +++ b/participant/participant-impl/participant-impl-cds/pom.xml @@ -0,0 +1,34 @@ + + + + 4.0.0 + + + org.onap.policy.clamp.participant + policy-clamp-participant-impl + 6.1.2-SNAPSHOT + + + policy-clamp-participant-impl-cds + ${project.artifactId} + CDS participant, that allows CDS to partake in control loops + diff --git a/participant/participant-impl/participant-impl-dcae/pom.xml b/participant/participant-impl/participant-impl-dcae/pom.xml new file mode 100644 index 000000000..6186ced61 --- /dev/null +++ b/participant/participant-impl/participant-impl-dcae/pom.xml @@ -0,0 +1,34 @@ + + + + 4.0.0 + + + org.onap.policy.clamp.participant + policy-clamp-participant-impl + 6.1.2-SNAPSHOT + + + policy-clamp-participant-impl-dcae + ${project.artifactId} + DCAE participant, that allows DCAE to partake in control loops + diff --git a/participant/participant-impl/participant-impl-kubernetes/pom.xml b/participant/participant-impl/participant-impl-kubernetes/pom.xml new file mode 100644 index 000000000..a85c5fdbf --- /dev/null +++ b/participant/participant-impl/participant-impl-kubernetes/pom.xml @@ -0,0 +1,34 @@ + + + + 4.0.0 + + + org.onap.policy.clamp.participant + policy-clamp-participant-impl + 6.1.2-SNAPSHOT + + + policy-clamp-participant-impl-kubernetes + ${project.artifactId} + Kubernetes participant, that allows microservices running in Kubernetes to partake in control loops + diff --git a/participant/participant-impl/participant-impl-policy/pom.xml b/participant/participant-impl/participant-impl-policy/pom.xml new file mode 100644 index 000000000..a5a75626e --- /dev/null +++ b/participant/participant-impl/participant-impl-policy/pom.xml @@ -0,0 +1,34 @@ + + + + 4.0.0 + + + org.onap.policy.clamp.participant + policy-clamp-participant-impl + 6.1.2-SNAPSHOT + + + policy-clamp-participant-impl-policy + ${project.artifactId} + Policy participant, that allows Policy to partake in control loops + diff --git a/participant/participant-impl/participant-impl-simulator/pom.xml b/participant/participant-impl/participant-impl-simulator/pom.xml new file mode 100644 index 000000000..d54a23e53 --- /dev/null +++ b/participant/participant-impl/participant-impl-simulator/pom.xml @@ -0,0 +1,34 @@ + + + + 4.0.0 + + + org.onap.policy.clamp.participant + policy-clamp-participant-impl + 6.1.2-SNAPSHOT + + + policy-clamp-participant-impl-simulator + ${project.artifactId} + Participant simulator, used to test control loops + diff --git a/participant/participant-impl/pom.xml b/participant/participant-impl/pom.xml new file mode 100644 index 000000000..6c67bfa51 --- /dev/null +++ b/participant/participant-impl/pom.xml @@ -0,0 +1,43 @@ + + + + + 4.0.0 + + + org.onap.policy.clamp.participant + policy-clamp-participant + 6.1.2-SNAPSHOT + + + policy-clamp-participant-impl + ${project.artifactId} + pom + + + participant-impl-simulator + participant-impl-dcae + participant-impl-policy + participant-impl-cds + participant-impl-kubernetes + + diff --git a/participant/participant-intermediary/pom.xml b/participant/participant-intermediary/pom.xml new file mode 100644 index 000000000..df354d46c --- /dev/null +++ b/participant/participant-intermediary/pom.xml @@ -0,0 +1,37 @@ + + + + 4.0.0 + + + org.onap.policy.clamp.participant + policy-clamp-participant + 6.1.2-SNAPSHOT + + + org.onap.policy.clamp.participant + policy-clamp-participant-intermediary + ${project.artifactId} + Common intermediary library for managing DMaaP participant messaging and holding participant and control + loop state + + diff --git a/participant/pom.xml b/participant/pom.xml new file mode 100644 index 000000000..c18ee14d0 --- /dev/null +++ b/participant/pom.xml @@ -0,0 +1,42 @@ + + + + + 4.0.0 + + + org.onap.policy.clamp + policy-clamp + 6.1.2-SNAPSHOT + + + org.onap.policy.clamp.participant + policy-clamp-participant + ${project.artifactId} + participants that communicate with the runtime server to handle control loops + pom + + + participant-intermediary + participant-impl + + diff --git a/pom.xml b/pom.xml index dccefcafe..6f86ff513 100644 --- a/pom.xml +++ b/pom.xml @@ -1,1329 +1,71 @@ - - - 4.0.0 - org.onap.policy - clamp - 6.1.1-SNAPSHOT - policy-clamp + ============LICENSE_END========================================================= + --> + + 4.0.0 org.onap.policy.parent integration - 3.3.0 - + 3.4.0-SNAPSHOT - - This is the MAVEN project that builds everything for ONAP POLICY-CLAMP. - Docker engine is normally requires to perfom all possible tasks (including integration tests) - - It can build: - - The ONAP POLICY-CLAMP JAR that contains CLAMP back-end code. - - The DOCKER images for: - * POLICY-CLAMP backend (Java Spring) - * POLICY-CLAMP frontend (Javascript React) - - It can test: - - The POLICY-CLAMP backend, JAVA unit testing - - The POLICY-CLAMP backend, JAVA integration tests (with Spring + docker mariadb database + docker policy/dcae - emulator written in python) - - The POLICY-CLAMP frontend, Javascript tests (NodeJS(NPM) + JEST and Enzyme for React) - - The test coverage for dev's can be found after a "clean install" build in: - - Clamp backend: target/jacoco-dev.exec (unit tests + integration tests merged) - or separately target/coverage-reports/jacoco.exec and target/coverage-reports/jacoco-it.exec - - Clamp frontend: target/ui-react/coverage - - Useful mvn commands: - - mvn clean install: Build Clamp backend JAR + unit tests + integration tests + NPM tests (+coverage for all) - - mvn clean install -DskipITs=true: Build Clamp backend JAR + unit tests + NPM tests (+coverage for all), it - does not require a DOCKER engine - - mvn clean install -DskipTests -P docker: Build Clamp backend JAR + all docker images + org.onap.policy.clamp + policy-clamp + 6.1.2-SNAPSHOT + ${project.artifactId} - To start POLICY-CLAMP (Build it before): - - Use docker-compose file in ./extra/docker/clamp/docker-compose.yml - - Use the script located in ./extra/bin/start-backend.sh + start-frontend.sh - - Use your IDE to use the Jar or start NVM/NPM + pom + + This is the root Maven module for the policy-clamp project. + + It contains the following modules: + - policy-clamp-common: Common code for all CLAMP modules + - policy-clamp-models: POJOs and other model code for REST and DMaaP messages and for persistence + - policy-clamp-runtime: The runtime server for CLAMP + - policy-clamp-participant: Modules for CLAMP control loop participants + o policy-clamp-participant-intermediary: A common JAR that handles participant state and DMaaP handling + o policy-clamp-participant-impl-cds: A standard participant for interworking with CDS + o policy-clamp-participant-impl-dcae: A standard participant for interworking with DCAE + o policy-clamp-participant-impl-kubernetes: A standard participant for Kubernetes microservices + o policy-clamp-participant-impl-policy: A standard participant for handling polcies for Policy Framework + o policy-clamp-participant-impl-simulator: A participant simulator for integration testing - yyyyMMdd'T'HHmmss'Z' - ${project.version} - ${maven.build.timestamp} - UTF-8 - UTF-8 - - 1.0.0 - 3.7.3 - 2.4.4 - - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/jacoco-html-xml-reports/jacoco.xml - - ${project.version} - DEBUG - ${project.build.directory}/${ui.react.src}/node/node - true - src/main,${project.build.directory}/${ui.react.src}/src - src/main/resources/** - true - ${project.build.directory}/${ui.react.src}/coverage/lcov.info - - - src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js - - localhost:5000 - nexus3.onap.org:10001 - true - true - true - false - - 9.0.45 - ui-react - ui-react-lib - https://nexus3.onap.org/repository/npm.snapshot/ - - 2.4.0 - 1.8.1 + 1.9.0-SNAPSHOT + 2.5.0-SNAPSHOT - - - - without-test - - - maven.test.skip - true - - - - true - true - - - - without-IT-only - - - skipITs - true - - - - true - true - - - - without-IT-only2 - - - skipTests - true - - - - true - true - - - - - docker - - true - false - false - false - false - - - - - - - ecomp-releases - ONAP Release Repository - https://nexus.onap.org/content/repositories/releases/ - - - ecomp-snapshots - ONAP Snapshot Repository - https://nexus.onap.org/content/repositories/snapshots/ - - - ecomp-site - dav:https://nexus.onap.org/content/sites/site/org/onap/policy/clamp/${project.version} - - - - - - onap-public - onap-public - https://nexus.onap.org/content/repositories/public/ - - true - - - false - - - - ecomp-releases - ONAP Release Repository - https://nexus.onap.org/content/repositories/releases/ - - - ecomp-staging - ONAP Staging Repository - https://nexus.onap.org/content/repositories/staging/ - - - ecomp-snapshots - ONAP Snapshot Repository - https://nexus.onap.org/content/repositories/snapshots/ - - true - - - false - - - - central - http://repo1.maven.org/maven2/ - - - - - onap-public - onap-public - https://nexus.onap.org/content/repositories/public/ - - true - - - false - - - - central - http://repo1.maven.org/maven2/ - - - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - org.apache.camel.springboot - camel-spring-boot-bom - ${camel.version} - pom - import - - - + + common + models + runtime + participant + - com.att.eelf - eelf-core - ${eelf.core.version} - - - org.powermock - powermock-module-junit4 - - - org.powermock - powermock-api-mockito - - - - - org.codehaus.janino - janino - 3.0.8 - - - org.apache.tomcat.embed - tomcat-embed-core - ${tomcat.version} - - - org.apache.tomcat.embed - tomcat-embed-el - ${tomcat.version} - - - org.apache.tomcat.embed - tomcat-embed-websocket - ${tomcat.version} - - - org.apache.tomcat - tomcat-annotations-api - ${tomcat.version} - - - - org.apache.camel.springboot - camel-http-starter - - - org.apache.camel.springboot - camel-spring-boot-starter - - - org.apache.camel.springboot - camel-jaxb-starter - - - org.apache.camel.springboot - camel-servlet-starter - - - org.apache.camel.springboot - camel-gson-starter - - - org.apache.camel.springboot - camel-swagger-java-starter - - - javax.ws.rs - jsr311-api - - - org.slf4j - slf4j-ext - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-json - - - - - org.springframework.boot - spring-boot-starter-tomcat - - - org.glassfish - jakarta.el - - - - - org.springframework - spring-jdbc - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-autoconfigure - - - org.springframework.boot - spring-boot-starter-test - test - - - com.vaadin.external.google - android-json - - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - org.onap.policy.models - policy-models-pdp - ${policy.models.version} - - - org.eclipse.jetty - jetty-server - - - org.glassfish.jersey.containers - jersey-container-servlet - - - org.jetbrains.kotlin - kotlin-reflect - - - org.jetbrains.kotlin - kotlin-stdlib - - - org.jetbrains.kotlin - kotlin-stdlib-common - - - - - - - - javax.xml.ws - jaxws-api - 2.3.1 - - - org.onap.aaf.authz - aaf-cadi-aaf - 2.1.15 - - - javax.servlet - servlet-api - - - log4j - log4j - - - - - ch.qos.logback - logback-core - 1.2.3 - - - ch.qos.logback - logback-classic - 1.2.3 - - - commons-io - commons-io - 2.8.0 - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - org.apache.commons - commons-vfs2 - 2.8.0 - - - com.squareup.okhttp - okhttp - - - - - org.slf4j - slf4j-api - - - javax.transaction - jta - 1.1 - - - javax.persistence - persistence-api - 1.0.2 - - - - commons-codec - commons-codec - 1.15 - - - org.codehaus.plexus - plexus-utils - 3.3.0 - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.0_spec - 1.0.1.Final - - - - - - org.mariadb.jdbc - mariadb-java-client - 2.7.2 - - - - org.onap.sdc.sdc-distribution-client - sdc-distribution-client - 1.4.1 - - - org.onap.sdc.sdc-tosca - sdc-tosca - 1.5.1 - - - com.fasterxml.jackson.core - jackson-databind - - - - - org.yaml - snakeyaml - 1.28 - - - org.dom4j - dom4j - 2.1.3 - - - - - org.junit.vintage - junit-vintage-engine - 5.7.1 - test - - - org.assertj - assertj-core - 3.10.0 - test - - - com.github.docker-java - docker-java-core - 3.2.7 - test - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.github.docker-java - docker-java - 3.2.7 - test - - - org.onap.policy.common - utils-test - ${policy.common.version} + junit + junit test - - - policy-clamp-backend - - - - src/main/resources - true - - clds/aaf/** - - - - src/main/resources - false - - clds/aaf/** - - - - src/test/resources - - **/*.jks - **/*.csar - - true - - - src/test/resources/https - - **.jks - - false - https - - - src/test/resources/example/sdc - - **.csar - - false - example/sdc - - - - - - src/main/resources - true - - clds/aaf/** - - - - src/main/resources - false - - clds/aaf/** - - - - ${ui.react.src} - - node_modules - - - src/** - public/** - package.json - package-lock.json - - true - ${project.build.directory}/${ui.react.src} - - - ${ui.react.src} - - src/** - - - **/__snapshots__/** - **/**.test.js - - true - ${project.build.directory}/${ui.react.lib.src} - - - ${ui.react.lib.src} - - ** - - - node_modules/** - package-lock.json - - true - ${project.build.directory}/${ui.react.lib.src} - - - - - - de.jpdigital - hibernate52-ddl-maven-plugin - 2.2.0 - - - javax.xml.bind - jaxb-api - 2.3.0 - - - - - process-classes - - gen-ddl - - - - org.onap.policy.clamp - - - MARIADB53 - - ${project.basedir}/extra/sql/bulkload/ - create-tables - - true - - - - - - - - io.github.swagger2markup - swagger2markup-maven-plugin - 1.3.3 - - - io.github.swagger2markup - swagger2markup-import-files-ext - 1.3.3 - - - io.github.swagger2markup - swagger2markup-spring-restdocs-ext - 1.3.3 - - - - ${project.basedir}/docs/swagger/swagger.json - ${project.build.directory}/asciidoc/generated - - ASCIIDOC - - - - - post-integration-test - - convertSwagger2markup - - - - - - - - org.asciidoctor - asciidoctor-maven-plugin - 1.5.7.1 - - - org.asciidoctor - asciidoctorj-pdf - 1.5.0-alpha.10.1 - - - - ${project.basedir}/src/main/resources/asciidoc - swagger.adoc - - book - left - 3 - - - - - ${project.build.directory}/asciidoc/generated - - - - - - output-html - post-integration-test - - process-asciidoc - - - html5 - ${project.basedir}/docs/swagger - ${project.basedir}/src/main/resources/META-INF/resources/ - - - - output-pdf - post-integration-test - - process-asciidoc - - - pdf - ${project.basedir}/docs/swagger - - - - - - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - docker-tags - validate - - execute - - - ${project.basedir}/src/main/script/TagVersion.groovy - - - - npm-repos-selection - validate - - execute - - - ${project.basedir}/src/main/script/SelectNpmRepo.groovy - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - jar-with-only-classes - package - - jar - - - classes - - org/** - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - - attach-artifact - - package - - - - ${project.build.directory}/policy-clamp-backend-classes.jar - jar - classes - - - - - - reserve-port-for-tests - process-resources - - reserve-network-port - - - - docker.mariadb.port.host - docker.http-cache.port.host - clamp.it.tests.http-redirected - clamp.it.tests.robotframework.http - clamp.it.tests.https - clamp.it.tests.http - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${springboot.version} - - - - repackage - - package - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - 1C - true - false - ${surefireArgLine} - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.22.2 - - - integration-tests - - integration-test - verify - - - - ${project.build.directory}/classes - - - - **/*ItCase.java - - 1C - true - false - ${failsafeArgLine} - - - - - - io.fabric8 - docker-maven-plugin - 0.35.0 - - - org.apache.httpcomponents - httpclient - 4.5.5 - - - - true - 1.35 - - - docker.io/mariadb:10.5.4 - mariadb - - - strong_pitchou - - mariadb - - - ${project.basedir}/extra/sql/:/docker-entrypoint-initdb.d:rw - ${project.basedir}/extra/docker/mariadb/conf1:/etc/mysql/conf.d - - - - port: 3306 - - - /docker-entrypoint-initdb.d/dump/backup-data-only.sh - - - - ${docker.mariadb.port.host}:3306 - - - bridge - - - - - docker.io/python:2-slim - python - - python - - - - ${project.basedir}/src/test/resources/http-cache/:/usr/src/http-cache-app - - - ${project.basedir}/src/test/resources/http-cache/example/:/usr/src/http-cache-app/data-cache - - - - - - - 8080 - - direct - - - - - ${docker.http-cache.port.host}:8080 - - /usr/src/http-cache-app - - ./start_http_cache.sh ${python.http.proxy.param} - --python_proxyaddress=localhost:${docker.http-cache.port.host} - - - - bridge - - - - - onap/policy-clamp-backend - onap-policy-clamp-backend - - true - - - true - - latest - ${project.docker.latesttagtimestamp.version} - ${project.docker.latesttag.version} - - - backend/Dockerfile - - backend/backend-files.xml - onap-policy-clamp-backend - - - - - onap/policy-clamp-frontend - onap-policy-clamp-frontend - - true - - - true - - latest - ${project.docker.latesttagtimestamp.version} - ${project.docker.latesttag.version} - - - frontend/Dockerfile - - frontend/frontend-files.xml - onap-policy-clamp-frontend - - - - - - - - - generate-images - install - - build - - - - push-images - deploy - - push - - - - docker-start-for-it - pre-integration-test - - start - - - - docker-stop-for-it - post-integration-test - - stop - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.5 - - true - true - - org/onap/policy/clamp/** - - - - - pre-unit-test - - prepare-agent - - - ${project.build.directory}/coverage-reports/jacoco.exec - surefireArgLine - - - - - pre-integration-test - pre-integration-test - - prepare-agent - - - ${project.build.directory}/coverage-reports/jacoco-it.exec - failsafeArgLine - - - false - - - - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco.exec - - - - report-xml - - report - - - - ${project.build.directory}/jacoco.exec - ${project.build.directory}/jacoco-html-xml-reports - - - - - - - - org.codehaus.mojo - versions-maven-plugin - 1.3.1 - - - - com.github.eirslett - frontend-maven-plugin - 1.11.3 - - ${project.build.directory}/${ui.react.src} - ${repo.npm} - - - - install_node_and_npm - - install-node-and-npm - - generate-sources - - v14.16.1 - 6.14.13 - - - - npm_install - - npm - - compile - - ${project.build.directory}/${ui.react.src} - install - - - - npm_test - - npm - - test - - ${maven.test.skip} - run-script test:coverage - ${project.build.directory}/${ui.react.src} - - - - npm_install_lib - - npm - - deploy - - ${project.build.directory}/${ui.react.lib.src} - install - - - - npm_build_lib - - npm - - deploy - - ${project.build.directory}/${ui.react.lib.src} - run build - - - - npm_publish - - npm - - deploy - - ${project.build.directory}/${ui.react.lib.src} - publish - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 11 - 11 - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.7.0.1746 - - - org.codehaus.mojo - exec-maven-plugin - 1.3.2 - - - libIndexCheck - validate - - exec - - - - - bash - - ${project.basedir}/src/main/script/checkLibIndex.sh - - - - - - org.codehaus.mojo - keytool-maven-plugin - 1.5 - - - add-certificate-for-dev - - ${project.build.directory}/classes/clds/aaf/org.onap.clamp.p12 - China in the Spring - clamptest - PKCS12 - RSA - cn=CN, ou=OU, o=O, c=C - 365 - - - generateKeyPair - - generate-resources - - - add-certificate-for-test - - ${project.build.directory}/test-classes/clds/aaf/org.onap.clamp.p12 - China in the Spring - clamptest - PKCS12 - RSA - cn=CN, ou=OU, o=O, c=C - 365 - - - generateKeyPair - - generate-test-resources - - - - - diff --git a/extra/bin-for-dev/start-backend.sh b/runtime/extra/bin-for-dev/start-backend.sh similarity index 100% rename from extra/bin-for-dev/start-backend.sh rename to runtime/extra/bin-for-dev/start-backend.sh diff --git a/extra/bin-for-dev/start-db.sh b/runtime/extra/bin-for-dev/start-db.sh similarity index 100% rename from extra/bin-for-dev/start-db.sh rename to runtime/extra/bin-for-dev/start-db.sh diff --git a/extra/bin-for-dev/start-emulator.sh b/runtime/extra/bin-for-dev/start-emulator.sh similarity index 100% rename from extra/bin-for-dev/start-emulator.sh rename to runtime/extra/bin-for-dev/start-emulator.sh diff --git a/extra/bin-for-dev/start-frontend.sh b/runtime/extra/bin-for-dev/start-frontend.sh similarity index 100% rename from extra/bin-for-dev/start-frontend.sh rename to runtime/extra/bin-for-dev/start-frontend.sh diff --git a/extra/docker/clamp/clamp.env b/runtime/extra/docker/clamp/clamp.env similarity index 100% rename from extra/docker/clamp/clamp.env rename to runtime/extra/docker/clamp/clamp.env diff --git a/extra/docker/clamp/docker-compose.yml b/runtime/extra/docker/clamp/docker-compose.yml similarity index 100% rename from extra/docker/clamp/docker-compose.yml rename to runtime/extra/docker/clamp/docker-compose.yml diff --git a/extra/docker/mariadb/conf1/my.cnf b/runtime/extra/docker/mariadb/conf1/my.cnf similarity index 100% rename from extra/docker/mariadb/conf1/my.cnf rename to runtime/extra/docker/mariadb/conf1/my.cnf diff --git a/extra/docker/mariadb/conf2/my.cnf b/runtime/extra/docker/mariadb/conf2/my.cnf similarity index 100% rename from extra/docker/mariadb/conf2/my.cnf rename to runtime/extra/docker/mariadb/conf2/my.cnf diff --git a/extra/docker/mariadb/conf3/my.cnf b/runtime/extra/docker/mariadb/conf3/my.cnf similarity index 100% rename from extra/docker/mariadb/conf3/my.cnf rename to runtime/extra/docker/mariadb/conf3/my.cnf diff --git a/extra/sql/bootstrap-database.sh b/runtime/extra/sql/bootstrap-database.sh similarity index 100% rename from extra/sql/bootstrap-database.sh rename to runtime/extra/sql/bootstrap-database.sh diff --git a/extra/sql/bulkload/create-db.sql b/runtime/extra/sql/bulkload/create-db.sql similarity index 100% rename from extra/sql/bulkload/create-db.sql rename to runtime/extra/sql/bulkload/create-db.sql diff --git a/extra/sql/bulkload/create-tables.sql b/runtime/extra/sql/bulkload/create-tables.sql similarity index 100% rename from extra/sql/bulkload/create-tables.sql rename to runtime/extra/sql/bulkload/create-tables.sql diff --git a/extra/sql/dump/backup-data-only.sh b/runtime/extra/sql/dump/backup-data-only.sh similarity index 100% rename from extra/sql/dump/backup-data-only.sh rename to runtime/extra/sql/dump/backup-data-only.sh diff --git a/extra/sql/dump/backup-database.sh b/runtime/extra/sql/dump/backup-database.sh similarity index 100% rename from extra/sql/dump/backup-database.sh rename to runtime/extra/sql/dump/backup-database.sh diff --git a/extra/sql/dump/load-fake-data.sh b/runtime/extra/sql/dump/load-fake-data.sh similarity index 100% rename from extra/sql/dump/load-fake-data.sh rename to runtime/extra/sql/dump/load-fake-data.sh diff --git a/extra/sql/dump/test-data.sql b/runtime/extra/sql/dump/test-data.sql similarity index 100% rename from extra/sql/dump/test-data.sql rename to runtime/extra/sql/dump/test-data.sql diff --git a/runtime/pom.xml b/runtime/pom.xml new file mode 100644 index 000000000..66d555ac7 --- /dev/null +++ b/runtime/pom.xml @@ -0,0 +1,1250 @@ + + + + 4.0.0 + + + org.onap.policy.clamp + policy-clamp + 6.1.2-SNAPSHOT + + + policy-clamp-runtime + ${project.artifactId} + + + This is the MAVEN project that builds everything for ONAP POLICY-CLAMP. + Docker engine is normally required to perfom all possible tasks (including integration tests) + + It can build: + - The ONAP POLICY-CLAMP JAR that contains CLAMP back-end code. + - The DOCKER images for: + * POLICY-CLAMP backend (Java Spring) + * POLICY-CLAMP frontend (Javascript React) + + It can test: + - The POLICY-CLAMP backend, JAVA unit testing + - The POLICY-CLAMP backend, JAVA integration tests (with Spring + docker mariadb database + docker policy/dcae + emulator written in python) + - The POLICY-CLAMP frontend, Javascript tests (NodeJS(NPM) + JEST and Enzyme for React) + + The test coverage for dev's can be found after a "clean install" build in: + - Clamp backend: target/jacoco-dev.exec (unit tests + integration tests merged) + or separately target/coverage-reports/jacoco.exec and target/coverage-reports/jacoco-it.exec + - Clamp frontend: target/ui-react/coverage + + Useful mvn commands: + - mvn clean install: Build Clamp backend JAR + unit tests + integration tests + NPM tests (+coverage for all) + - mvn clean install -DskipITs=true: Build Clamp backend JAR + unit tests + NPM tests (+coverage for all), it + does not require a DOCKER engine + - mvn clean install -DskipTests -P docker: Build Clamp backend JAR + all docker images + + To start POLICY-CLAMP (Build it before): + - Use docker-compose file in ./extra/docker/clamp/docker-compose.yml + - Use the script located in ./extra/bin/start-backend.sh + start-frontend.sh + - Use your IDE to use the Jar or start NVM/NPM + + + + + yyyyMMdd'T'HHmmss'Z' + ${project.version} + ${maven.build.timestamp} + UTF-8 + UTF-8 + + 1.0.0 + 3.7.3 + 2.4.4 + + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/jacoco-html-xml-reports/jacoco.xml + + ${project.version} + DEBUG + ${project.build.directory}/${ui.react.src}/node/node + true + src/main,${project.build.directory}/${ui.react.src}/src + src/main/resources/** + true + ${project.build.directory}/${ui.react.src}/coverage/lcov.info + + + src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js + + localhost:5000 + nexus3.onap.org:10001 + true + true + true + false + + 9.0.45 + ui-react + ui-react-lib + https://nexus3.onap.org/repository/npm.snapshot/ + + + + + + without-test + + + maven.test.skip + true + + + + true + true + + + + without-IT-only + + + skipITs + true + + + + true + true + + + + without-IT-only2 + + + skipTests + true + + + + true + true + + + + + docker + + true + false + false + false + false + + + + + + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + org.apache.camel.springboot + camel-spring-boot-bom + ${camel.version} + pom + import + + + + + + + com.att.eelf + eelf-core + ${eelf.core.version} + + + org.powermock + powermock-module-junit4 + + + org.powermock + powermock-api-mockito + + + + + org.codehaus.janino + janino + 3.0.8 + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat.version} + + + org.apache.tomcat.embed + tomcat-embed-el + ${tomcat.version} + + + org.apache.tomcat.embed + tomcat-embed-websocket + ${tomcat.version} + + + org.apache.tomcat + tomcat-annotations-api + ${tomcat.version} + + + + org.apache.camel.springboot + camel-http-starter + + + org.apache.camel.springboot + camel-spring-boot-starter + + + org.apache.camel.springboot + camel-jaxb-starter + + + org.apache.camel.springboot + camel-servlet-starter + + + org.apache.camel.springboot + camel-gson-starter + + + org.apache.camel.springboot + camel-swagger-java-starter + + + javax.ws.rs + jsr311-api + + + org.slf4j + slf4j-ext + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-json + + + + + org.springframework.boot + spring-boot-starter-tomcat + + + org.glassfish + jakarta.el + + + + + org.springframework + spring-jdbc + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-autoconfigure + + + org.springframework.boot + spring-boot-starter-test + test + + + com.vaadin.external.google + android-json + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.onap.policy.models + policy-models-pdp + ${policy.models.version} + + + org.eclipse.jetty + jetty-server + + + org.glassfish.jersey.containers + jersey-container-servlet + + + org.jetbrains.kotlin + kotlin-reflect + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + + + + + + javax.xml.ws + jaxws-api + 2.3.1 + + + org.onap.aaf.authz + aaf-cadi-aaf + 2.1.15 + + + javax.servlet + servlet-api + + + log4j + log4j + + + + + ch.qos.logback + logback-core + 1.2.3 + + + ch.qos.logback + logback-classic + 1.2.3 + + + commons-io + commons-io + 2.8.0 + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + org.apache.commons + commons-vfs2 + 2.8.0 + + + com.squareup.okhttp + okhttp + + + + + org.slf4j + slf4j-api + + + javax.transaction + jta + 1.1 + + + javax.persistence + persistence-api + 1.0.2 + + + + commons-codec + commons-codec + 1.15 + + + org.codehaus.plexus + plexus-utils + 3.3.0 + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.0_spec + 1.0.1.Final + + + + + + org.mariadb.jdbc + mariadb-java-client + 2.7.2 + + + + org.onap.sdc.sdc-distribution-client + sdc-distribution-client + 1.4.1 + + + org.onap.sdc.sdc-tosca + sdc-tosca + 1.5.1 + + + com.fasterxml.jackson.core + jackson-databind + + + + + org.yaml + snakeyaml + 1.28 + + + org.dom4j + dom4j + 2.1.3 + + + + + org.junit.vintage + junit-vintage-engine + 5.7.1 + test + + + org.assertj + assertj-core + 3.10.0 + test + + + com.github.docker-java + docker-java-core + 3.2.7 + test + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.github.docker-java + docker-java + 3.2.7 + test + + + org.onap.policy.common + utils-test + ${policy.common.version} + test + + + + + policy-clamp-backend + + + + src/main/resources + true + + clds/aaf/** + + + + src/main/resources + false + + clds/aaf/** + + + + src/test/resources + + **/*.jks + **/*.csar + + true + + + src/test/resources/https + + **.jks + + false + https + + + src/test/resources/example/sdc + + **.csar + + false + example/sdc + + + + + + src/main/resources + true + + clds/aaf/** + + + + src/main/resources + false + + clds/aaf/** + + + + ${ui.react.src} + + node_modules + + + src/** + public/** + package.json + package-lock.json + + true + ${project.build.directory}/${ui.react.src} + + + ${ui.react.src} + + src/** + + + **/__snapshots__/** + **/**.test.js + + true + ${project.build.directory}/${ui.react.lib.src} + + + ${ui.react.lib.src} + + ** + + + node_modules/** + package-lock.json + + true + ${project.build.directory}/${ui.react.lib.src} + + + + + + de.jpdigital + hibernate52-ddl-maven-plugin + 2.2.0 + + + javax.xml.bind + jaxb-api + 2.3.0 + + + + + process-classes + + gen-ddl + + + + org.onap.policy.clamp + + + MARIADB53 + + ${project.basedir}/extra/sql/bulkload/ + create-tables + + true + + + + + + + + io.github.swagger2markup + swagger2markup-maven-plugin + 1.3.3 + + + io.github.swagger2markup + swagger2markup-import-files-ext + 1.3.3 + + + io.github.swagger2markup + swagger2markup-spring-restdocs-ext + 1.3.3 + + + + ${project.basedir}/docs/swagger/swagger.json + ${project.build.directory}/asciidoc/generated + + ASCIIDOC + + + + + post-integration-test + + convertSwagger2markup + + + + + + + + org.asciidoctor + asciidoctor-maven-plugin + 1.5.7.1 + + + org.asciidoctor + asciidoctorj-pdf + 1.5.0-alpha.10.1 + + + + ${project.basedir}/src/main/resources/asciidoc + swagger.adoc + + book + left + 3 + + + + + ${project.build.directory}/asciidoc/generated + + + + + + output-html + post-integration-test + + process-asciidoc + + + html5 + ${project.basedir}/docs/swagger + ${project.basedir}/src/main/resources/META-INF/resources/ + + + + output-pdf + post-integration-test + + process-asciidoc + + + pdf + ${project.basedir}/docs/swagger + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + docker-tags + validate + + execute + + + ${project.basedir}/src/main/script/TagVersion.groovy + + + + npm-repos-selection + validate + + execute + + + ${project.basedir}/src/main/script/SelectNpmRepo.groovy + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + jar-with-only-classes + package + + jar + + + classes + + org/** + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + + attach-artifact + + package + + + + ${project.build.directory}/policy-clamp-backend-classes.jar + jar + classes + + + + + + reserve-port-for-tests + process-resources + + reserve-network-port + + + + docker.mariadb.port.host + docker.http-cache.port.host + clamp.it.tests.http-redirected + clamp.it.tests.robotframework.http + clamp.it.tests.https + clamp.it.tests.http + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + + + repackage + + package + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + 1C + true + false + ${surefireArgLine} + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.22.2 + + + integration-tests + + integration-test + verify + + + + ${project.build.directory}/classes + + + + **/*ItCase.java + + 1C + true + false + ${failsafeArgLine} + + + + + + io.fabric8 + docker-maven-plugin + 0.35.0 + + + org.apache.httpcomponents + httpclient + 4.5.5 + + + + true + 1.35 + + + docker.io/mariadb:10.5.4 + mariadb + + + strong_pitchou + + mariadb + + + ${project.basedir}/extra/sql/:/docker-entrypoint-initdb.d:rw + ${project.basedir}/extra/docker/mariadb/conf1:/etc/mysql/conf.d + + + + port: 3306 + + + /docker-entrypoint-initdb.d/dump/backup-data-only.sh + + + + ${docker.mariadb.port.host}:3306 + + + bridge + + + + + docker.io/python:2-slim + python + + python + + + + ${project.basedir}/src/test/resources/http-cache/:/usr/src/http-cache-app + + + ${project.basedir}/src/test/resources/http-cache/example/:/usr/src/http-cache-app/data-cache + + + + + + + 8080 + + direct + + + + + ${docker.http-cache.port.host}:8080 + + /usr/src/http-cache-app + + ./start_http_cache.sh ${python.http.proxy.param} + --python_proxyaddress=localhost:${docker.http-cache.port.host} + + + + bridge + + + + + onap/policy-clamp-backend + onap-policy-clamp-backend + + true + + + true + + latest + ${project.docker.latesttagtimestamp.version} + ${project.docker.latesttag.version} + + + backend/Dockerfile + + backend/backend-files.xml + onap-policy-clamp-backend + + + + + onap/policy-clamp-frontend + onap-policy-clamp-frontend + + true + + + true + + latest + ${project.docker.latesttagtimestamp.version} + ${project.docker.latesttag.version} + + + frontend/Dockerfile + + frontend/frontend-files.xml + onap-policy-clamp-frontend + + + + + + + + + generate-images + install + + build + + + + push-images + deploy + + push + + + + docker-start-for-it + pre-integration-test + + start + + + + docker-stop-for-it + post-integration-test + + stop + + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.5 + + true + true + + org/onap/policy/clamp/** + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + surefireArgLine + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + failsafeArgLine + + + false + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco.exec + + + + report-xml + + report + + + + ${project.build.directory}/jacoco.exec + ${project.build.directory}/jacoco-html-xml-reports + + + + + + + + org.codehaus.mojo + versions-maven-plugin + 1.3.1 + + + + com.github.eirslett + frontend-maven-plugin + 1.11.3 + + ${project.build.directory}/${ui.react.src} + ${repo.npm} + + + + install_node_and_npm + + install-node-and-npm + + generate-sources + + v14.16.1 + 6.14.13 + + + + npm_install + + npm + + compile + + ${project.build.directory}/${ui.react.src} + install + + + + npm_test + + npm + + test + + ${maven.test.skip} + run-script test:coverage + ${project.build.directory}/${ui.react.src} + + + + npm_install_lib + + npm + + deploy + + ${project.build.directory}/${ui.react.lib.src} + install + + + + npm_build_lib + + npm + + deploy + + ${project.build.directory}/${ui.react.lib.src} + run build + + + + npm_publish + + npm + + deploy + + ${project.build.directory}/${ui.react.lib.src} + publish + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 11 + 11 + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.7.0.1746 + + + org.codehaus.mojo + exec-maven-plugin + 1.3.2 + + + libIndexCheck + validate + + exec + + + + + bash + + ${project.basedir}/src/main/script/checkLibIndex.sh + + + + + + org.codehaus.mojo + keytool-maven-plugin + 1.5 + + + add-certificate-for-dev + + ${project.build.directory}/classes/clds/aaf/org.onap.clamp.p12 + China in the Spring + clamptest + PKCS12 + RSA + cn=CN, ou=OU, o=O, c=C + 365 + + + generateKeyPair + + generate-resources + + + add-certificate-for-test + + ${project.build.directory}/test-classes/clds/aaf/org.onap.clamp.p12 + China in the Spring + clamptest + PKCS12 + RSA + cn=CN, ou=OU, o=O, c=C + 365 + + + generateKeyPair + + generate-test-resources + + + + + + diff --git a/runtime/runtime/src/main/resources/META-INF/resources/swagger.html b/runtime/runtime/src/main/resources/META-INF/resources/swagger.html new file mode 100644 index 000000000..b6f49a78f --- /dev/null +++ b/runtime/runtime/src/main/resources/META-INF/resources/swagger.html @@ -0,0 +1,454 @@ + + + + + + + +Untitled + + + + + +
+
+
+
+

Unresolved directive in swagger.adoc - include::~\clamp\runtime\target/asciidoc/generated/overview.adoc[]
+Unresolved directive in swagger.adoc - include::~\clamp\runtime\target/asciidoc/generated/paths.adoc[]
+Unresolved directive in swagger.adoc - include::~\clamp\runtime\target/asciidoc/generated/security.adoc[]
+Unresolved directive in swagger.adoc - include::~\clamp\runtime\target/asciidoc/generated/definitions.adoc[]

+
+
+
+
+ + + diff --git a/src/main/docker/backend/Dockerfile b/runtime/src/main/docker/backend/Dockerfile similarity index 97% rename from src/main/docker/backend/Dockerfile rename to runtime/src/main/docker/backend/Dockerfile index 7b6687b9e..bb964158e 100644 --- a/src/main/docker/backend/Dockerfile +++ b/runtime/src/main/docker/backend/Dockerfile @@ -50,3 +50,4 @@ RUN set -x && \ USER onap WORKDIR /opt/policy/clamp/ ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50.0", "-XX:MaxRAMPercentage=75.0","-jar" ,"./policy-clamp-backend.jar"] + diff --git a/src/main/docker/backend/backend-files.xml b/runtime/src/main/docker/backend/backend-files.xml similarity index 100% rename from src/main/docker/backend/backend-files.xml rename to runtime/src/main/docker/backend/backend-files.xml diff --git a/src/main/docker/frontend/Dockerfile b/runtime/src/main/docker/frontend/Dockerfile similarity index 95% rename from src/main/docker/frontend/Dockerfile rename to runtime/src/main/docker/frontend/Dockerfile index e67495350..1d64d2a2d 100644 --- a/src/main/docker/frontend/Dockerfile +++ b/runtime/src/main/docker/frontend/Dockerfile @@ -1,70 +1,71 @@ -### -# ============LICENSE_START======================================================= -# ONAP CLAMP -# ================================================================================ -# Copyright (C) 2019 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============================================ -# =================================================================== -# -### - -# build environment -FROM node:12.10.0-alpine as build -WORKDIR /app -#ENV PATH /app/node_modules/.bin:$PATH -COPY onap-policy-clamp-frontend/ /app/ -RUN npm install --silent && \ - npm run build - -FROM nginx:1.17.0-alpine - -MAINTAINER "The Onap Team" -LABEL Description="This image contains Clamp frontend" - -ARG http_proxy -ARG https_proxy -ENV HTTP_PROXY=$http_proxy -ENV HTTPS_PROXY=$https_proxy -ENV http_proxy=$HTTP_PROXY -ENV https_proxy=$HTTPS_PROXY - -RUN addgroup onap && \ - adduser -D -G onap clamp && \ - mkdir /var/log/onap && \ - chmod a+rwx /var/log/onap - -COPY --from=build /app/build /usr/share/nginx/html -COPY --from=build /app/ssl /etc/ssl - -RUN rm /etc/nginx/conf.d/default.conf && \ - ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log - -COPY nginx/nginx.conf /etc/nginx/nginx.conf -COPY nginx/default.conf /etc/nginx/conf.d/default.conf - -WORKDIR /app - -RUN chown -R clamp:onap /app && chmod -R 755 /app && \ - chown -R clamp:onap /var/cache/nginx && \ - chown -R clamp:onap /var/log/nginx && \ - chown -R clamp:onap /etc/nginx/conf.d && \ - touch /var/run/nginx.pid && \ - chown -R clamp:onap /var/run/nginx.pid - -USER clamp -EXPOSE 2443 -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +### +# ============LICENSE_START======================================================= +# ONAP CLAMP +# ================================================================================ +# Copyright (C) 2019 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============================================ +# =================================================================== +# +### + +# build environment +FROM node:12.10.0-alpine as build +WORKDIR /app +#ENV PATH /app/node_modules/.bin:$PATH +COPY onap-policy-clamp-frontend/ /app/ +RUN npm install --silent && \ + npm run build + +FROM nginx:1.17.0-alpine + +MAINTAINER "The Onap Team" +LABEL Description="This image contains Clamp frontend" + +ARG http_proxy +ARG https_proxy +ENV HTTP_PROXY=$http_proxy +ENV HTTPS_PROXY=$https_proxy +ENV http_proxy=$HTTP_PROXY +ENV https_proxy=$HTTPS_PROXY + +RUN addgroup onap && \ + adduser -D -G onap clamp && \ + mkdir /var/log/onap && \ + chmod a+rwx /var/log/onap + +COPY --from=build /app/build /usr/share/nginx/html +COPY --from=build /app/ssl /etc/ssl + +RUN rm /etc/nginx/conf.d/default.conf && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log + +COPY nginx/nginx.conf /etc/nginx/nginx.conf +COPY nginx/default.conf /etc/nginx/conf.d/default.conf + +WORKDIR /app + +RUN chown -R clamp:onap /app && chmod -R 755 /app && \ + chown -R clamp:onap /var/cache/nginx && \ + chown -R clamp:onap /var/log/nginx && \ + chown -R clamp:onap /etc/nginx/conf.d && \ + touch /var/run/nginx.pid && \ + chown -R clamp:onap /var/run/nginx.pid + +USER clamp +EXPOSE 2443 +CMD ["nginx", "-g", "daemon off;"] + diff --git a/src/main/docker/frontend/frontend-files.xml b/runtime/src/main/docker/frontend/frontend-files.xml similarity index 100% rename from src/main/docker/frontend/frontend-files.xml rename to runtime/src/main/docker/frontend/frontend-files.xml diff --git a/src/main/docker/frontend/nginx/default.conf b/runtime/src/main/docker/frontend/nginx/default.conf similarity index 100% rename from src/main/docker/frontend/nginx/default.conf rename to runtime/src/main/docker/frontend/nginx/default.conf diff --git a/src/main/docker/frontend/nginx/nginx.conf b/runtime/src/main/docker/frontend/nginx/nginx.conf similarity index 100% rename from src/main/docker/frontend/nginx/nginx.conf rename to runtime/src/main/docker/frontend/nginx/nginx.conf diff --git a/src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java b/runtime/src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java rename to runtime/src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java diff --git a/src/main/java/org/onap/policy/clamp/authorization/CldsUser.java b/runtime/src/main/java/org/onap/policy/clamp/authorization/CldsUser.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/authorization/CldsUser.java rename to runtime/src/main/java/org/onap/policy/clamp/authorization/CldsUser.java diff --git a/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java b/runtime/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java rename to runtime/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java diff --git a/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java b/runtime/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java rename to runtime/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java diff --git a/src/main/java/org/onap/policy/clamp/authorization/UserService.java b/runtime/src/main/java/org/onap/policy/clamp/authorization/UserService.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/authorization/UserService.java rename to runtime/src/main/java/org/onap/policy/clamp/authorization/UserService.java diff --git a/src/main/java/org/onap/policy/clamp/clds/Application.java b/runtime/src/main/java/org/onap/policy/clamp/clds/Application.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/Application.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/Application.java diff --git a/src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java b/runtime/src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java diff --git a/src/main/java/org/onap/policy/clamp/clds/ClampServlet.java b/runtime/src/main/java/org/onap/policy/clamp/clds/ClampServlet.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/ClampServlet.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/ClampServlet.java diff --git a/src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java b/runtime/src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java diff --git a/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java b/runtime/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java similarity index 97% rename from src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java index 80ff9f774..cb74ad9e4 100644 --- a/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java +++ b/runtime/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java @@ -1,229 +1,229 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP POLICY-CLAMP - * ================================================================================ - * Copyright (C) 2020 Huawei Technologies Co., Ltd. - * ================================================================================ - * Modifications Copyright (C) 2021 AT&T. - * ================================================================================ - * 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========================================================= - * ================================================================================ - * - */ - -package org.onap.policy.clamp.clds.client; - -import static java.lang.Boolean.parseBoolean; - -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import java.io.IOException; -import java.util.Date; -import java.util.Map; -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.builder.ExchangeBuilder; -import org.onap.policy.clamp.clds.exception.cds.CdsParametersException; -import org.onap.policy.clamp.clds.model.cds.CdsBpWorkFlowListResponse; -import org.onap.policy.clamp.clds.util.JsonUtils; -import org.onap.policy.clamp.clds.util.LoggingUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Component; - -/** - * This class implements the communication with CDS for the service inventory. - */ -@Component -public class CdsServices { - - @Autowired - CamelContext camelContext; - - protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CdsServices.class); - - private static final String TYPE = "type"; - private static final String PROPERTIES = "properties"; - private static final String LIST = "list"; - - /** - * Query CDS to get blueprint's workflow list. - * - * @param blueprintName CDS blueprint name - * @param blueprintVersion CDS blueprint version - * @return CdsBpWorkFlowListResponse CDS blueprint's workflow list - */ - public CdsBpWorkFlowListResponse getBlueprintWorkflowList(String blueprintName, String blueprintVersion) { - LoggingUtils.setTargetContext("CDS", "getBlueprintWorkflowList"); - - try (ProducerTemplate producerTemplate = camelContext.createProducerTemplate()) { - Exchange exchangeResponse = - producerTemplate.send("direct:get-blueprint-workflow-list", ExchangeBuilder.anExchange(camelContext) - .withProperty("blueprintName", blueprintName) - .withProperty("blueprintVersion", blueprintVersion) - .withProperty("raiseHttpExceptionFlag", false).build()); - - if (HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE)) - .is2xxSuccessful()) { - String cdsResponse = (String) exchangeResponse.getIn().getBody(); - logger.info("getBlueprintWorkflowList, response from CDS:" + cdsResponse); - LoggingUtils.setResponseContext("0", "Get Blueprint workflow list", this.getClass().getName()); - Date startTime = new Date(); - LoggingUtils.setTimeContext(startTime, new Date()); - return JsonUtils.GSON_JPA_MODEL.fromJson(cdsResponse, CdsBpWorkFlowListResponse.class); - } else { - logger.error("CDS getBlueprintWorkflowList FAILED"); - } - } catch (IOException e) { - logger.error("IOException caught when trying to execute get-blueprint-workflow-list flow", e); - } - return null; - } - - /** - * Query CDS to get input properties of workflow. - * - * @param blueprintName CDS blueprint name - * @param blueprintVersion CDS blueprint name - * @param workflow CDS blueprint's workflow - * @return input properties in json format - */ - public JsonObject getWorkflowInputProperties(String blueprintName, String blueprintVersion, - String workflow) { - LoggingUtils.setTargetContext("CDS", "getWorkflowInputProperties"); - - try (ProducerTemplate producerTemplate = camelContext.createProducerTemplate()) { - Exchange exchangeResponse = producerTemplate - .send("direct:get-blueprint-workflow-input-properties", ExchangeBuilder.anExchange(camelContext) - .withBody(getCdsPayloadForWorkFlow(blueprintName, blueprintVersion, workflow)) - .withProperty("raiseHttpExceptionFlag", false).build()); - if (HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE)) - .is2xxSuccessful()) { - String cdsResponse = (String) exchangeResponse.getIn().getBody(); - logger.info("getWorkflowInputProperties, response from CDS:" + cdsResponse); - LoggingUtils - .setResponseContext("0", "Get Blueprint workflow input properties", this.getClass().getName()); - Date startTime = new Date(); - LoggingUtils.setTimeContext(startTime, new Date()); - return parseCdsResponse(cdsResponse); - } else { - logger.error("CDS getWorkflowInputProperties FAILED"); - } - } catch (IOException e) { - logger.error("IOException caught when trying to execute get-blueprint-workflow-input-properties flow", e); - } - return null; - } - - protected JsonObject parseCdsResponse(String response) { - JsonObject root = JsonParser.parseString(response).getAsJsonObject(); - JsonObject inputs = root.getAsJsonObject("workFlowData").getAsJsonObject("inputs"); - JsonObject dataTypes = root.getAsJsonObject("dataTypes"); - - JsonObject workFlowProperties = new JsonObject(); - workFlowProperties.add("inputs", getInputProperties(inputs, dataTypes, new JsonObject())); - return workFlowProperties; - } - - private JsonObject getInputProperties(JsonObject inputs, JsonObject dataTypes, JsonObject inputObject) { - if (inputs == null) { - return inputObject; - } - - for (Map.Entry entry : inputs.entrySet()) { - String key = entry.getKey(); - JsonObject inputProperty = inputs.getAsJsonObject(key); - String type = inputProperty.get(TYPE).getAsString(); - if (isComplexType(type, dataTypes)) { - inputObject.add(key, handleComplexType(type, dataTypes)); - } else if (LIST.equalsIgnoreCase(type)) { - handleListType(key, inputProperty, dataTypes, inputObject); - } else if (isInputParam(inputProperty)) { - inputObject.add(key, entry.getValue()); - } - } - return inputObject; - } - - private void handleListType(String propertyName, - JsonObject inputProperty, - JsonObject dataTypes, - JsonObject inputObject) { - if (inputProperty.get("entry_schema") == null) { - throw new CdsParametersException("Entry schema is null for " + propertyName); - } - - String type = inputProperty.get("entry_schema").getAsJsonObject().get( - TYPE).getAsString(); - if (dataTypes != null && dataTypes.get(type) != null) { - JsonObject jsonObject = new JsonObject(); - jsonObject.addProperty(TYPE, LIST); - jsonObject.add(PROPERTIES, getPropertiesObject(type, dataTypes)); - inputObject.add(propertyName, jsonObject); - } else if (isInputParam(inputProperty)) { - inputObject.add(propertyName, inputProperty); - } - } - - private JsonObject handleComplexType(String key, JsonObject dataTypes) { - JsonObject jsonObject = new JsonObject(); - jsonObject.addProperty(TYPE, "object"); - jsonObject.add(PROPERTIES, getPropertiesObject(key, dataTypes)); - return jsonObject; - } - - private JsonObject getPropertiesObject(String key, JsonObject dataTypes) { - JsonObject properties = dataTypes.get(key).getAsJsonObject().get(PROPERTIES).getAsJsonObject(); - JsonObject object = new JsonObject(); - getInputProperties(properties, dataTypes, object); - return object; - } - - private boolean isComplexType(String type, JsonObject dataTypes) { - if (dataTypes == null) { - return false; - } - return dataTypes.get(type) != null; - } - - private boolean isInputParam(JsonObject inputProperty) { - JsonElement inputParam = inputProperty.get("input-param"); - if (inputParam == null) { - return false; - } - return parseBoolean(inputParam.getAsString()); - } - - /** - * Creates payload to query CDS to get workflow input properties. - * - * @param blueprintName CDS blueprint name - * @param version CDS blueprint version - * @param workflow CDS blueprint workflow - * @return returns payload in json format - */ - public String getCdsPayloadForWorkFlow(String blueprintName, String version, String workflow) { - JsonObject jsonObject = new JsonObject(); - jsonObject.addProperty("blueprintName", blueprintName); - jsonObject.addProperty("version", version); - jsonObject.addProperty("returnContent", "json"); - jsonObject.addProperty("workflowName", workflow); - jsonObject.addProperty("specType", "TOSCA"); - return jsonObject.toString(); - } -} +/*- + * ============LICENSE_START======================================================= + * ONAP POLICY-CLAMP + * ================================================================================ + * Copyright (C) 2020 Huawei Technologies Co., Ltd. + * ================================================================================ + * Modifications Copyright (C) 2021 AT&T. + * ================================================================================ + * 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========================================================= + * ================================================================================ + * + */ + +package org.onap.policy.clamp.clds.client; + +import static java.lang.Boolean.parseBoolean; + +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import java.io.IOException; +import java.util.Date; +import java.util.Map; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.ProducerTemplate; +import org.apache.camel.builder.ExchangeBuilder; +import org.onap.policy.clamp.clds.exception.cds.CdsParametersException; +import org.onap.policy.clamp.clds.model.cds.CdsBpWorkFlowListResponse; +import org.onap.policy.clamp.clds.util.JsonUtils; +import org.onap.policy.clamp.clds.util.LoggingUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Component; + +/** + * This class implements the communication with CDS for the service inventory. + */ +@Component +public class CdsServices { + + @Autowired + CamelContext camelContext; + + protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CdsServices.class); + + private static final String TYPE = "type"; + private static final String PROPERTIES = "properties"; + private static final String LIST = "list"; + + /** + * Query CDS to get blueprint's workflow list. + * + * @param blueprintName CDS blueprint name + * @param blueprintVersion CDS blueprint version + * @return CdsBpWorkFlowListResponse CDS blueprint's workflow list + */ + public CdsBpWorkFlowListResponse getBlueprintWorkflowList(String blueprintName, String blueprintVersion) { + LoggingUtils.setTargetContext("CDS", "getBlueprintWorkflowList"); + + try (ProducerTemplate producerTemplate = camelContext.createProducerTemplate()) { + Exchange exchangeResponse = + producerTemplate.send("direct:get-blueprint-workflow-list", ExchangeBuilder.anExchange(camelContext) + .withProperty("blueprintName", blueprintName) + .withProperty("blueprintVersion", blueprintVersion) + .withProperty("raiseHttpExceptionFlag", false).build()); + + if (HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE)) + .is2xxSuccessful()) { + String cdsResponse = (String) exchangeResponse.getIn().getBody(); + logger.info("getBlueprintWorkflowList, response from CDS:" + cdsResponse); + LoggingUtils.setResponseContext("0", "Get Blueprint workflow list", this.getClass().getName()); + Date startTime = new Date(); + LoggingUtils.setTimeContext(startTime, new Date()); + return JsonUtils.GSON_JPA_MODEL.fromJson(cdsResponse, CdsBpWorkFlowListResponse.class); + } else { + logger.error("CDS getBlueprintWorkflowList FAILED"); + } + } catch (IOException e) { + logger.error("IOException caught when trying to execute get-blueprint-workflow-list flow", e); + } + return null; + } + + /** + * Query CDS to get input properties of workflow. + * + * @param blueprintName CDS blueprint name + * @param blueprintVersion CDS blueprint name + * @param workflow CDS blueprint's workflow + * @return input properties in json format + */ + public JsonObject getWorkflowInputProperties(String blueprintName, String blueprintVersion, + String workflow) { + LoggingUtils.setTargetContext("CDS", "getWorkflowInputProperties"); + + try (ProducerTemplate producerTemplate = camelContext.createProducerTemplate()) { + Exchange exchangeResponse = producerTemplate + .send("direct:get-blueprint-workflow-input-properties", ExchangeBuilder.anExchange(camelContext) + .withBody(getCdsPayloadForWorkFlow(blueprintName, blueprintVersion, workflow)) + .withProperty("raiseHttpExceptionFlag", false).build()); + if (HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE)) + .is2xxSuccessful()) { + String cdsResponse = (String) exchangeResponse.getIn().getBody(); + logger.info("getWorkflowInputProperties, response from CDS:" + cdsResponse); + LoggingUtils + .setResponseContext("0", "Get Blueprint workflow input properties", this.getClass().getName()); + Date startTime = new Date(); + LoggingUtils.setTimeContext(startTime, new Date()); + return parseCdsResponse(cdsResponse); + } else { + logger.error("CDS getWorkflowInputProperties FAILED"); + } + } catch (IOException e) { + logger.error("IOException caught when trying to execute get-blueprint-workflow-input-properties flow", e); + } + return null; + } + + protected JsonObject parseCdsResponse(String response) { + JsonObject root = JsonParser.parseString(response).getAsJsonObject(); + JsonObject inputs = root.getAsJsonObject("workFlowData").getAsJsonObject("inputs"); + JsonObject dataTypes = root.getAsJsonObject("dataTypes"); + + JsonObject workFlowProperties = new JsonObject(); + workFlowProperties.add("inputs", getInputProperties(inputs, dataTypes, new JsonObject())); + return workFlowProperties; + } + + private JsonObject getInputProperties(JsonObject inputs, JsonObject dataTypes, JsonObject inputObject) { + if (inputs == null) { + return inputObject; + } + + for (Map.Entry entry : inputs.entrySet()) { + String key = entry.getKey(); + JsonObject inputProperty = inputs.getAsJsonObject(key); + String type = inputProperty.get(TYPE).getAsString(); + if (isComplexType(type, dataTypes)) { + inputObject.add(key, handleComplexType(type, dataTypes)); + } else if (LIST.equalsIgnoreCase(type)) { + handleListType(key, inputProperty, dataTypes, inputObject); + } else if (isInputParam(inputProperty)) { + inputObject.add(key, entry.getValue()); + } + } + return inputObject; + } + + private void handleListType(String propertyName, + JsonObject inputProperty, + JsonObject dataTypes, + JsonObject inputObject) { + if (inputProperty.get("entry_schema") == null) { + throw new CdsParametersException("Entry schema is null for " + propertyName); + } + + String type = inputProperty.get("entry_schema").getAsJsonObject().get( + TYPE).getAsString(); + if (dataTypes != null && dataTypes.get(type) != null) { + JsonObject jsonObject = new JsonObject(); + jsonObject.addProperty(TYPE, LIST); + jsonObject.add(PROPERTIES, getPropertiesObject(type, dataTypes)); + inputObject.add(propertyName, jsonObject); + } else if (isInputParam(inputProperty)) { + inputObject.add(propertyName, inputProperty); + } + } + + private JsonObject handleComplexType(String key, JsonObject dataTypes) { + JsonObject jsonObject = new JsonObject(); + jsonObject.addProperty(TYPE, "object"); + jsonObject.add(PROPERTIES, getPropertiesObject(key, dataTypes)); + return jsonObject; + } + + private JsonObject getPropertiesObject(String key, JsonObject dataTypes) { + JsonObject properties = dataTypes.get(key).getAsJsonObject().get(PROPERTIES).getAsJsonObject(); + JsonObject object = new JsonObject(); + getInputProperties(properties, dataTypes, object); + return object; + } + + private boolean isComplexType(String type, JsonObject dataTypes) { + if (dataTypes == null) { + return false; + } + return dataTypes.get(type) != null; + } + + private boolean isInputParam(JsonObject inputProperty) { + JsonElement inputParam = inputProperty.get("input-param"); + if (inputParam == null) { + return false; + } + return parseBoolean(inputParam.getAsString()); + } + + /** + * Creates payload to query CDS to get workflow input properties. + * + * @param blueprintName CDS blueprint name + * @param version CDS blueprint version + * @param workflow CDS blueprint workflow + * @return returns payload in json format + */ + public String getCdsPayloadForWorkFlow(String blueprintName, String version, String workflow) { + JsonObject jsonObject = new JsonObject(); + jsonObject.addProperty("blueprintName", blueprintName); + jsonObject.addProperty("version", version); + jsonObject.addProperty("returnContent", "json"); + jsonObject.addProperty("workflowName", workflow); + jsonObject.addProperty("specType", "TOSCA"); + return jsonObject.toString(); + } +} diff --git a/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java b/runtime/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java similarity index 98% rename from src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java index 98eeae220..843107040 100644 --- a/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java +++ b/runtime/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java @@ -1,144 +1,144 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP POLICY-CLAMP - * ================================================================================ - * Copyright (C) 2017-2018, 2021 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============================================ - * Modifications copyright (c) 2018 Nokia - * =================================================================== - * - */ - -package org.onap.policy.clamp.clds.client; - -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; -import java.io.IOException; -import java.util.Date; -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.builder.ExchangeBuilder; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; -import org.onap.policy.clamp.clds.config.ClampProperties; -import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse; -import org.onap.policy.clamp.clds.util.JsonUtils; -import org.onap.policy.clamp.clds.util.LoggingUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Component; - -/** - * This class implements the communication with DCAE for the service inventory. - */ -@Component -public class DcaeInventoryServices { - - @Autowired - CamelContext camelContext; - - protected static final EELFLogger logger = EELFManager.getInstance().getLogger(DcaeInventoryServices.class); - protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger(); - protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); - public static final String DCAE_INVENTORY_URL = "dcae.inventory.url"; - public static final String DCAE_INVENTORY_RETRY_INTERVAL = "dcae.intentory.retry.interval"; - public static final String DCAE_INVENTORY_RETRY_LIMIT = "dcae.intentory.retry.limit"; - private final ClampProperties refProp; - - /** - * Constructor. - */ - @Autowired - public DcaeInventoryServices(ClampProperties refProp) { - this.refProp = refProp; - } - - private int getTotalCountFromDcaeInventoryResponse(String responseStr) throws ParseException { - JSONParser parser = new JSONParser(); - Object obj0 = parser.parse(responseStr); - JSONObject jsonObj = (JSONObject) obj0; - Long totalCount = (Long) jsonObj.get("totalCount"); - return totalCount.intValue(); - } - - private DcaeInventoryResponse getItemsFromDcaeInventoryResponse(String responseStr) throws ParseException { - JSONParser parser = new JSONParser(); - Object obj0 = parser.parse(responseStr); - JSONObject jsonObj = (JSONObject) obj0; - JSONArray itemsArray = (JSONArray) jsonObj.get("items"); - JSONObject dcaeServiceType0 = (JSONObject) itemsArray.get(0); - return JsonUtils.GSON.fromJson(dcaeServiceType0.toString(), DcaeInventoryResponse.class); - } - - /** - * DO a query to DCAE to get some Information. - * - * @param artifactName The artifact Name - * @param serviceUuid The service UUID - * @param resourceUuid The resource UUID - * @return The DCAE inventory for the artifact in DcaeInventoryResponse - * @throws IOException In case of issues with the stream - * @throws ParseException In case of issues with the Json parsing - */ - public DcaeInventoryResponse getDcaeInformation(String artifactName, String serviceUuid, String resourceUuid) - throws IOException, ParseException, InterruptedException { - LoggingUtils.setTargetContext("DCAE", "getDcaeInformation"); - - int retryInterval = 0; - int retryLimit = 1; - if (refProp.getStringValue(DCAE_INVENTORY_RETRY_LIMIT) != null) { - retryLimit = Integer.valueOf(refProp.getStringValue(DCAE_INVENTORY_RETRY_LIMIT)); - } - if (refProp.getStringValue(DCAE_INVENTORY_RETRY_INTERVAL) != null) { - retryInterval = Integer.valueOf(refProp.getStringValue(DCAE_INVENTORY_RETRY_INTERVAL)); - } - for (int i = 0; i < retryLimit; i++) { - metricsLogger.info("Attempt n°" + i + " to contact DCAE inventory"); - try (ProducerTemplate producerTemplate = camelContext.createProducerTemplate()) { - Exchange exchangeResponse = producerTemplate - .send("direct:get-dcae-blueprint-inventory", ExchangeBuilder.anExchange(camelContext) - .withProperty("blueprintResourceId", resourceUuid) - .withProperty("blueprintServiceId", serviceUuid) - .withProperty("blueprintName", artifactName) - .withProperty("raiseHttpExceptionFlag", false).build()); - - if (HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE)) - .is2xxSuccessful()) { - String dcaeResponse = (String) exchangeResponse.getIn().getBody(); - int totalCount = getTotalCountFromDcaeInventoryResponse(dcaeResponse); - metricsLogger.info("getDcaeInformation complete: totalCount returned=" + totalCount); - if (totalCount > 0) { - logger.info("getDcaeInformation, answer from DCAE inventory:" + dcaeResponse); - LoggingUtils.setResponseContext("0", "Get Dcae Information success", this.getClass().getName()); - Date startTime = new Date(); - LoggingUtils.setTimeContext(startTime, new Date()); - return getItemsFromDcaeInventoryResponse(dcaeResponse); - } else { - logger.info("Dcae inventory totalCount returned is 0, so waiting " + retryInterval - + "ms before retrying ..."); - // wait for a while and try to connect to DCAE again - Thread.sleep(retryInterval); - } - } - } - } - logger.warn("Dcae inventory totalCount returned is still 0, after " + retryLimit + " attempts, returning NULL"); - return null; - } -} +/*- + * ============LICENSE_START======================================================= + * ONAP POLICY-CLAMP + * ================================================================================ + * Copyright (C) 2017-2018, 2021 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============================================ + * Modifications copyright (c) 2018 Nokia + * =================================================================== + * + */ + +package org.onap.policy.clamp.clds.client; + +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; +import java.io.IOException; +import java.util.Date; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.ProducerTemplate; +import org.apache.camel.builder.ExchangeBuilder; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; +import org.json.simple.parser.JSONParser; +import org.json.simple.parser.ParseException; +import org.onap.policy.clamp.clds.config.ClampProperties; +import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse; +import org.onap.policy.clamp.clds.util.JsonUtils; +import org.onap.policy.clamp.clds.util.LoggingUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Component; + +/** + * This class implements the communication with DCAE for the service inventory. + */ +@Component +public class DcaeInventoryServices { + + @Autowired + CamelContext camelContext; + + protected static final EELFLogger logger = EELFManager.getInstance().getLogger(DcaeInventoryServices.class); + protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger(); + protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); + public static final String DCAE_INVENTORY_URL = "dcae.inventory.url"; + public static final String DCAE_INVENTORY_RETRY_INTERVAL = "dcae.intentory.retry.interval"; + public static final String DCAE_INVENTORY_RETRY_LIMIT = "dcae.intentory.retry.limit"; + private final ClampProperties refProp; + + /** + * Constructor. + */ + @Autowired + public DcaeInventoryServices(ClampProperties refProp) { + this.refProp = refProp; + } + + private int getTotalCountFromDcaeInventoryResponse(String responseStr) throws ParseException { + JSONParser parser = new JSONParser(); + Object obj0 = parser.parse(responseStr); + JSONObject jsonObj = (JSONObject) obj0; + Long totalCount = (Long) jsonObj.get("totalCount"); + return totalCount.intValue(); + } + + private DcaeInventoryResponse getItemsFromDcaeInventoryResponse(String responseStr) throws ParseException { + JSONParser parser = new JSONParser(); + Object obj0 = parser.parse(responseStr); + JSONObject jsonObj = (JSONObject) obj0; + JSONArray itemsArray = (JSONArray) jsonObj.get("items"); + JSONObject dcaeServiceType0 = (JSONObject) itemsArray.get(0); + return JsonUtils.GSON.fromJson(dcaeServiceType0.toString(), DcaeInventoryResponse.class); + } + + /** + * DO a query to DCAE to get some Information. + * + * @param artifactName The artifact Name + * @param serviceUuid The service UUID + * @param resourceUuid The resource UUID + * @return The DCAE inventory for the artifact in DcaeInventoryResponse + * @throws IOException In case of issues with the stream + * @throws ParseException In case of issues with the Json parsing + */ + public DcaeInventoryResponse getDcaeInformation(String artifactName, String serviceUuid, String resourceUuid) + throws IOException, ParseException, InterruptedException { + LoggingUtils.setTargetContext("DCAE", "getDcaeInformation"); + + int retryInterval = 0; + int retryLimit = 1; + if (refProp.getStringValue(DCAE_INVENTORY_RETRY_LIMIT) != null) { + retryLimit = Integer.valueOf(refProp.getStringValue(DCAE_INVENTORY_RETRY_LIMIT)); + } + if (refProp.getStringValue(DCAE_INVENTORY_RETRY_INTERVAL) != null) { + retryInterval = Integer.valueOf(refProp.getStringValue(DCAE_INVENTORY_RETRY_INTERVAL)); + } + for (int i = 0; i < retryLimit; i++) { + metricsLogger.info("Attempt n°" + i + " to contact DCAE inventory"); + try (ProducerTemplate producerTemplate = camelContext.createProducerTemplate()) { + Exchange exchangeResponse = producerTemplate + .send("direct:get-dcae-blueprint-inventory", ExchangeBuilder.anExchange(camelContext) + .withProperty("blueprintResourceId", resourceUuid) + .withProperty("blueprintServiceId", serviceUuid) + .withProperty("blueprintName", artifactName) + .withProperty("raiseHttpExceptionFlag", false).build()); + + if (HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE)) + .is2xxSuccessful()) { + String dcaeResponse = (String) exchangeResponse.getIn().getBody(); + int totalCount = getTotalCountFromDcaeInventoryResponse(dcaeResponse); + metricsLogger.info("getDcaeInformation complete: totalCount returned=" + totalCount); + if (totalCount > 0) { + logger.info("getDcaeInformation, answer from DCAE inventory:" + dcaeResponse); + LoggingUtils.setResponseContext("0", "Get Dcae Information success", this.getClass().getName()); + Date startTime = new Date(); + LoggingUtils.setTimeContext(startTime, new Date()); + return getItemsFromDcaeInventoryResponse(dcaeResponse); + } else { + logger.info("Dcae inventory totalCount returned is 0, so waiting " + retryInterval + + "ms before retrying ..."); + // wait for a while and try to connect to DCAE again + Thread.sleep(retryInterval); + } + } + } + } + logger.warn("Dcae inventory totalCount returned is still 0, after " + retryLimit + " attempts, returning NULL"); + return null; + } +} diff --git a/src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java diff --git a/src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java diff --git a/src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java diff --git a/src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java diff --git a/src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java diff --git a/src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java diff --git a/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java diff --git a/src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java diff --git a/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java diff --git a/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java diff --git a/src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java diff --git a/src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java b/runtime/src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java diff --git a/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java diff --git a/src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java b/runtime/src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java diff --git a/src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java diff --git a/src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java diff --git a/src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java diff --git a/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java diff --git a/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java diff --git a/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java diff --git a/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java b/runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java diff --git a/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java b/runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java diff --git a/src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java b/runtime/src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java similarity index 97% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java index 9834c78e7..fb9d66752 100644 --- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java +++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java @@ -1,72 +1,72 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2020 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============================================ - * =================================================================== - * - */ - -package org.onap.policy.clamp.clds.tosca.update.elements; - -import com.google.gson.JsonArray; -import java.util.ArrayList; - -public class ArrayField { - - private ArrayList complexFields; - - /** - * Constructor from arraryList. - * - * @param arrayProperties the array properties - */ - public ArrayField(ArrayList arrayProperties) { - this.complexFields = arrayProperties; - } - - /** - * Each LinkedHashMap is parsed to extract the Array and each of its value. They are casted for the JsonObject. - * - * @return JsonArray - */ - public JsonArray deploy() { - - JsonArray subPropertyValuesArray = new JsonArray(); - for (Object arrayElement : complexFields) { - //Cast for each Primitive Type - String typeValue = arrayElement.getClass().getSimpleName(); - switch (typeValue) { - case "String": - subPropertyValuesArray.add((String) arrayElement); - break; - case "Boolean": - subPropertyValuesArray.add((Boolean) arrayElement); - break; - case "Double": - subPropertyValuesArray.add((Number) arrayElement); - break; - case "Integer": - subPropertyValuesArray.add((Number) arrayElement); - break; - default: - break; - } - } - return subPropertyValuesArray; - } -} +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2020 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============================================ + * =================================================================== + * + */ + +package org.onap.policy.clamp.clds.tosca.update.elements; + +import com.google.gson.JsonArray; +import java.util.ArrayList; + +public class ArrayField { + + private ArrayList complexFields; + + /** + * Constructor from arraryList. + * + * @param arrayProperties the array properties + */ + public ArrayField(ArrayList arrayProperties) { + this.complexFields = arrayProperties; + } + + /** + * Each LinkedHashMap is parsed to extract the Array and each of its value. They are casted for the JsonObject. + * + * @return JsonArray + */ + public JsonArray deploy() { + + JsonArray subPropertyValuesArray = new JsonArray(); + for (Object arrayElement : complexFields) { + //Cast for each Primitive Type + String typeValue = arrayElement.getClass().getSimpleName(); + switch (typeValue) { + case "String": + subPropertyValuesArray.add((String) arrayElement); + break; + case "Boolean": + subPropertyValuesArray.add((Boolean) arrayElement); + break; + case "Double": + subPropertyValuesArray.add((Number) arrayElement); + break; + case "Integer": + subPropertyValuesArray.add((Number) arrayElement); + break; + default: + break; + } + } + return subPropertyValuesArray; + } +} diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java similarity index 97% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java index b41042abe..651456ca6 100644 --- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java +++ b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java @@ -1,222 +1,222 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2020 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============================================ - * =================================================================== - * - */ - -package org.onap.policy.clamp.clds.tosca.update.elements; - -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.Map.Entry; -import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate; - -public class Constraint { - - private LinkedHashMap constraints; - private JsonTemplate jsonTemplate; - - public Constraint(LinkedHashMap constraints, JsonTemplate jsonTemplate) { - this.jsonTemplate = jsonTemplate; - this.constraints = constraints; - } - - /** - * Deploy the linkedhashmap which contains the constraints, to extract them one to one. - * - * @param jsonSchema The json Schema - * @param typeProperty The ype property - * @return the json object - */ - public JsonObject deployConstraints(JsonObject jsonSchema, String typeProperty) { - for (Entry constraint : constraints.entrySet()) { - this.parseConstraint(jsonSchema, constraint.getKey(), constraint.getValue(), typeProperty); - } - return jsonSchema; - } - - /** - * Each case of Tosca constraints below parse specifically the field in the JsonObject. - * - * @param jsonSchema Json Schema - * @param nameConstraint Name constraint - * @param valueConstraint value constraint - * @param typeProperty Type Property - */ - @SuppressWarnings("unchecked") - public void parseConstraint(JsonObject jsonSchema, String nameConstraint, Object valueConstraint, - String typeProperty) { - switch (nameConstraint) { - case "equal": - checkTemplateField("const", jsonSchema, valueConstraint); - break; - case "greater_than": - checkTemplateField("exclusiveMinimum", jsonSchema, valueConstraint); - break; - case "greater_or_equal": - checkTemplateField("minimum", jsonSchema, valueConstraint); - break; - case "less_than": - checkTemplateField("exclusiveMaximum", jsonSchema, valueConstraint); - break; - case "less_or_equal": - checkTemplateField("maximum", jsonSchema, valueConstraint); - break; - case "in_range": - ArrayList limitValues = (ArrayList) valueConstraint; - checkTemplateField("minimum", jsonSchema, limitValues.get(0)); - checkTemplateField("maximum", jsonSchema, limitValues.get(1)); - break; - case "pattern": - jsonSchema.addProperty(nameConstraint, (String) valueConstraint); - break; - case "length": - this.getSpecificLength(jsonSchema, valueConstraint, typeProperty); - break; - case "min_length": - String[] prefixValues = nameConstraint.split("_"); - this.getLimitValue(jsonSchema, valueConstraint, typeProperty, prefixValues[0]); - break; - case "max_length": - String[] maxtab = nameConstraint.split("_"); - this.getLimitValue(jsonSchema, valueConstraint, typeProperty, maxtab[0]); - break; - default://valid_value - this.getValueArray(jsonSchema, valueConstraint, typeProperty); - break; - } - - } - - /** - * To be done. - * - * @param jsonSchema json schema - * @param fieldValue field value - * @param typeProperty For the complex components, get a specific number of items/properties - */ - public void getSpecificLength(JsonObject jsonSchema, Object fieldValue, String typeProperty) { - switch (typeProperty.toLowerCase()) { - case "string": - checkTemplateField("minLength", jsonSchema, fieldValue); - checkTemplateField("maxLength", jsonSchema, fieldValue); - break; - case "array": - if (fieldValue.equals(1) && jsonTemplate.hasFields("uniqueItems")) { - jsonSchema.addProperty("uniqueItems", true); - } else { - checkTemplateField("minItems", jsonSchema, fieldValue); - checkTemplateField("maxItems", jsonSchema, fieldValue); - } - break; - default:// Map && List - checkTemplateField("minProperties", jsonSchema, fieldValue); - checkTemplateField("maxProperties", jsonSchema, fieldValue); - break; - } - - } - - /** - * To be done. - * - * @param jsonSchema json schema - * @param fieldValue field value - * @param typeProperty type property - * @param side Get the limits fieldValue for the properties : depend of the type of the component - */ - public void getLimitValue(JsonObject jsonSchema, Object fieldValue, String typeProperty, String side) { - switch (typeProperty) { - case "string": - if (side.equals("min")) { - checkTemplateField("minLength", jsonSchema, fieldValue); - } else { - checkTemplateField("maxLength", jsonSchema, fieldValue); - } - break; - default:// Array - if (side.equals("min")) { - checkTemplateField("minItems", jsonSchema, fieldValue); - } else { - checkTemplateField("maxItems", jsonSchema, fieldValue); - } - break; - } - - } - - /** - * To be done. - * - * @param jsonSchema Json schema - * @param fieldValue field value - * @param typeProperty Get as Enum the valid values for the property - */ - public void getValueArray(JsonObject jsonSchema, Object fieldValue, String typeProperty) { - if (jsonTemplate.hasFields("enum")) { - JsonArray enumeration = new JsonArray(); - if (typeProperty.equals("string") || typeProperty.equals("String")) { - ArrayList arrayValues = (ArrayList) fieldValue; - for (String arrayItem : arrayValues) { - enumeration.add(arrayItem); - } - jsonSchema.add("enum", enumeration); - } else { - ArrayList arrayValues = (ArrayList) fieldValue; - for (Number arrayItem : arrayValues) { - enumeration.add(arrayItem); - } - jsonSchema.add("enum", enumeration); - } - } - } - - /** - * To be done. - * - * @param field Field - * @param jsonSchema Json schema - * @param fieldValue Simple way to avoid code duplication - */ - public void checkTemplateField(String field, JsonObject jsonSchema, Object fieldValue) { - if (jsonTemplate.hasFields(field)) { - String typeField = fieldValue.getClass().getSimpleName(); - switch (typeField) { - case "String": - jsonSchema.addProperty(field, (String) fieldValue); - break; - case "Integer": - jsonSchema.addProperty(field, (Integer) fieldValue); - break; - case "Number": - jsonSchema.addProperty(field, (Number) fieldValue); - break; - case "Boolean": - jsonSchema.addProperty(field, (Boolean) fieldValue); - break; - default: - break; - } - } - } - +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2020 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============================================ + * =================================================================== + * + */ + +package org.onap.policy.clamp.clds.tosca.update.elements; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.Map.Entry; +import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate; + +public class Constraint { + + private LinkedHashMap constraints; + private JsonTemplate jsonTemplate; + + public Constraint(LinkedHashMap constraints, JsonTemplate jsonTemplate) { + this.jsonTemplate = jsonTemplate; + this.constraints = constraints; + } + + /** + * Deploy the linkedhashmap which contains the constraints, to extract them one to one. + * + * @param jsonSchema The json Schema + * @param typeProperty The ype property + * @return the json object + */ + public JsonObject deployConstraints(JsonObject jsonSchema, String typeProperty) { + for (Entry constraint : constraints.entrySet()) { + this.parseConstraint(jsonSchema, constraint.getKey(), constraint.getValue(), typeProperty); + } + return jsonSchema; + } + + /** + * Each case of Tosca constraints below parse specifically the field in the JsonObject. + * + * @param jsonSchema Json Schema + * @param nameConstraint Name constraint + * @param valueConstraint value constraint + * @param typeProperty Type Property + */ + @SuppressWarnings("unchecked") + public void parseConstraint(JsonObject jsonSchema, String nameConstraint, Object valueConstraint, + String typeProperty) { + switch (nameConstraint) { + case "equal": + checkTemplateField("const", jsonSchema, valueConstraint); + break; + case "greater_than": + checkTemplateField("exclusiveMinimum", jsonSchema, valueConstraint); + break; + case "greater_or_equal": + checkTemplateField("minimum", jsonSchema, valueConstraint); + break; + case "less_than": + checkTemplateField("exclusiveMaximum", jsonSchema, valueConstraint); + break; + case "less_or_equal": + checkTemplateField("maximum", jsonSchema, valueConstraint); + break; + case "in_range": + ArrayList limitValues = (ArrayList) valueConstraint; + checkTemplateField("minimum", jsonSchema, limitValues.get(0)); + checkTemplateField("maximum", jsonSchema, limitValues.get(1)); + break; + case "pattern": + jsonSchema.addProperty(nameConstraint, (String) valueConstraint); + break; + case "length": + this.getSpecificLength(jsonSchema, valueConstraint, typeProperty); + break; + case "min_length": + String[] prefixValues = nameConstraint.split("_"); + this.getLimitValue(jsonSchema, valueConstraint, typeProperty, prefixValues[0]); + break; + case "max_length": + String[] maxtab = nameConstraint.split("_"); + this.getLimitValue(jsonSchema, valueConstraint, typeProperty, maxtab[0]); + break; + default://valid_value + this.getValueArray(jsonSchema, valueConstraint, typeProperty); + break; + } + + } + + /** + * To be done. + * + * @param jsonSchema json schema + * @param fieldValue field value + * @param typeProperty For the complex components, get a specific number of items/properties + */ + public void getSpecificLength(JsonObject jsonSchema, Object fieldValue, String typeProperty) { + switch (typeProperty.toLowerCase()) { + case "string": + checkTemplateField("minLength", jsonSchema, fieldValue); + checkTemplateField("maxLength", jsonSchema, fieldValue); + break; + case "array": + if (fieldValue.equals(1) && jsonTemplate.hasFields("uniqueItems")) { + jsonSchema.addProperty("uniqueItems", true); + } else { + checkTemplateField("minItems", jsonSchema, fieldValue); + checkTemplateField("maxItems", jsonSchema, fieldValue); + } + break; + default:// Map && List + checkTemplateField("minProperties", jsonSchema, fieldValue); + checkTemplateField("maxProperties", jsonSchema, fieldValue); + break; + } + + } + + /** + * To be done. + * + * @param jsonSchema json schema + * @param fieldValue field value + * @param typeProperty type property + * @param side Get the limits fieldValue for the properties : depend of the type of the component + */ + public void getLimitValue(JsonObject jsonSchema, Object fieldValue, String typeProperty, String side) { + switch (typeProperty) { + case "string": + if (side.equals("min")) { + checkTemplateField("minLength", jsonSchema, fieldValue); + } else { + checkTemplateField("maxLength", jsonSchema, fieldValue); + } + break; + default:// Array + if (side.equals("min")) { + checkTemplateField("minItems", jsonSchema, fieldValue); + } else { + checkTemplateField("maxItems", jsonSchema, fieldValue); + } + break; + } + + } + + /** + * To be done. + * + * @param jsonSchema Json schema + * @param fieldValue field value + * @param typeProperty Get as Enum the valid values for the property + */ + public void getValueArray(JsonObject jsonSchema, Object fieldValue, String typeProperty) { + if (jsonTemplate.hasFields("enum")) { + JsonArray enumeration = new JsonArray(); + if (typeProperty.equals("string") || typeProperty.equals("String")) { + ArrayList arrayValues = (ArrayList) fieldValue; + for (String arrayItem : arrayValues) { + enumeration.add(arrayItem); + } + jsonSchema.add("enum", enumeration); + } else { + ArrayList arrayValues = (ArrayList) fieldValue; + for (Number arrayItem : arrayValues) { + enumeration.add(arrayItem); + } + jsonSchema.add("enum", enumeration); + } + } + } + + /** + * To be done. + * + * @param field Field + * @param jsonSchema Json schema + * @param fieldValue Simple way to avoid code duplication + */ + public void checkTemplateField(String field, JsonObject jsonSchema, Object fieldValue) { + if (jsonTemplate.hasFields(field)) { + String typeField = fieldValue.getClass().getSimpleName(); + switch (typeField) { + case "String": + jsonSchema.addProperty(field, (String) fieldValue); + break; + case "Integer": + jsonSchema.addProperty(field, (Integer) fieldValue); + break; + case "Number": + jsonSchema.addProperty(field, (Number) fieldValue); + break; + case "Boolean": + jsonSchema.addProperty(field, (Boolean) fieldValue); + break; + default: + break; + } + } + } + } \ No newline at end of file diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataTargetProcess.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataTargetProcess.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataTargetProcess.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataTargetProcess.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java b/runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java diff --git a/src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java b/runtime/src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java diff --git a/src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java b/runtime/src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java diff --git a/src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java b/runtime/src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java diff --git a/src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java b/runtime/src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java diff --git a/src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java b/runtime/src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java diff --git a/src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java b/runtime/src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java rename to runtime/src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java diff --git a/src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java b/runtime/src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java rename to runtime/src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java diff --git a/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java b/runtime/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java rename to runtime/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java diff --git a/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java b/runtime/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java rename to runtime/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java diff --git a/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java b/runtime/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java rename to runtime/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java diff --git a/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java b/runtime/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java rename to runtime/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java diff --git a/src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java b/runtime/src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java rename to runtime/src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java diff --git a/src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java b/runtime/src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java rename to runtime/src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java diff --git a/src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java b/runtime/src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java diff --git a/src/main/java/org/onap/policy/clamp/loop/Loop.java b/runtime/src/main/java/org/onap/policy/clamp/loop/Loop.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/Loop.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/Loop.java diff --git a/src/main/java/org/onap/policy/clamp/loop/LoopController.java b/runtime/src/main/java/org/onap/policy/clamp/loop/LoopController.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/LoopController.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/LoopController.java diff --git a/src/main/java/org/onap/policy/clamp/loop/LoopService.java b/runtime/src/main/java/org/onap/policy/clamp/loop/LoopService.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/LoopService.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/LoopService.java diff --git a/src/main/java/org/onap/policy/clamp/loop/LoopState.java b/runtime/src/main/java/org/onap/policy/clamp/loop/LoopState.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/LoopState.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/LoopState.java diff --git a/src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java b/runtime/src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java diff --git a/src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java b/runtime/src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java diff --git a/src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java b/runtime/src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java diff --git a/src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java b/runtime/src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java diff --git a/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java b/runtime/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java diff --git a/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java b/runtime/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java diff --git a/src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java b/runtime/src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java diff --git a/src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java b/runtime/src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java diff --git a/src/main/java/org/onap/policy/clamp/loop/log/LogType.java b/runtime/src/main/java/org/onap/policy/clamp/loop/log/LogType.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/log/LogType.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/log/LogType.java diff --git a/src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java b/runtime/src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java diff --git a/src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java b/runtime/src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java diff --git a/src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java b/runtime/src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java diff --git a/src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java b/runtime/src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java diff --git a/src/main/java/org/onap/policy/clamp/loop/service/Service.java b/runtime/src/main/java/org/onap/policy/clamp/loop/service/Service.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/service/Service.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/service/Service.java diff --git a/src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java b/runtime/src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopType.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopType.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/LoopType.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopType.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java diff --git a/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java rename to runtime/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java diff --git a/src/main/java/org/onap/policy/clamp/policy/Policy.java b/runtime/src/main/java/org/onap/policy/clamp/policy/Policy.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/Policy.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/Policy.java diff --git a/src/main/java/org/onap/policy/clamp/policy/PolicyEngineServices.java b/runtime/src/main/java/org/onap/policy/clamp/policy/PolicyEngineServices.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/PolicyEngineServices.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/PolicyEngineServices.java diff --git a/src/main/java/org/onap/policy/clamp/policy/PolicyPayload.java b/runtime/src/main/java/org/onap/policy/clamp/policy/PolicyPayload.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/PolicyPayload.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/PolicyPayload.java diff --git a/src/main/java/org/onap/policy/clamp/policy/PolicyService.java b/runtime/src/main/java/org/onap/policy/clamp/policy/PolicyService.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/PolicyService.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/PolicyService.java diff --git a/src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java b/runtime/src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java diff --git a/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java b/runtime/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java diff --git a/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java b/runtime/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java diff --git a/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java b/runtime/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java diff --git a/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java b/runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java diff --git a/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java b/runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java diff --git a/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java diff --git a/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java b/runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java diff --git a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayload.java b/runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayload.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayload.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayload.java diff --git a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadException.java b/runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadException.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadException.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadException.java diff --git a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java b/runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java diff --git a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java b/runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java rename to runtime/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMerger.java diff --git a/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java b/runtime/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/tosca/Dictionary.java rename to runtime/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java diff --git a/src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java b/runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java rename to runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java diff --git a/src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java b/runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java rename to runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java diff --git a/src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java b/runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java rename to runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java diff --git a/src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java b/runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java rename to runtime/src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java diff --git a/src/main/java/org/onap/policy/clamp/util/PassDecoder.java b/runtime/src/main/java/org/onap/policy/clamp/util/PassDecoder.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/util/PassDecoder.java rename to runtime/src/main/java/org/onap/policy/clamp/util/PassDecoder.java diff --git a/src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java b/runtime/src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java similarity index 100% rename from src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java rename to runtime/src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java diff --git a/src/main/resources/META-INF/resources/swagger.html b/runtime/src/main/resources/META-INF/resources/swagger.html similarity index 99% rename from src/main/resources/META-INF/resources/swagger.html rename to runtime/src/main/resources/META-INF/resources/swagger.html index feb3b6edb..f7fbeb039 100644 --- a/src/main/resources/META-INF/resources/swagger.html +++ b/runtime/src/main/resources/META-INF/resources/swagger.html @@ -742,7 +742,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b

1.1. Version information

-

Version : 6.1.1-SNAPSHOT

+

Version : 6.1.2-SNAPSHOT

@@ -4501,8 +4501,8 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
- \ No newline at end of file + diff --git a/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson b/runtime/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson similarity index 100% rename from src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson rename to runtime/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson diff --git a/src/main/resources/application-noaaf.properties b/runtime/src/main/resources/application-noaaf.properties similarity index 100% rename from src/main/resources/application-noaaf.properties rename to runtime/src/main/resources/application-noaaf.properties diff --git a/src/main/resources/application.properties b/runtime/src/main/resources/application.properties similarity index 100% rename from src/main/resources/application.properties rename to runtime/src/main/resources/application.properties diff --git a/src/main/resources/asciidoc/swagger.adoc b/runtime/src/main/resources/asciidoc/swagger.adoc similarity index 100% rename from src/main/resources/asciidoc/swagger.adoc rename to runtime/src/main/resources/asciidoc/swagger.adoc diff --git a/src/main/resources/boot-message.txt b/runtime/src/main/resources/boot-message.txt similarity index 100% rename from src/main/resources/boot-message.txt rename to runtime/src/main/resources/boot-message.txt diff --git a/src/main/resources/clds-version.properties b/runtime/src/main/resources/clds-version.properties similarity index 100% rename from src/main/resources/clds-version.properties rename to runtime/src/main/resources/clds-version.properties diff --git a/src/main/resources/clds/aaf/org.onap.clamp.keyfile b/runtime/src/main/resources/clds/aaf/org.onap.clamp.keyfile similarity index 100% rename from src/main/resources/clds/aaf/org.onap.clamp.keyfile rename to runtime/src/main/resources/clds/aaf/org.onap.clamp.keyfile diff --git a/src/main/resources/clds/aaf/ssl/ca-certs.pem b/runtime/src/main/resources/clds/aaf/ssl/ca-certs.pem similarity index 100% rename from src/main/resources/clds/aaf/ssl/ca-certs.pem rename to runtime/src/main/resources/clds/aaf/ssl/ca-certs.pem diff --git a/src/main/resources/clds/aaf/ssl/clamp.key b/runtime/src/main/resources/clds/aaf/ssl/clamp.key similarity index 100% rename from src/main/resources/clds/aaf/ssl/clamp.key rename to runtime/src/main/resources/clds/aaf/ssl/clamp.key diff --git a/src/main/resources/clds/aaf/ssl/clamp.pem b/runtime/src/main/resources/clds/aaf/ssl/clamp.pem similarity index 100% rename from src/main/resources/clds/aaf/ssl/clamp.pem rename to runtime/src/main/resources/clds/aaf/ssl/clamp.pem diff --git a/src/main/resources/clds/aaf/truststoreONAPall.jks b/runtime/src/main/resources/clds/aaf/truststoreONAPall.jks similarity index 100% rename from src/main/resources/clds/aaf/truststoreONAPall.jks rename to runtime/src/main/resources/clds/aaf/truststoreONAPall.jks diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml similarity index 100% rename from src/main/resources/clds/camel/rest/clamp-api-v2.xml rename to runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/runtime/src/main/resources/clds/camel/rest/clds-services.xml similarity index 100% rename from src/main/resources/clds/camel/rest/clds-services.xml rename to runtime/src/main/resources/clds/camel/rest/clds-services.xml diff --git a/src/main/resources/clds/camel/routes/cds-flows.xml b/runtime/src/main/resources/clds/camel/routes/cds-flows.xml similarity index 100% rename from src/main/resources/clds/camel/routes/cds-flows.xml rename to runtime/src/main/resources/clds/camel/routes/cds-flows.xml diff --git a/src/main/resources/clds/camel/routes/dcae-flows.xml b/runtime/src/main/resources/clds/camel/routes/dcae-flows.xml similarity index 100% rename from src/main/resources/clds/camel/routes/dcae-flows.xml rename to runtime/src/main/resources/clds/camel/routes/dcae-flows.xml diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/runtime/src/main/resources/clds/camel/routes/loop-flows.xml similarity index 100% rename from src/main/resources/clds/camel/routes/loop-flows.xml rename to runtime/src/main/resources/clds/camel/routes/loop-flows.xml diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/runtime/src/main/resources/clds/camel/routes/policy-flows.xml similarity index 100% rename from src/main/resources/clds/camel/routes/policy-flows.xml rename to runtime/src/main/resources/clds/camel/routes/policy-flows.xml diff --git a/src/main/resources/clds/camel/routes/utils-flows.xml b/runtime/src/main/resources/clds/camel/routes/utils-flows.xml similarity index 100% rename from src/main/resources/clds/camel/routes/utils-flows.xml rename to runtime/src/main/resources/clds/camel/routes/utils-flows.xml diff --git a/src/main/resources/clds/clds-users.json b/runtime/src/main/resources/clds/clds-users.json similarity index 100% rename from src/main/resources/clds/clds-users.json rename to runtime/src/main/resources/clds/clds-users.json diff --git a/src/main/resources/clds/json-schema/operational_policies/operational_policy.json b/runtime/src/main/resources/clds/json-schema/operational_policies/operational_policy.json similarity index 100% rename from src/main/resources/clds/json-schema/operational_policies/operational_policy.json rename to runtime/src/main/resources/clds/json-schema/operational_policies/operational_policy.json diff --git a/src/main/resources/clds/sdc-controllers-config.json b/runtime/src/main/resources/clds/sdc-controllers-config.json similarity index 100% rename from src/main/resources/clds/sdc-controllers-config.json rename to runtime/src/main/resources/clds/sdc-controllers-config.json diff --git a/src/main/resources/clds/tosca-converter/default-tosca-types.yaml b/runtime/src/main/resources/clds/tosca-converter/default-tosca-types.yaml similarity index 100% rename from src/main/resources/clds/tosca-converter/default-tosca-types.yaml rename to runtime/src/main/resources/clds/tosca-converter/default-tosca-types.yaml diff --git a/src/main/resources/clds/tosca-converter/templates.json b/runtime/src/main/resources/clds/tosca-converter/templates.json similarity index 100% rename from src/main/resources/clds/tosca-converter/templates.json rename to runtime/src/main/resources/clds/tosca-converter/templates.json diff --git a/src/main/resources/logback-default.xml b/runtime/src/main/resources/logback-default.xml similarity index 100% rename from src/main/resources/logback-default.xml rename to runtime/src/main/resources/logback-default.xml diff --git a/src/main/resources/logback-spring.xml b/runtime/src/main/resources/logback-spring.xml similarity index 100% rename from src/main/resources/logback-spring.xml rename to runtime/src/main/resources/logback-spring.xml diff --git a/src/main/resources/logmessages.properties b/runtime/src/main/resources/logmessages.properties similarity index 100% rename from src/main/resources/logmessages.properties rename to runtime/src/main/resources/logmessages.properties diff --git a/src/main/resources/system.properties b/runtime/src/main/resources/system.properties similarity index 100% rename from src/main/resources/system.properties rename to runtime/src/main/resources/system.properties diff --git a/src/main/script/SelectNpmRepo.groovy b/runtime/src/main/script/SelectNpmRepo.groovy similarity index 100% rename from src/main/script/SelectNpmRepo.groovy rename to runtime/src/main/script/SelectNpmRepo.groovy diff --git a/src/main/script/TagVersion.groovy b/runtime/src/main/script/TagVersion.groovy similarity index 100% rename from src/main/script/TagVersion.groovy rename to runtime/src/main/script/TagVersion.groovy diff --git a/src/main/script/checkLibIndex.sh b/runtime/src/main/script/checkLibIndex.sh old mode 100755 new mode 100644 similarity index 95% rename from src/main/script/checkLibIndex.sh rename to runtime/src/main/script/checkLibIndex.sh index 9a28e7df9..fef9c1b7a --- a/src/main/script/checkLibIndex.sh +++ b/runtime/src/main/script/checkLibIndex.sh @@ -31,9 +31,9 @@ then fi tmpSrcFileList=/tmp/upldateLibIndex.$$.list -reactUiBaseDir="${baseDir}/ui-react" -reactLibIndexFile="ui-react-lib/libIndex.js" -exclusionList="ui-react-lib/libExportExclusions.dat" +reactUiBaseDir="${baseDir}/runtime/ui-react" +reactLibIndexFile="runtime/ui-react-lib/libIndex.js" +exclusionList="runtime/ui-react-lib/libExportExclusions.dat" if [[ ! -d "$reactUiBaseDir" ]] diff --git a/src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java diff --git a/src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java diff --git a/src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java diff --git a/src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java diff --git a/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java diff --git a/src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java diff --git a/src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java diff --git a/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java diff --git a/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java similarity index 97% rename from src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java index 7b17adeec..0ea2146b4 100644 --- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java +++ b/runtime/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java @@ -1,52 +1,52 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2020 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============================================ - * =================================================================== - * - */ - -package org.onap.policy.clamp.clds.tosca.update; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import junit.framework.TestCase; -import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement; -import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager; -import org.onap.policy.clamp.clds.util.ResourceFileUtils; - -public class ToscaElementTest extends TestCase { - - /** - * Test propertiesName. - * - * @throws IOException In case of failure - */ - public void testPropertiesNames() throws IOException { - ArrayList reference = new ArrayList<>(Arrays.asList("actor", "operation", "target", "payload")); - JsonTemplateManager jsonTemplateManager = - new JsonTemplateManager( - ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"), - ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"), - ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json")); - ToscaElement toscaElement = jsonTemplateManager.getToscaElements().get("onap.datatype.controlloop.Actor"); - assertEquals(reference, toscaElement.propertiesNames()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2020 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============================================ + * =================================================================== + * + */ + +package org.onap.policy.clamp.clds.tosca.update; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import junit.framework.TestCase; +import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement; +import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager; +import org.onap.policy.clamp.clds.util.ResourceFileUtils; + +public class ToscaElementTest extends TestCase { + + /** + * Test propertiesName. + * + * @throws IOException In case of failure + */ + public void testPropertiesNames() throws IOException { + ArrayList reference = new ArrayList<>(Arrays.asList("actor", "operation", "target", "payload")); + JsonTemplateManager jsonTemplateManager = + new JsonTemplateManager( + ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"), + ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"), + ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json")); + ToscaElement toscaElement = jsonTemplateManager.getToscaElements().get("onap.datatype.controlloop.Actor"); + assertEquals(reference, toscaElement.propertiesNames()); + } + +} diff --git a/src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java b/runtime/src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java diff --git a/src/test/java/org/onap/policy/clamp/clds/util/TestObject.java b/runtime/src/test/java/org/onap/policy/clamp/clds/util/TestObject.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/util/TestObject.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/util/TestObject.java diff --git a/src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java b/runtime/src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java rename to runtime/src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java diff --git a/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java b/runtime/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java rename to runtime/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java diff --git a/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java diff --git a/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java diff --git a/src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java diff --git a/src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java similarity index 97% rename from src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java index d608075fc..dba7c39a9 100644 --- a/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java +++ b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java @@ -1,146 +1,146 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2020 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============================================ - * =================================================================== - * - */ - -package org.onap.policy.clamp.loop; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.List; -import java.util.SortedSet; -import javax.transaction.Transactional; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.onap.policy.clamp.clds.Application; -import org.onap.policy.clamp.loop.template.LoopElementModel; -import org.onap.policy.clamp.loop.template.LoopTemplate; -import org.onap.policy.clamp.loop.template.LoopTemplateLoopElementModel; -import org.onap.policy.clamp.loop.template.LoopTemplatesService; -import org.onap.policy.clamp.loop.template.LoopType; -import org.onap.policy.clamp.loop.template.PolicyModel; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class LoopTemplatesServiceItCase { - - @Autowired - LoopTemplatesService loopTemplatesService; - - private static final String POLICY_MODEL_TYPE_1 = "org.onap.test"; - private static final String VERSION = "1.0.0"; - - private LoopElementModel getLoopElementModel(String yaml, String name, String loopElementType, - String createdBy, PolicyModel policyModel) { - LoopElementModel model = new LoopElementModel(name, loopElementType, yaml); - model.setBlueprint(""); - model.setDcaeBlueprintId(""); - model.addPolicyModel(policyModel); - return model; - } - - private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version, - String policyAcronym, String createdBy) { - return new PolicyModel(policyType, policyModelTosca, version, policyAcronym); - } - - private LoopTemplate getLoopTemplate(String name, String blueprint, String createdBy, Integer maxInstancesAllowed) { - LoopTemplate template = - new LoopTemplate(name, blueprint, maxInstancesAllowed, null); - template.addLoopElementModel(getLoopElementModel("yaml", "microService1", "MicroService", - createdBy, getPolicyModel(POLICY_MODEL_TYPE_1, "yaml", VERSION, "MS1", createdBy))); - template.setAllowedLoopType(LoopType.OPEN); - return template; - } - - @Test - @Transactional - public void shouldSaveOrUpdateLoopTemplate() { - LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1); - LoopTemplate actualLoopTemplate = - loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate); - - assertNotNull(actualLoopTemplate); - assertThat(loopTemplate.getName()).isEqualTo("TemplateName"); - assertThat(loopTemplate.getAllowedLoopType()).isEqualTo(LoopType.OPEN); - } - - @Test - @Transactional - public void shouldReturnAllLoopTemplates() { - LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1); - loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate); - List loopTemplateList = loopTemplatesService.getAllLoopTemplates(); - - assertNotNull(loopTemplateList); - } - - @Test - @Transactional - public void shouldReturnLoopTemplateNames() { - LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1); - loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate); - List loopTemplateNames = loopTemplatesService.getLoopTemplateNames(); - - assertNotNull(loopTemplateNames); - assertEquals("TemplateName", loopTemplateNames.get(0)); - } - - @Test - @Transactional - public void shouldReturnLoopTemplate() { - LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1); - loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate); - LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName"); - - assertNotNull(actualLoopTemplate); - assertThat(loopTemplate).isEqualTo(actualLoopTemplate); - assertThat(loopTemplate.getName()).isEqualTo(actualLoopTemplate.getName()); - assertThat(loopTemplate.getMaximumInstancesAllowed()) - .isEqualTo(actualLoopTemplate.getMaximumInstancesAllowed()); - SortedSet loopElementModelsUsed = - loopTemplate.getLoopElementModelsUsed(); - LoopTemplateLoopElementModel loopTemplateLoopElementModel = loopElementModelsUsed.first(); - assertThat(loopTemplateLoopElementModel.getLoopElementModel().getName()) - .isEqualTo("microService1"); - assertThat(loopTemplateLoopElementModel.getLoopTemplate().getName()) - .isEqualTo("TemplateName"); - assertNull(actualLoopTemplate.getBlueprint()); - assertNull(actualLoopTemplate.getModelService()); - } - - @Test - @Transactional - public void shouldDeleteLoopTemplate() { - LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1); - loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate); - loopTemplatesService.deleteLoopTemplate("TemplateName"); - LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName"); - assertNull(actualLoopTemplate); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2020 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============================================ + * =================================================================== + * + */ + +package org.onap.policy.clamp.loop; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.List; +import java.util.SortedSet; +import javax.transaction.Transactional; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.onap.policy.clamp.clds.Application; +import org.onap.policy.clamp.loop.template.LoopElementModel; +import org.onap.policy.clamp.loop.template.LoopTemplate; +import org.onap.policy.clamp.loop.template.LoopTemplateLoopElementModel; +import org.onap.policy.clamp.loop.template.LoopTemplatesService; +import org.onap.policy.clamp.loop.template.LoopType; +import org.onap.policy.clamp.loop.template.PolicyModel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = Application.class) +public class LoopTemplatesServiceItCase { + + @Autowired + LoopTemplatesService loopTemplatesService; + + private static final String POLICY_MODEL_TYPE_1 = "org.onap.test"; + private static final String VERSION = "1.0.0"; + + private LoopElementModel getLoopElementModel(String yaml, String name, String loopElementType, + String createdBy, PolicyModel policyModel) { + LoopElementModel model = new LoopElementModel(name, loopElementType, yaml); + model.setBlueprint(""); + model.setDcaeBlueprintId(""); + model.addPolicyModel(policyModel); + return model; + } + + private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version, + String policyAcronym, String createdBy) { + return new PolicyModel(policyType, policyModelTosca, version, policyAcronym); + } + + private LoopTemplate getLoopTemplate(String name, String blueprint, String createdBy, Integer maxInstancesAllowed) { + LoopTemplate template = + new LoopTemplate(name, blueprint, maxInstancesAllowed, null); + template.addLoopElementModel(getLoopElementModel("yaml", "microService1", "MicroService", + createdBy, getPolicyModel(POLICY_MODEL_TYPE_1, "yaml", VERSION, "MS1", createdBy))); + template.setAllowedLoopType(LoopType.OPEN); + return template; + } + + @Test + @Transactional + public void shouldSaveOrUpdateLoopTemplate() { + LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1); + LoopTemplate actualLoopTemplate = + loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate); + + assertNotNull(actualLoopTemplate); + assertThat(loopTemplate.getName()).isEqualTo("TemplateName"); + assertThat(loopTemplate.getAllowedLoopType()).isEqualTo(LoopType.OPEN); + } + + @Test + @Transactional + public void shouldReturnAllLoopTemplates() { + LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1); + loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate); + List loopTemplateList = loopTemplatesService.getAllLoopTemplates(); + + assertNotNull(loopTemplateList); + } + + @Test + @Transactional + public void shouldReturnLoopTemplateNames() { + LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1); + loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate); + List loopTemplateNames = loopTemplatesService.getLoopTemplateNames(); + + assertNotNull(loopTemplateNames); + assertEquals("TemplateName", loopTemplateNames.get(0)); + } + + @Test + @Transactional + public void shouldReturnLoopTemplate() { + LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1); + loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate); + LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName"); + + assertNotNull(actualLoopTemplate); + assertThat(loopTemplate).isEqualTo(actualLoopTemplate); + assertThat(loopTemplate.getName()).isEqualTo(actualLoopTemplate.getName()); + assertThat(loopTemplate.getMaximumInstancesAllowed()) + .isEqualTo(actualLoopTemplate.getMaximumInstancesAllowed()); + SortedSet loopElementModelsUsed = + loopTemplate.getLoopElementModelsUsed(); + LoopTemplateLoopElementModel loopTemplateLoopElementModel = loopElementModelsUsed.first(); + assertThat(loopTemplateLoopElementModel.getLoopElementModel().getName()) + .isEqualTo("microService1"); + assertThat(loopTemplateLoopElementModel.getLoopTemplate().getName()) + .isEqualTo("TemplateName"); + assertNull(actualLoopTemplate.getBlueprint()); + assertNull(actualLoopTemplate.getModelService()); + } + + @Test + @Transactional + public void shouldDeleteLoopTemplate() { + LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1); + loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate); + loopTemplatesService.deleteLoopTemplate("TemplateName"); + LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName"); + assertNull(actualLoopTemplate); + } + +} diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java diff --git a/src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java diff --git a/src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java diff --git a/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/ServiceTest.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java diff --git a/src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java b/runtime/src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java rename to runtime/src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java diff --git a/src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java b/runtime/src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java diff --git a/src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java b/runtime/src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java rename to runtime/src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java diff --git a/src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java b/runtime/src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java rename to runtime/src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java diff --git a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupAnalyzerTest.java b/runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupAnalyzerTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupAnalyzerTest.java rename to runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupAnalyzerTest.java diff --git a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadExceptionTest.java b/runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadExceptionTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadExceptionTest.java rename to runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadExceptionTest.java diff --git a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadTest.java b/runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadTest.java rename to runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadTest.java diff --git a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMergerTest.java b/runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMergerTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMergerTest.java rename to runtime/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMergerTest.java diff --git a/src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java b/runtime/src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java rename to runtime/src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java diff --git a/src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java b/runtime/src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java rename to runtime/src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java diff --git a/src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java b/runtime/src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java similarity index 100% rename from src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java rename to runtime/src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java diff --git a/src/test/resources/application.properties b/runtime/src/test/resources/application.properties similarity index 100% rename from src/test/resources/application.properties rename to runtime/src/test/resources/application.properties diff --git a/src/test/resources/clds/blueprint-with-microservice-chain.yaml b/runtime/src/test/resources/clds/blueprint-with-microservice-chain.yaml similarity index 100% rename from src/test/resources/clds/blueprint-with-microservice-chain.yaml rename to runtime/src/test/resources/clds/blueprint-with-microservice-chain.yaml diff --git a/src/test/resources/clds/clds-parse-exception.json b/runtime/src/test/resources/clds/clds-parse-exception.json similarity index 100% rename from src/test/resources/clds/clds-parse-exception.json rename to runtime/src/test/resources/clds/clds-parse-exception.json diff --git a/src/test/resources/clds/clds-users-incomplete-permissions.json b/runtime/src/test/resources/clds/clds-users-incomplete-permissions.json similarity index 100% rename from src/test/resources/clds/clds-users-incomplete-permissions.json rename to runtime/src/test/resources/clds/clds-users-incomplete-permissions.json diff --git a/src/test/resources/clds/clds-users-no-permission.json b/runtime/src/test/resources/clds/clds-users-no-permission.json similarity index 100% rename from src/test/resources/clds/clds-users-no-permission.json rename to runtime/src/test/resources/clds/clds-users-no-permission.json diff --git a/src/test/resources/clds/clds-users-two-users.json b/runtime/src/test/resources/clds/clds-users-two-users.json similarity index 100% rename from src/test/resources/clds/clds-users-two-users.json rename to runtime/src/test/resources/clds/clds-users-two-users.json diff --git a/src/test/resources/clds/new-microservice.yaml b/runtime/src/test/resources/clds/new-microservice.yaml similarity index 100% rename from src/test/resources/clds/new-microservice.yaml rename to runtime/src/test/resources/clds/new-microservice.yaml diff --git a/src/test/resources/clds/policy-merger.json b/runtime/src/test/resources/clds/policy-merger.json similarity index 100% rename from src/test/resources/clds/policy-merger.json rename to runtime/src/test/resources/clds/policy-merger.json diff --git a/src/test/resources/clds/sdc-controller-config-NULL.json b/runtime/src/test/resources/clds/sdc-controller-config-NULL.json similarity index 100% rename from src/test/resources/clds/sdc-controller-config-NULL.json rename to runtime/src/test/resources/clds/sdc-controller-config-NULL.json diff --git a/src/test/resources/clds/sdc-controller-config-TLS.json b/runtime/src/test/resources/clds/sdc-controller-config-TLS.json similarity index 100% rename from src/test/resources/clds/sdc-controller-config-TLS.json rename to runtime/src/test/resources/clds/sdc-controller-config-TLS.json diff --git a/src/test/resources/clds/sdc-controller-config-bad.json b/runtime/src/test/resources/clds/sdc-controller-config-bad.json similarity index 100% rename from src/test/resources/clds/sdc-controller-config-bad.json rename to runtime/src/test/resources/clds/sdc-controller-config-bad.json diff --git a/src/test/resources/clds/sdc-controller-config-empty-encrypted.json b/runtime/src/test/resources/clds/sdc-controller-config-empty-encrypted.json similarity index 100% rename from src/test/resources/clds/sdc-controller-config-empty-encrypted.json rename to runtime/src/test/resources/clds/sdc-controller-config-empty-encrypted.json diff --git a/src/test/resources/clds/sdc-controllers-config-bad.json b/runtime/src/test/resources/clds/sdc-controllers-config-bad.json similarity index 100% rename from src/test/resources/clds/sdc-controllers-config-bad.json rename to runtime/src/test/resources/clds/sdc-controllers-config-bad.json diff --git a/src/test/resources/clds/sdc-controllers-config-missing-param.json b/runtime/src/test/resources/clds/sdc-controllers-config-missing-param.json similarity index 100% rename from src/test/resources/clds/sdc-controllers-config-missing-param.json rename to runtime/src/test/resources/clds/sdc-controllers-config-missing-param.json diff --git a/src/test/resources/clds/sdc-controllers-config.json b/runtime/src/test/resources/clds/sdc-controllers-config.json similarity index 100% rename from src/test/resources/clds/sdc-controllers-config.json rename to runtime/src/test/resources/clds/sdc-controllers-config.json diff --git a/src/test/resources/clds/single-microservice-fragment-invalid.yaml b/runtime/src/test/resources/clds/single-microservice-fragment-invalid.yaml similarity index 100% rename from src/test/resources/clds/single-microservice-fragment-invalid.yaml rename to runtime/src/test/resources/clds/single-microservice-fragment-invalid.yaml diff --git a/src/test/resources/clds/single-microservice-fragment-valid-with-version.yaml b/runtime/src/test/resources/clds/single-microservice-fragment-valid-with-version.yaml similarity index 100% rename from src/test/resources/clds/single-microservice-fragment-valid-with-version.yaml rename to runtime/src/test/resources/clds/single-microservice-fragment-valid-with-version.yaml diff --git a/src/test/resources/clds/single-microservice-fragment-without-name.yaml b/runtime/src/test/resources/clds/single-microservice-fragment-without-name.yaml similarity index 100% rename from src/test/resources/clds/single-microservice-fragment-without-name.yaml rename to runtime/src/test/resources/clds/single-microservice-fragment-without-name.yaml diff --git a/src/test/resources/clds/single-microservice-fragment-without-properties.yaml b/runtime/src/test/resources/clds/single-microservice-fragment-without-properties.yaml similarity index 100% rename from src/test/resources/clds/single-microservice-fragment-without-properties.yaml rename to runtime/src/test/resources/clds/single-microservice-fragment-without-properties.yaml diff --git a/src/test/resources/clds/single-microservice-fragment-without-relationships.yaml b/runtime/src/test/resources/clds/single-microservice-fragment-without-relationships.yaml similarity index 100% rename from src/test/resources/clds/single-microservice-fragment-without-relationships.yaml rename to runtime/src/test/resources/clds/single-microservice-fragment-without-relationships.yaml diff --git a/src/test/resources/clds/templates/dcae-deployment-template.json b/runtime/src/test/resources/clds/templates/dcae-deployment-template.json similarity index 100% rename from src/test/resources/clds/templates/dcae-deployment-template.json rename to runtime/src/test/resources/clds/templates/dcae-deployment-template.json diff --git a/src/test/resources/clds/templates/dcae-template.json b/runtime/src/test/resources/clds/templates/dcae-template.json similarity index 100% rename from src/test/resources/clds/templates/dcae-template.json rename to runtime/src/test/resources/clds/templates/dcae-template.json diff --git a/src/test/resources/clds/templates/globalProperties.json b/runtime/src/test/resources/clds/templates/globalProperties.json similarity index 100% rename from src/test/resources/clds/templates/globalProperties.json rename to runtime/src/test/resources/clds/templates/globalProperties.json diff --git a/src/test/resources/clds/templates/sdc-decode-service_ids.json b/runtime/src/test/resources/clds/templates/sdc-decode-service_ids.json similarity index 100% rename from src/test/resources/clds/templates/sdc-decode-service_ids.json rename to runtime/src/test/resources/clds/templates/sdc-decode-service_ids.json diff --git a/src/test/resources/clds/templates/sdc-template.json b/runtime/src/test/resources/clds/templates/sdc-template.json similarity index 100% rename from src/test/resources/clds/templates/sdc-template.json rename to runtime/src/test/resources/clds/templates/sdc-template.json diff --git a/src/test/resources/clds/templates/tca-policy-template.json b/runtime/src/test/resources/clds/templates/tca-policy-template.json similarity index 100% rename from src/test/resources/clds/templates/tca-policy-template.json rename to runtime/src/test/resources/clds/templates/tca-policy-template.json diff --git a/src/test/resources/clds/templates/tca-template.json b/runtime/src/test/resources/clds/templates/tca-template.json similarity index 100% rename from src/test/resources/clds/templates/tca-template.json rename to runtime/src/test/resources/clds/templates/tca-template.json diff --git a/src/test/resources/clds/templates/tca-thresholds-template.json b/runtime/src/test/resources/clds/templates/tca-thresholds-template.json similarity index 100% rename from src/test/resources/clds/templates/tca-thresholds-template.json rename to runtime/src/test/resources/clds/templates/tca-thresholds-template.json diff --git a/src/test/resources/clds/templates/ui-location-default.json b/runtime/src/test/resources/clds/templates/ui-location-default.json similarity index 100% rename from src/test/resources/clds/templates/ui-location-default.json rename to runtime/src/test/resources/clds/templates/ui-location-default.json diff --git a/src/test/resources/clds/util/file.xml b/runtime/src/test/resources/clds/util/file.xml similarity index 100% rename from src/test/resources/clds/util/file.xml rename to runtime/src/test/resources/clds/util/file.xml diff --git a/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json b/runtime/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json similarity index 100% rename from src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json rename to runtime/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json diff --git a/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json b/runtime/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json similarity index 100% rename from src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json rename to runtime/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json diff --git a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json b/runtime/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json similarity index 100% rename from src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json rename to runtime/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json diff --git a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json b/runtime/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json similarity index 100% rename from src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json rename to runtime/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json diff --git a/src/test/resources/example/dcae/inventory-response.json b/runtime/src/test/resources/example/dcae/inventory-response.json similarity index 100% rename from src/test/resources/example/dcae/inventory-response.json rename to runtime/src/test/resources/example/dcae/inventory-response.json diff --git a/src/test/resources/example/policy/pdp-deployment-testos-1_0_0.json b/runtime/src/test/resources/example/policy/pdp-deployment-testos-1_0_0.json similarity index 100% rename from src/test/resources/example/policy/pdp-deployment-testos-1_0_0.json rename to runtime/src/test/resources/example/policy/pdp-deployment-testos-1_0_0.json diff --git a/src/test/resources/example/policy/pdp-deployment-testos-2_0_0.json b/runtime/src/test/resources/example/policy/pdp-deployment-testos-2_0_0.json similarity index 100% rename from src/test/resources/example/policy/pdp-deployment-testos-2_0_0.json rename to runtime/src/test/resources/example/policy/pdp-deployment-testos-2_0_0.json diff --git a/src/test/resources/example/policy/pdp-group-multi-policies-payload.json b/runtime/src/test/resources/example/policy/pdp-group-multi-policies-payload.json similarity index 100% rename from src/test/resources/example/policy/pdp-group-multi-policies-payload.json rename to runtime/src/test/resources/example/policy/pdp-group-multi-policies-payload.json diff --git a/src/test/resources/example/policy/pdp-group-policy-payload.json b/runtime/src/test/resources/example/policy/pdp-group-policy-payload.json similarity index 100% rename from src/test/resources/example/policy/pdp-group-policy-payload.json rename to runtime/src/test/resources/example/policy/pdp-group-policy-payload.json diff --git a/src/test/resources/example/policy/policy-merger.json b/runtime/src/test/resources/example/policy/policy-merger.json similarity index 100% rename from src/test/resources/example/policy/policy-merger.json rename to runtime/src/test/resources/example/policy/policy-merger.json diff --git a/src/test/resources/example/policy/single-policy-enriched.json b/runtime/src/test/resources/example/policy/single-policy-enriched.json similarity index 100% rename from src/test/resources/example/policy/single-policy-enriched.json rename to runtime/src/test/resources/example/policy/single-policy-enriched.json diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca-bad-policy.yaml b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca-bad-policy.yaml similarity index 100% rename from src/test/resources/example/sdc/blueprint-dcae/tca-bad-policy.yaml rename to runtime/src/test/resources/example/sdc/blueprint-dcae/tca-bad-policy.yaml diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml similarity index 100% rename from src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml rename to runtime/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca.yaml b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca.yaml similarity index 100% rename from src/test/resources/example/sdc/blueprint-dcae/tca.yaml rename to runtime/src/test/resources/example/sdc/blueprint-dcae/tca.yaml diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml similarity index 100% rename from src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml rename to runtime/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml b/runtime/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml similarity index 100% rename from src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml rename to runtime/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml diff --git a/src/test/resources/example/sdc/expected-result/deployment-parameters-multi-blueprints.json b/runtime/src/test/resources/example/sdc/expected-result/deployment-parameters-multi-blueprints.json similarity index 100% rename from src/test/resources/example/sdc/expected-result/deployment-parameters-multi-blueprints.json rename to runtime/src/test/resources/example/sdc/expected-result/deployment-parameters-multi-blueprints.json diff --git a/src/test/resources/example/sdc/expected-result/deployment-parameters-single-blueprint.json b/runtime/src/test/resources/example/sdc/expected-result/deployment-parameters-single-blueprint.json similarity index 100% rename from src/test/resources/example/sdc/expected-result/deployment-parameters-single-blueprint.json rename to runtime/src/test/resources/example/sdc/expected-result/deployment-parameters-single-blueprint.json diff --git a/src/test/resources/example/sdc/expected-result/policy-data.yaml b/runtime/src/test/resources/example/sdc/expected-result/policy-data.yaml similarity index 100% rename from src/test/resources/example/sdc/expected-result/policy-data.yaml rename to runtime/src/test/resources/example/sdc/expected-result/policy-data.yaml diff --git a/src/test/resources/example/sdc/service-Simsfoimap0112.csar b/runtime/src/test/resources/example/sdc/service-Simsfoimap0112.csar similarity index 100% rename from src/test/resources/example/sdc/service-Simsfoimap0112.csar rename to runtime/src/test/resources/example/sdc/service-Simsfoimap0112.csar diff --git a/src/test/resources/example/sdc/service-without-policy.csar b/runtime/src/test/resources/example/sdc/service-without-policy.csar similarity index 100% rename from src/test/resources/example/sdc/service-without-policy.csar rename to runtime/src/test/resources/example/sdc/service-without-policy.csar diff --git a/src/test/resources/example/sdc/service_Vloadbalancerms_cds.csar b/runtime/src/test/resources/example/sdc/service_Vloadbalancerms_cds.csar similarity index 100% rename from src/test/resources/example/sdc/service_Vloadbalancerms_cds.csar rename to runtime/src/test/resources/example/sdc/service_Vloadbalancerms_cds.csar diff --git a/src/test/resources/example/sdc/service_Vloadbalancerms_no_cds.csar b/runtime/src/test/resources/example/sdc/service_Vloadbalancerms_no_cds.csar similarity index 100% rename from src/test/resources/example/sdc/service_Vloadbalancerms_no_cds.csar rename to runtime/src/test/resources/example/sdc/service_Vloadbalancerms_no_cds.csar diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file b/runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file similarity index 100% rename from src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file rename to runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header b/runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header similarity index 100% rename from src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header rename to runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file b/runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file similarity index 100% rename from src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file rename to runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header b/runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header similarity index 100% rename from src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header rename to runtime/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header diff --git a/src/test/resources/http-cache/example/policy/api/v1/policies/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policies/.file similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policies/.file rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policies/.file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policies/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policies/.header similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policies/.header rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policies/.header diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/.file rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/.header rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.file similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.file rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.header similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.header rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.header diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.file b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.file similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.file rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.file diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.header b/runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.header similarity index 100% rename from src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.header rename to runtime/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.header diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file b/runtime/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file similarity index 100% rename from src/test/resources/http-cache/example/policy/pap/v1/pdps/.file rename to runtime/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header b/runtime/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header similarity index 100% rename from src/test/resources/http-cache/example/policy/pap/v1/pdps/.header rename to runtime/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header diff --git a/src/test/resources/http-cache/start_http_cache.sh b/runtime/src/test/resources/http-cache/start_http_cache.sh similarity index 100% rename from src/test/resources/http-cache/start_http_cache.sh rename to runtime/src/test/resources/http-cache/start_http_cache.sh diff --git a/src/test/resources/http-cache/third_party_proxy.py b/runtime/src/test/resources/http-cache/third_party_proxy.py old mode 100755 new mode 100644 similarity index 100% rename from src/test/resources/http-cache/third_party_proxy.py rename to runtime/src/test/resources/http-cache/third_party_proxy.py diff --git a/src/test/resources/https/https-test.properties b/runtime/src/test/resources/https/https-test.properties similarity index 100% rename from src/test/resources/https/https-test.properties rename to runtime/src/test/resources/https/https-test.properties diff --git a/src/test/resources/https/keystore-test.jks b/runtime/src/test/resources/https/keystore-test.jks similarity index 100% rename from src/test/resources/https/keystore-test.jks rename to runtime/src/test/resources/https/keystore-test.jks diff --git a/src/test/resources/logback.xml b/runtime/src/test/resources/logback.xml similarity index 100% rename from src/test/resources/logback.xml rename to runtime/src/test/resources/logback.xml diff --git a/src/test/resources/robotframework/Dockerfile b/runtime/src/test/resources/robotframework/Dockerfile similarity index 58% rename from src/test/resources/robotframework/Dockerfile rename to runtime/src/test/resources/robotframework/Dockerfile index 03d180c5e..e93b7b9d1 100644 --- a/src/test/resources/robotframework/Dockerfile +++ b/runtime/src/test/resources/robotframework/Dockerfile @@ -2,4 +2,5 @@ FROM ppodgorsek/robot-framework:3.8.0 USER root COPY requirements.txt . -RUN pip3 install --no-cache-dir -r requirements.txt \ No newline at end of file +RUN pip3 install --no-cache-dir -r requirements.txt + diff --git a/src/test/resources/robotframework/requirements.txt b/runtime/src/test/resources/robotframework/requirements.txt similarity index 100% rename from src/test/resources/robotframework/requirements.txt rename to runtime/src/test/resources/robotframework/requirements.txt diff --git a/src/test/resources/robotframework/robotframework-test.properties b/runtime/src/test/resources/robotframework/robotframework-test.properties similarity index 100% rename from src/test/resources/robotframework/robotframework-test.properties rename to runtime/src/test/resources/robotframework/robotframework-test.properties diff --git a/src/test/resources/robotframework/tests/01_healthcheck.robot b/runtime/src/test/resources/robotframework/tests/01_healthcheck.robot similarity index 100% rename from src/test/resources/robotframework/tests/01_healthcheck.robot rename to runtime/src/test/resources/robotframework/tests/01_healthcheck.robot diff --git a/src/test/resources/robotframework/tests/02_policy_queries.robot b/runtime/src/test/resources/robotframework/tests/02_policy_queries.robot similarity index 100% rename from src/test/resources/robotframework/tests/02_policy_queries.robot rename to runtime/src/test/resources/robotframework/tests/02_policy_queries.robot diff --git a/src/test/resources/tosca/micro-service-policy-payload.json b/runtime/src/test/resources/tosca/micro-service-policy-payload.json similarity index 100% rename from src/test/resources/tosca/micro-service-policy-payload.json rename to runtime/src/test/resources/tosca/micro-service-policy-payload.json diff --git a/src/test/resources/tosca/micro-service-policy-properties.json b/runtime/src/test/resources/tosca/micro-service-policy-properties.json similarity index 100% rename from src/test/resources/tosca/micro-service-policy-properties.json rename to runtime/src/test/resources/tosca/micro-service-policy-properties.json diff --git a/src/test/resources/tosca/model-properties-cds.json b/runtime/src/test/resources/tosca/model-properties-cds.json similarity index 100% rename from src/test/resources/tosca/model-properties-cds.json rename to runtime/src/test/resources/tosca/model-properties-cds.json diff --git a/src/test/resources/tosca/model-properties-operational-policy.json b/runtime/src/test/resources/tosca/model-properties-operational-policy.json similarity index 100% rename from src/test/resources/tosca/model-properties-operational-policy.json rename to runtime/src/test/resources/tosca/model-properties-operational-policy.json diff --git a/src/test/resources/tosca/model-properties.json b/runtime/src/test/resources/tosca/model-properties.json similarity index 100% rename from src/test/resources/tosca/model-properties.json rename to runtime/src/test/resources/tosca/model-properties.json diff --git a/src/test/resources/tosca/new-converter/constraints.yaml b/runtime/src/test/resources/tosca/new-converter/constraints.yaml similarity index 97% rename from src/test/resources/tosca/new-converter/constraints.yaml rename to runtime/src/test/resources/tosca/new-converter/constraints.yaml index 7a94ca965..b711f35c8 100644 --- a/src/test/resources/tosca/new-converter/constraints.yaml +++ b/runtime/src/test/resources/tosca/new-converter/constraints.yaml @@ -1,60 +1,60 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -policy_types: - onap.policies.controlloop.operational.common.Drools: - derived_from: onap.policies.controlloop.operational.Common - type_version: 1.0.0 - version: 1.0.0 - description: Operational policies for Drools PDP - properties: - controllerName: - type: String - description: Drools controller properties - required: true -data_types: - onap.datatype.controlloop.Operation: - derived_from: tosca.datatypes.Root - description: An operation supported by an actor - properties: - id: - type: String - description: Unique identifier for the operation - required: true - constraints: - - length: 8 - description: - type: Array - description: A user-friendly description of the intent for the operation - required: false - constraints: - - min_length: 5 - - max_length: 7 - test: - type: Integer - description: | - Overall timeout for executing all the operations. This timeout should equal or exceed the total - timeout for each operation listed. - required: true - constraints: - - greater_than: 7 - - greater_or_equal: 1 - - less_than: 7 - - less_or_equal: 1 - timeout: - type: Integer - description: The amount of time for the actor to perform the operation. - required: true - constraints: - - valid_values: [3,4,5.5,6,10] - retries: - type: Integer - description: The number of retries the actor should attempt to perform the operation. - required: true - default: 0 - constraints: - - equal: 5 - success: - type: String - description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation. - required: false - constraints: - - valid_values: [VALID,TERMINATED] +tosca_definitions_version: tosca_simple_yaml_1_0_0 +policy_types: + onap.policies.controlloop.operational.common.Drools: + derived_from: onap.policies.controlloop.operational.Common + type_version: 1.0.0 + version: 1.0.0 + description: Operational policies for Drools PDP + properties: + controllerName: + type: String + description: Drools controller properties + required: true +data_types: + onap.datatype.controlloop.Operation: + derived_from: tosca.datatypes.Root + description: An operation supported by an actor + properties: + id: + type: String + description: Unique identifier for the operation + required: true + constraints: + - length: 8 + description: + type: Array + description: A user-friendly description of the intent for the operation + required: false + constraints: + - min_length: 5 + - max_length: 7 + test: + type: Integer + description: | + Overall timeout for executing all the operations. This timeout should equal or exceed the total + timeout for each operation listed. + required: true + constraints: + - greater_than: 7 + - greater_or_equal: 1 + - less_than: 7 + - less_or_equal: 1 + timeout: + type: Integer + description: The amount of time for the actor to perform the operation. + required: true + constraints: + - valid_values: [3,4,5.5,6,10] + retries: + type: Integer + description: The number of retries the actor should attempt to perform the operation. + required: true + default: 0 + constraints: + - equal: 5 + success: + type: String + description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation. + required: false + constraints: + - valid_values: [VALID,TERMINATED] diff --git a/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml b/runtime/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml similarity index 97% rename from src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml rename to runtime/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml index c2afeccdc..1da17190e 100644 --- a/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml +++ b/runtime/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml @@ -1,160 +1,160 @@ - -tosca_definitions_version: tosca_simple_yaml_1_0_0 -policy_types: - onap.policies.controlloop.operational.Common: - derived_from: tosca.policies.Root - version: 1.0.0 - description: Operational Policy for Control Loop execution - properties: - id: - type: String - description: The unique control loop id. - required: true - timeout: - type: Integer - description: | - Overall timeout for executing all the operations. This timeout should equal or exceed the total - timeout for each operation listed. - required: true - abatement: - type: Boolean - description: Whether an abatement event message will be expected for the control loop from DCAE. - required: true - default: false - trigger: - type: String - description: Initial operation to execute upon receiving an Onset event message for the Control Loop. - required: true - operations: - type: List - description: List of operations to be performed when Control Loop is triggered. - required: true - entry_schema: - type: onap.datatype.controlloop.Operation - onap.policies.controlloop.operational.common.Drools: - derived_from: onap.policies.controlloop.operational.Common - type_version: 1.0.0 - version: 1.0.0 - description: Operational policies for Drools PDP - properties: - controllerName: - type: String - description: Drools controller properties - required: false -data_types: - # TBD if this is needed - onap.datatype.controlloop.operation.Failure: - derived_from: tosca.datatypes.Root - description: Captures information of an operational failure performed for control loop - properties: - messages: - type: String - description: error message - required: true - category: - type: String - description: | - The category the error occurred in. Whether this is a general error from the actor, or the operation - timed out, retries were exhausted in trying to execute the operation, a guard policy prevented the - operation from occuring, or an exception in the system caused the failure. - constraints: - - valid_values: [error, timeout, retries, guard, exception] - onap.datatype.controlloop.Target: - derived_from: tosca.datatypes.Root - description: Definition for a entity in A&AI to perform a control loop operation on - properties: - targetType: - type: String - description: Category for the target type - required: true - constraints: - - valid_values: [VNF, VM, VFMODULE, PNF] - entityIds: - type: Map - description: | - Map of values that identify the resource. If none are provided, it is assumed that the - entity that generated the ONSET event will be the target. - required: false - entry_schema: - type: String - onap.datatype.controlloop.Actor: - derived_from: tosca.datatypes.Root - description: An actor/operation/target definition - properties: - actor: - type: String - description: The actor performing the operation. - required: true - operation: - type: String - description: The operation the actor is performing. - required: true - target: - type: String - description: The resource the operation should be performed on. - required: true - metadata: - clamp_possible_values: - payload: - type: Map - description: Name/value pairs of payload information passed by Policy to the actor - required: false - entry_schema: - type: String - onap.datatype.controlloop.Operation: - derived_from: tosca.datatypes.Root - description: An operation supported by an actor - properties: - id: - type: String - description: Unique identifier for the operation - required: true - description: - type: String - description: A user-friendly description of the intent for the operation - required: false - operation: - type: onap.datatype.controlloop.Actor - description: The definition of the operation to be performed. - required: true - metadata: - clamp_possible_values: - timeout: - type: Integer - description: The amount of time for the actor to perform the operation. - required: true - retries: - type: Integer - description: The number of retries the actor should attempt to perform the operation. - required: true - default: 0 - success: - type: String - description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation. - required: false - default: final_success - failure: - type: String - description: Points to the operation to invoke on Actor operation failure. - required: false - default: final_failure - failure_timeout: - type: String - description: Points to the operation to invoke when the time out for the operation occurs. - required: false - default: final_failure_timeout - failure_retries: - type: String - description: Points to the operation to invoke when the current operation has exceeded its max retries. - required: false - default: final_failure_retries - failure_exception: - type: String - description: Points to the operation to invoke when the current operation causes an exception. - required: false - default: final_failure_exception - failure_guard: - type: String - description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement. - required: false - default: final_failure_guard + +tosca_definitions_version: tosca_simple_yaml_1_0_0 +policy_types: + onap.policies.controlloop.operational.Common: + derived_from: tosca.policies.Root + version: 1.0.0 + description: Operational Policy for Control Loop execution + properties: + id: + type: String + description: The unique control loop id. + required: true + timeout: + type: Integer + description: | + Overall timeout for executing all the operations. This timeout should equal or exceed the total + timeout for each operation listed. + required: true + abatement: + type: Boolean + description: Whether an abatement event message will be expected for the control loop from DCAE. + required: true + default: false + trigger: + type: String + description: Initial operation to execute upon receiving an Onset event message for the Control Loop. + required: true + operations: + type: List + description: List of operations to be performed when Control Loop is triggered. + required: true + entry_schema: + type: onap.datatype.controlloop.Operation + onap.policies.controlloop.operational.common.Drools: + derived_from: onap.policies.controlloop.operational.Common + type_version: 1.0.0 + version: 1.0.0 + description: Operational policies for Drools PDP + properties: + controllerName: + type: String + description: Drools controller properties + required: false +data_types: + # TBD if this is needed + onap.datatype.controlloop.operation.Failure: + derived_from: tosca.datatypes.Root + description: Captures information of an operational failure performed for control loop + properties: + messages: + type: String + description: error message + required: true + category: + type: String + description: | + The category the error occurred in. Whether this is a general error from the actor, or the operation + timed out, retries were exhausted in trying to execute the operation, a guard policy prevented the + operation from occuring, or an exception in the system caused the failure. + constraints: + - valid_values: [error, timeout, retries, guard, exception] + onap.datatype.controlloop.Target: + derived_from: tosca.datatypes.Root + description: Definition for a entity in A&AI to perform a control loop operation on + properties: + targetType: + type: String + description: Category for the target type + required: true + constraints: + - valid_values: [VNF, VM, VFMODULE, PNF] + entityIds: + type: Map + description: | + Map of values that identify the resource. If none are provided, it is assumed that the + entity that generated the ONSET event will be the target. + required: false + entry_schema: + type: String + onap.datatype.controlloop.Actor: + derived_from: tosca.datatypes.Root + description: An actor/operation/target definition + properties: + actor: + type: String + description: The actor performing the operation. + required: true + operation: + type: String + description: The operation the actor is performing. + required: true + target: + type: String + description: The resource the operation should be performed on. + required: true + metadata: + clamp_possible_values: + payload: + type: Map + description: Name/value pairs of payload information passed by Policy to the actor + required: false + entry_schema: + type: String + onap.datatype.controlloop.Operation: + derived_from: tosca.datatypes.Root + description: An operation supported by an actor + properties: + id: + type: String + description: Unique identifier for the operation + required: true + description: + type: String + description: A user-friendly description of the intent for the operation + required: false + operation: + type: onap.datatype.controlloop.Actor + description: The definition of the operation to be performed. + required: true + metadata: + clamp_possible_values: + timeout: + type: Integer + description: The amount of time for the actor to perform the operation. + required: true + retries: + type: Integer + description: The number of retries the actor should attempt to perform the operation. + required: true + default: 0 + success: + type: String + description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation. + required: false + default: final_success + failure: + type: String + description: Points to the operation to invoke on Actor operation failure. + required: false + default: final_failure + failure_timeout: + type: String + description: Points to the operation to invoke when the time out for the operation occurs. + required: false + default: final_failure_timeout + failure_retries: + type: String + description: Points to the operation to invoke when the current operation has exceeded its max retries. + required: false + default: final_failure_retries + failure_exception: + type: String + description: Points to the operation to invoke when the current operation causes an exception. + required: false + default: final_failure_exception + failure_guard: + type: String + description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement. + required: false + default: final_failure_guard diff --git a/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml b/runtime/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml similarity index 100% rename from src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml rename to runtime/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml diff --git a/src/test/resources/tosca/new-converter/tca-with-metadata.json b/runtime/src/test/resources/tosca/new-converter/tca-with-metadata.json similarity index 100% rename from src/test/resources/tosca/new-converter/tca-with-metadata.json rename to runtime/src/test/resources/tosca/new-converter/tca-with-metadata.json diff --git a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json b/runtime/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json similarity index 100% rename from src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json rename to runtime/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json diff --git a/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml b/runtime/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml similarity index 100% rename from src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml rename to runtime/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml diff --git a/src/test/resources/tosca/operational-policy-cds-payload-with-list.json b/runtime/src/test/resources/tosca/operational-policy-cds-payload-with-list.json similarity index 100% rename from src/test/resources/tosca/operational-policy-cds-payload-with-list.json rename to runtime/src/test/resources/tosca/operational-policy-cds-payload-with-list.json diff --git a/src/test/resources/tosca/operational-policy-json-schema.json b/runtime/src/test/resources/tosca/operational-policy-json-schema.json similarity index 100% rename from src/test/resources/tosca/operational-policy-json-schema.json rename to runtime/src/test/resources/tosca/operational-policy-json-schema.json diff --git a/src/test/resources/tosca/operational-policy-no-guard-properties.json b/runtime/src/test/resources/tosca/operational-policy-no-guard-properties.json similarity index 100% rename from src/test/resources/tosca/operational-policy-no-guard-properties.json rename to runtime/src/test/resources/tosca/operational-policy-no-guard-properties.json diff --git a/src/test/resources/tosca/operational-policy-properties.json b/runtime/src/test/resources/tosca/operational-policy-properties.json similarity index 100% rename from src/test/resources/tosca/operational-policy-properties.json rename to runtime/src/test/resources/tosca/operational-policy-properties.json diff --git a/src/test/resources/tosca/resource-details-cds.json b/runtime/src/test/resources/tosca/resource-details-cds.json similarity index 100% rename from src/test/resources/tosca/resource-details-cds.json rename to runtime/src/test/resources/tosca/resource-details-cds.json diff --git a/src/test/resources/tosca/resource-details.json b/runtime/src/test/resources/tosca/resource-details.json similarity index 100% rename from src/test/resources/tosca/resource-details.json rename to runtime/src/test/resources/tosca/resource-details.json diff --git a/src/test/resources/tosca/service-details.json b/runtime/src/test/resources/tosca/service-details.json similarity index 100% rename from src/test/resources/tosca/service-details.json rename to runtime/src/test/resources/tosca/service-details.json diff --git a/src/test/resources/tosca/tca_hi_lo.json b/runtime/src/test/resources/tosca/tca_hi_lo.json similarity index 100% rename from src/test/resources/tosca/tca_hi_lo.json rename to runtime/src/test/resources/tosca/tca_hi_lo.json diff --git a/src/test/resources/tosca/tosca_example.yaml b/runtime/src/test/resources/tosca/tosca_example.yaml similarity index 100% rename from src/test/resources/tosca/tosca_example.yaml rename to runtime/src/test/resources/tosca/tosca_example.yaml diff --git a/src/test/resources/tosca/tosca_with_date_time_json_schema.json b/runtime/src/test/resources/tosca/tosca_with_date_time_json_schema.json similarity index 100% rename from src/test/resources/tosca/tosca_with_date_time_json_schema.json rename to runtime/src/test/resources/tosca/tosca_with_date_time_json_schema.json diff --git a/src/test/resources/tosca/tosca_with_metadata.yaml b/runtime/src/test/resources/tosca/tosca_with_metadata.yaml similarity index 100% rename from src/test/resources/tosca/tosca_with_metadata.yaml rename to runtime/src/test/resources/tosca/tosca_with_metadata.yaml diff --git a/ui-react-lib/libExportExclusions.dat b/runtime/ui-react-lib/libExportExclusions.dat similarity index 100% rename from ui-react-lib/libExportExclusions.dat rename to runtime/ui-react-lib/libExportExclusions.dat diff --git a/ui-react-lib/libIndex.js b/runtime/ui-react-lib/libIndex.js similarity index 100% rename from ui-react-lib/libIndex.js rename to runtime/ui-react-lib/libIndex.js diff --git a/ui-react-lib/package.json b/runtime/ui-react-lib/package.json similarity index 100% rename from ui-react-lib/package.json rename to runtime/ui-react-lib/package.json diff --git a/ui-react-lib/rollup.config.js b/runtime/ui-react-lib/rollup.config.js similarity index 100% rename from ui-react-lib/rollup.config.js rename to runtime/ui-react-lib/rollup.config.js diff --git a/ui-react/package.json b/runtime/ui-react/package.json similarity index 100% rename from ui-react/package.json rename to runtime/ui-react/package.json diff --git a/ui-react/public/index.html b/runtime/ui-react/public/index.html similarity index 100% rename from ui-react/public/index.html rename to runtime/ui-react/public/index.html diff --git a/ui-react/public/manifest.json b/runtime/ui-react/public/manifest.json similarity index 100% rename from ui-react/public/manifest.json rename to runtime/ui-react/public/manifest.json diff --git a/ui-react/public/onap.ico b/runtime/ui-react/public/onap.ico similarity index 100% rename from ui-react/public/onap.ico rename to runtime/ui-react/public/onap.ico diff --git a/ui-react/src/LoopUI.js b/runtime/ui-react/src/LoopUI.js similarity index 100% rename from ui-react/src/LoopUI.js rename to runtime/ui-react/src/LoopUI.js diff --git a/ui-react/src/LoopUI.test.js b/runtime/ui-react/src/LoopUI.test.js similarity index 100% rename from ui-react/src/LoopUI.test.js rename to runtime/ui-react/src/LoopUI.test.js diff --git a/ui-react/src/NotFound.js b/runtime/ui-react/src/NotFound.js similarity index 100% rename from ui-react/src/NotFound.js rename to runtime/ui-react/src/NotFound.js diff --git a/ui-react/src/NotFound.test.js b/runtime/ui-react/src/NotFound.test.js similarity index 100% rename from ui-react/src/NotFound.test.js rename to runtime/ui-react/src/NotFound.test.js diff --git a/ui-react/src/OnapClamp.js b/runtime/ui-react/src/OnapClamp.js similarity index 100% rename from ui-react/src/OnapClamp.js rename to runtime/ui-react/src/OnapClamp.js diff --git a/ui-react/src/OnapClamp.test.js b/runtime/ui-react/src/OnapClamp.test.js similarity index 100% rename from ui-react/src/OnapClamp.test.js rename to runtime/ui-react/src/OnapClamp.test.js diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/runtime/ui-react/src/__snapshots__/LoopUI.test.js.snap similarity index 100% rename from ui-react/src/__snapshots__/LoopUI.test.js.snap rename to runtime/ui-react/src/__snapshots__/LoopUI.test.js.snap diff --git a/ui-react/src/__snapshots__/NotFound.test.js.snap b/runtime/ui-react/src/__snapshots__/NotFound.test.js.snap similarity index 100% rename from ui-react/src/__snapshots__/NotFound.test.js.snap rename to runtime/ui-react/src/__snapshots__/NotFound.test.js.snap diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/runtime/ui-react/src/__snapshots__/OnapClamp.test.js.snap similarity index 100% rename from ui-react/src/__snapshots__/OnapClamp.test.js.snap rename to runtime/ui-react/src/__snapshots__/OnapClamp.test.js.snap diff --git a/ui-react/src/api/LoopActionService.js b/runtime/ui-react/src/api/LoopActionService.js similarity index 100% rename from ui-react/src/api/LoopActionService.js rename to runtime/ui-react/src/api/LoopActionService.js diff --git a/ui-react/src/api/LoopCache.js b/runtime/ui-react/src/api/LoopCache.js similarity index 100% rename from ui-react/src/api/LoopCache.js rename to runtime/ui-react/src/api/LoopCache.js diff --git a/ui-react/src/api/LoopCache.test.js b/runtime/ui-react/src/api/LoopCache.test.js similarity index 100% rename from ui-react/src/api/LoopCache.test.js rename to runtime/ui-react/src/api/LoopCache.test.js diff --git a/ui-react/src/api/LoopCacheMockFile.json b/runtime/ui-react/src/api/LoopCacheMockFile.json similarity index 100% rename from ui-react/src/api/LoopCacheMockFile.json rename to runtime/ui-react/src/api/LoopCacheMockFile.json diff --git a/ui-react/src/api/LoopService.js b/runtime/ui-react/src/api/LoopService.js similarity index 100% rename from ui-react/src/api/LoopService.js rename to runtime/ui-react/src/api/LoopService.js diff --git a/ui-react/src/api/PoliciesListCacheMockFile.json b/runtime/ui-react/src/api/PoliciesListCacheMockFile.json similarity index 100% rename from ui-react/src/api/PoliciesListCacheMockFile.json rename to runtime/ui-react/src/api/PoliciesListCacheMockFile.json diff --git a/ui-react/src/api/PolicyService.js b/runtime/ui-react/src/api/PolicyService.js similarity index 100% rename from ui-react/src/api/PolicyService.js rename to runtime/ui-react/src/api/PolicyService.js diff --git a/ui-react/src/api/PolicyToscaService.js b/runtime/ui-react/src/api/PolicyToscaService.js similarity index 100% rename from ui-react/src/api/PolicyToscaService.js rename to runtime/ui-react/src/api/PolicyToscaService.js diff --git a/ui-react/src/api/TemplateService.js b/runtime/ui-react/src/api/TemplateService.js similarity index 100% rename from ui-react/src/api/TemplateService.js rename to runtime/ui-react/src/api/TemplateService.js diff --git a/ui-react/src/api/UserService.js b/runtime/ui-react/src/api/UserService.js similarity index 100% rename from ui-react/src/api/UserService.js rename to runtime/ui-react/src/api/UserService.js diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js b/runtime/ui-react/src/components/dialogs/Loop/CreateLoopModal.js similarity index 100% rename from ui-react/src/components/dialogs/Loop/CreateLoopModal.js rename to runtime/ui-react/src/components/dialogs/Loop/CreateLoopModal.js diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js b/runtime/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js similarity index 100% rename from ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js rename to runtime/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js b/runtime/ui-react/src/components/dialogs/Loop/DeployLoopModal.js similarity index 100% rename from ui-react/src/components/dialogs/Loop/DeployLoopModal.js rename to runtime/ui-react/src/components/dialogs/Loop/DeployLoopModal.js diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js b/runtime/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js similarity index 100% rename from ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js rename to runtime/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js diff --git a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js b/runtime/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js similarity index 100% rename from ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js rename to runtime/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js diff --git a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.test.js b/runtime/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.test.js similarity index 100% rename from ui-react/src/components/dialogs/Loop/LoopPropertiesModal.test.js rename to runtime/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.test.js diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js b/runtime/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js similarity index 100% rename from ui-react/src/components/dialogs/Loop/ModifyLoopModal.js rename to runtime/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.test.js b/runtime/ui-react/src/components/dialogs/Loop/ModifyLoopModal.test.js similarity index 100% rename from ui-react/src/components/dialogs/Loop/ModifyLoopModal.test.js rename to runtime/ui-react/src/components/dialogs/Loop/ModifyLoopModal.test.js diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js b/runtime/ui-react/src/components/dialogs/Loop/OpenLoopModal.js similarity index 100% rename from ui-react/src/components/dialogs/Loop/OpenLoopModal.js rename to runtime/ui-react/src/components/dialogs/Loop/OpenLoopModal.js diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js b/runtime/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js similarity index 100% rename from ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js rename to runtime/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap b/runtime/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap similarity index 100% rename from ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap rename to runtime/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap b/runtime/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap similarity index 100% rename from ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap rename to runtime/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap b/runtime/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap similarity index 100% rename from ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap rename to runtime/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap b/runtime/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap similarity index 100% rename from ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap rename to runtime/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/runtime/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js similarity index 100% rename from ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js rename to runtime/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js b/runtime/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js similarity index 100% rename from ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js rename to runtime/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js diff --git a/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap b/runtime/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap similarity index 100% rename from ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap rename to runtime/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap diff --git a/ui-react/src/components/dialogs/PerformActions.js b/runtime/ui-react/src/components/dialogs/PerformActions.js similarity index 100% rename from ui-react/src/components/dialogs/PerformActions.js rename to runtime/ui-react/src/components/dialogs/PerformActions.js diff --git a/ui-react/src/components/dialogs/PerformActions.test.js b/runtime/ui-react/src/components/dialogs/PerformActions.test.js similarity index 100% rename from ui-react/src/components/dialogs/PerformActions.test.js rename to runtime/ui-react/src/components/dialogs/PerformActions.test.js diff --git a/ui-react/src/components/dialogs/Policy/PoliciesTreeViewer.js b/runtime/ui-react/src/components/dialogs/Policy/PoliciesTreeViewer.js similarity index 100% rename from ui-react/src/components/dialogs/Policy/PoliciesTreeViewer.js rename to runtime/ui-react/src/components/dialogs/Policy/PoliciesTreeViewer.js diff --git a/ui-react/src/components/dialogs/Policy/PolicyDeploymentEditor.js b/runtime/ui-react/src/components/dialogs/Policy/PolicyDeploymentEditor.js similarity index 100% rename from ui-react/src/components/dialogs/Policy/PolicyDeploymentEditor.js rename to runtime/ui-react/src/components/dialogs/Policy/PolicyDeploymentEditor.js diff --git a/ui-react/src/components/dialogs/Policy/PolicyEditor.js b/runtime/ui-react/src/components/dialogs/Policy/PolicyEditor.js similarity index 100% rename from ui-react/src/components/dialogs/Policy/PolicyEditor.js rename to runtime/ui-react/src/components/dialogs/Policy/PolicyEditor.js diff --git a/ui-react/src/components/dialogs/Policy/PolicyEditor.test.js b/runtime/ui-react/src/components/dialogs/Policy/PolicyEditor.test.js similarity index 100% rename from ui-react/src/components/dialogs/Policy/PolicyEditor.test.js rename to runtime/ui-react/src/components/dialogs/Policy/PolicyEditor.test.js diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/runtime/ui-react/src/components/dialogs/Policy/PolicyModal.js similarity index 100% rename from ui-react/src/components/dialogs/Policy/PolicyModal.js rename to runtime/ui-react/src/components/dialogs/Policy/PolicyModal.js diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js b/runtime/ui-react/src/components/dialogs/Policy/PolicyModal.test.js similarity index 100% rename from ui-react/src/components/dialogs/Policy/PolicyModal.test.js rename to runtime/ui-react/src/components/dialogs/Policy/PolicyModal.test.js diff --git a/ui-react/src/components/dialogs/Policy/PolicyToscaFileSelector.js b/runtime/ui-react/src/components/dialogs/Policy/PolicyToscaFileSelector.js similarity index 100% rename from ui-react/src/components/dialogs/Policy/PolicyToscaFileSelector.js rename to runtime/ui-react/src/components/dialogs/Policy/PolicyToscaFileSelector.js diff --git a/ui-react/src/components/dialogs/Policy/ToscaViewer.js b/runtime/ui-react/src/components/dialogs/Policy/ToscaViewer.js similarity index 100% rename from ui-react/src/components/dialogs/Policy/ToscaViewer.js rename to runtime/ui-react/src/components/dialogs/Policy/ToscaViewer.js diff --git a/ui-react/src/components/dialogs/Policy/ToscaViewer.test.js b/runtime/ui-react/src/components/dialogs/Policy/ToscaViewer.test.js similarity index 100% rename from ui-react/src/components/dialogs/Policy/ToscaViewer.test.js rename to runtime/ui-react/src/components/dialogs/Policy/ToscaViewer.test.js diff --git a/ui-react/src/components/dialogs/Policy/ViewAllPolicies.js b/runtime/ui-react/src/components/dialogs/Policy/ViewAllPolicies.js similarity index 100% rename from ui-react/src/components/dialogs/Policy/ViewAllPolicies.js rename to runtime/ui-react/src/components/dialogs/Policy/ViewAllPolicies.js diff --git a/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyEditor.test.js.snap b/runtime/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyEditor.test.js.snap similarity index 100% rename from ui-react/src/components/dialogs/Policy/__snapshots__/PolicyEditor.test.js.snap rename to runtime/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyEditor.test.js.snap diff --git a/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyModal.test.js.snap b/runtime/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyModal.test.js.snap similarity index 100% rename from ui-react/src/components/dialogs/Policy/__snapshots__/PolicyModal.test.js.snap rename to runtime/ui-react/src/components/dialogs/Policy/__snapshots__/PolicyModal.test.js.snap diff --git a/ui-react/src/components/dialogs/Policy/__snapshots__/ToscaViewer.test.js.snap b/runtime/ui-react/src/components/dialogs/Policy/__snapshots__/ToscaViewer.test.js.snap similarity index 100% rename from ui-react/src/components/dialogs/Policy/__snapshots__/ToscaViewer.test.js.snap rename to runtime/ui-react/src/components/dialogs/Policy/__snapshots__/ToscaViewer.test.js.snap diff --git a/ui-react/src/components/dialogs/Policy/toscaData.test.json b/runtime/ui-react/src/components/dialogs/Policy/toscaData.test.json similarity index 100% rename from ui-react/src/components/dialogs/Policy/toscaData.test.json rename to runtime/ui-react/src/components/dialogs/Policy/toscaData.test.json diff --git a/ui-react/src/components/dialogs/Policy/toscaData.test.yaml b/runtime/ui-react/src/components/dialogs/Policy/toscaData.test.yaml similarity index 100% rename from ui-react/src/components/dialogs/Policy/toscaData.test.yaml rename to runtime/ui-react/src/components/dialogs/Policy/toscaData.test.yaml diff --git a/ui-react/src/components/dialogs/RefreshStatus.js b/runtime/ui-react/src/components/dialogs/RefreshStatus.js similarity index 100% rename from ui-react/src/components/dialogs/RefreshStatus.js rename to runtime/ui-react/src/components/dialogs/RefreshStatus.js diff --git a/ui-react/src/components/dialogs/RefreshStatus.test.js b/runtime/ui-react/src/components/dialogs/RefreshStatus.test.js similarity index 100% rename from ui-react/src/components/dialogs/RefreshStatus.test.js rename to runtime/ui-react/src/components/dialogs/RefreshStatus.test.js diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js b/runtime/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js similarity index 100% rename from ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js rename to runtime/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js b/runtime/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js similarity index 100% rename from ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js rename to runtime/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap b/runtime/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap similarity index 100% rename from ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap rename to runtime/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap diff --git a/ui-react/src/components/dialogs/UserInfoModal.js b/runtime/ui-react/src/components/dialogs/UserInfoModal.js similarity index 100% rename from ui-react/src/components/dialogs/UserInfoModal.js rename to runtime/ui-react/src/components/dialogs/UserInfoModal.js diff --git a/ui-react/src/components/dialogs/UserInfoModal.test.js b/runtime/ui-react/src/components/dialogs/UserInfoModal.test.js similarity index 100% rename from ui-react/src/components/dialogs/UserInfoModal.test.js rename to runtime/ui-react/src/components/dialogs/UserInfoModal.test.js diff --git a/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap b/runtime/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap similarity index 100% rename from ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap rename to runtime/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.js b/runtime/ui-react/src/components/loop_viewer/logs/LoopLogs.js similarity index 100% rename from ui-react/src/components/loop_viewer/logs/LoopLogs.js rename to runtime/ui-react/src/components/loop_viewer/logs/LoopLogs.js diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js b/runtime/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js similarity index 100% rename from ui-react/src/components/loop_viewer/logs/LoopLogs.test.js rename to runtime/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js diff --git a/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap b/runtime/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap similarity index 100% rename from ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap rename to runtime/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap diff --git a/ui-react/src/components/loop_viewer/status/LoopStatus.js b/runtime/ui-react/src/components/loop_viewer/status/LoopStatus.js similarity index 100% rename from ui-react/src/components/loop_viewer/status/LoopStatus.js rename to runtime/ui-react/src/components/loop_viewer/status/LoopStatus.js diff --git a/ui-react/src/components/loop_viewer/status/LoopStatus.test.js b/runtime/ui-react/src/components/loop_viewer/status/LoopStatus.test.js similarity index 100% rename from ui-react/src/components/loop_viewer/status/LoopStatus.test.js rename to runtime/ui-react/src/components/loop_viewer/status/LoopStatus.test.js diff --git a/ui-react/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap b/runtime/ui-react/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap similarity index 100% rename from ui-react/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap rename to runtime/ui-react/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap diff --git a/ui-react/src/components/loop_viewer/svg/SvgGenerator.js b/runtime/ui-react/src/components/loop_viewer/svg/SvgGenerator.js similarity index 100% rename from ui-react/src/components/loop_viewer/svg/SvgGenerator.js rename to runtime/ui-react/src/components/loop_viewer/svg/SvgGenerator.js diff --git a/ui-react/src/components/menu/MenuBar.js b/runtime/ui-react/src/components/menu/MenuBar.js similarity index 100% rename from ui-react/src/components/menu/MenuBar.js rename to runtime/ui-react/src/components/menu/MenuBar.js diff --git a/ui-react/src/components/menu/MenuBar.test.js b/runtime/ui-react/src/components/menu/MenuBar.test.js similarity index 100% rename from ui-react/src/components/menu/MenuBar.test.js rename to runtime/ui-react/src/components/menu/MenuBar.test.js diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/runtime/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap similarity index 100% rename from ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap rename to runtime/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap diff --git a/ui-react/src/index.js b/runtime/ui-react/src/index.js similarity index 100% rename from ui-react/src/index.js rename to runtime/ui-react/src/index.js diff --git a/ui-react/src/logo.png b/runtime/ui-react/src/logo.png similarity index 100% rename from ui-react/src/logo.png rename to runtime/ui-react/src/logo.png diff --git a/ui-react/src/setupTests.js b/runtime/ui-react/src/setupTests.js similarity index 100% rename from ui-react/src/setupTests.js rename to runtime/ui-react/src/setupTests.js diff --git a/ui-react/src/theme/globalStyle.js b/runtime/ui-react/src/theme/globalStyle.js similarity index 100% rename from ui-react/src/theme/globalStyle.js rename to runtime/ui-react/src/theme/globalStyle.js diff --git a/ui-react/src/utils/CsvToJson.js b/runtime/ui-react/src/utils/CsvToJson.js similarity index 100% rename from ui-react/src/utils/CsvToJson.js rename to runtime/ui-react/src/utils/CsvToJson.js diff --git a/ui-react/src/utils/CsvToJson.test.js b/runtime/ui-react/src/utils/CsvToJson.test.js similarity index 100% rename from ui-react/src/utils/CsvToJson.test.js rename to runtime/ui-react/src/utils/CsvToJson.test.js diff --git a/ui-react/src/utils/OnapConstants.js b/runtime/ui-react/src/utils/OnapConstants.js similarity index 100% rename from ui-react/src/utils/OnapConstants.js rename to runtime/ui-react/src/utils/OnapConstants.js diff --git a/ui-react/src/utils/OnapUtils.js b/runtime/ui-react/src/utils/OnapUtils.js similarity index 100% rename from ui-react/src/utils/OnapUtils.js rename to runtime/ui-react/src/utils/OnapUtils.js diff --git a/version.properties b/version.properties index 6b0d72384..063474d7e 100644 --- a/version.properties +++ b/version.properties @@ -27,10 +27,10 @@ major=6 minor=1 -patch=1 +patch=2 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT \ No newline at end of file +snapshot_version=${base_version}-SNAPSHOT -- 2.16.6