Fix the new tosca converter 40/103640/7
authorsebdet <sebastien.determe@intl.att.com>
Thu, 12 Mar 2020 21:38:07 +0000 (14:38 -0700)
committersebdet <sebastien.determe@intl.att.com>
Fri, 13 Mar 2020 18:03:29 +0000 (11:03 -0700)
commit723de7f63f0951d0cfe7a23956cf9d00128809b1
tree751562c9a0c9a885f6be143c12a6c85472519afb
parent774b4ba65f0d23ae34d3bddb63058796121c1ae3
Fix the new tosca converter

Fix the metadata section analysis and make the tosca parser more configurable (in applications.properties)

Issue-ID: CLAMP-580
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I9068bd9dc89861c640660a7f78fae2cb70bdc178
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
57 files changed:
docs/swagger/swagger.json
docs/swagger/swagger.pdf
extra/sql/dump/test-data.sql
src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterManager.java [deleted file]
src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java [new file with mode: 0644]
src/main/java/org/onap/clamp/clds/tosca/update/elements/ArrayField.java [moved from src/main/java/org/onap/clamp/clds/tosca/update/ArrayField.java with 95% similarity]
src/main/java/org/onap/clamp/clds/tosca/update/elements/Constraint.java [moved from src/main/java/org/onap/clamp/clds/tosca/update/Constraint.java with 93% similarity]
src/main/java/org/onap/clamp/clds/tosca/update/elements/ToscaElement.java [moved from src/main/java/org/onap/clamp/clds/tosca/update/ToscaElement.java with 87% similarity]
src/main/java/org/onap/clamp/clds/tosca/update/elements/ToscaElementProperty.java [moved from src/main/java/org/onap/clamp/clds/tosca/update/Property.java with 92% similarity]
src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java [moved from src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterToJson.java with 61% similarity]
src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaElementParser.java [moved from src/main/java/org/onap/clamp/clds/tosca/update/ToscaItemsParser.java with 76% similarity]
src/main/java/org/onap/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java [moved from src/main/java/org/onap/clamp/clds/tosca/update/MetadataParser.java with 57% similarity]
src/main/java/org/onap/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java [new file with mode: 0644]
src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplate.java [moved from src/main/java/org/onap/clamp/clds/tosca/update/Template.java with 65% similarity]
src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplateField.java [moved from src/main/java/org/onap/clamp/clds/tosca/update/TemplateField.java with 68% similarity]
src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplateManager.java [new file with mode: 0644]
src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java
src/main/java/org/onap/clamp/loop/Loop.java
src/main/java/org/onap/clamp/loop/LoopController.java
src/main/java/org/onap/clamp/loop/LoopService.java
src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java
src/main/java/org/onap/clamp/loop/service/Service.java
src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
src/main/java/org/onap/clamp/policy/Policy.java
src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
src/main/resources/META-INF/resources/swagger.html
src/main/resources/application-noaaf.properties
src/main/resources/application.properties
src/main/resources/clds/tosca-converter/default-tosca-types.yaml [moved from src/main/resources/clds/tosca_update/default-tosca-types.yaml with 100% similarity]
src/main/resources/clds/tosca-converter/templates.json [moved from src/main/resources/clds/tosca_update/templates.json with 100% similarity]
src/test/java/org/onap/clamp/clds/config/CldsUserJsonDecoderTest.java
src/test/java/org/onap/clamp/clds/it/config/CldsReferencePropertiesItCase.java
src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java
src/test/java/org/onap/clamp/clds/tosca/update/ArrayFieldTest.java
src/test/java/org/onap/clamp/clds/tosca/update/ConstraintTest.java
src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java [moved from src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterManagerTest.java with 61% similarity]
src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateTest.java [moved from src/test/java/org/onap/clamp/clds/tosca/update/TemplateTest.java with 66% similarity]
src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java [new file with mode: 0644]
src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementPropertyTest.java [moved from src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java with 60% similarity]
src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementTest.java
src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java
src/test/java/org/onap/clamp/clds/util/drawing/SvgLoopGeneratorTest.java
src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
src/test/java/org/onap/clamp/policy/microservice/MicroServicePayloadTest.java
src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
src/test/java/org/onap/clamp/util/SemanticVersioningTest.java
src/test/resources/application.properties
src/test/resources/clds/camel/rest/clamp-api-v2.xml [deleted file]
src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file
src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file
src/test/resources/tosca/new-converter/tca-with-metadata.json [new file with mode: 0644]
src/test/resources/tosca/new-converter/tca-with-metadata.yaml [new file with mode: 0644]