Code Review / sdc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 751ac4b) | patch
Update node and data types for SOL001 3.3.1 + CNF enhancements 59/117859/5
authorMichaelMorris <michael.morris@est.tech>
Fri, 5 Feb 2021 16:18:52 +0000 (16:18 +0000)
committerChristophe Closset <christophe.closset@intl.att.com>
Sun, 21 Feb 2021 07:55:36 +0000 (07:55 +0000)
commit8cc03e2c78639be5500ab50f3ebaaf7d64404775
tree1c4d82ba477c4de058f8817b717deaa2f3f4e877tree | snapshot
parent751ac4b93e575c56e29cdbbcf95e0aa899d914a2commit | diff
Update node and data types for SOL001 3.3.1 + CNF enhancements

Types in 2.7.1 folder are types valid for v3.3.1 that have not changed from v2.7.1
Types in 4.1.1 folder are the CNF enhancements which it is assumed will be in v4.1.1

Includes some changes in functionality to support:
1. Deployment of both existing (2.5.1) versions of types and new versions of types through sdc-BE-init
2. Selection of the correct node type definition version at onboarding of an ETSI SOL004 VNF/CNF csar,
based on the declared version supported in the csar (i.e. when a 3.3.1 csar is imported, the node type
definitions valid for 3.3.1 are used (rather than current logic which always selects the latest version)

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-3470
Change-Id: Iff835d230b173b9d44349caa6b0b11d783e8f8d3
42 files changed:
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypeImportManager.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java diff | blob | history
catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml diff | blob | history
catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCompute/vduCompute.json [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCompute/vduCompute.yml [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCp/vduCp.json [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduCp/vduCp.yml [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduVirtualFileStorage/vduVirtualFileStorage.json [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vduVirtualFileStorage/vduVirtualFileStorage.yml [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vipCp/vipCp.json [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vipCp/vipCp.yml [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vnfExtCp/vnfExtCp.json [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/2.7.1/vnfExtCp/vnfExtCp.yml [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/VNF/VNF.json [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/VNF/VNF.yml [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/vduVirtualBlockStorage/vduVirtualBlockStorage.json [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/3.3.1/vduVirtualBlockStorage/vduVirtualBlockStorage.yml [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/VNF/VNF.json [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/VNF/VNF.yml [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainer/osContainer.json [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainer/osContainer.yml [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainerGroup/osContainerGroup.json [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/osContainerGroup/osContainerGroup.yml [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/virtualCp/virtualCp.json [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/virtualCp/virtualCp.yml [new file with mode: 0644] blob
catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml diff | blob | history
catalog-be/src/main/resources/scripts/sdcBePy/common/normative/toscaTypes.py diff | blob | history
catalog-be/src/main/resources/scripts/sdcBePy/tosca/data/onapTypesToUpgrade.json diff | blob | history
catalog-be/src/main/resources/scripts/sdcBePy/tosca/imports/runNormativeType.py diff | blob | history
catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeToUpdateList.py diff | blob | history
catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py diff | blob | history
catalog-be/src/main/resources/scripts/sdcBePy/tosca/upgrade/run.py diff | blob | history
catalog-be/src/main/resources/scripts/sdcBePy/tosca/upgrade/runUpgradeNormative.py diff | blob | history
catalog-be/src/main/resources/scripts/setup.py diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/components/ResourceImportManagerTest.java diff | blob | history
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDao.java diff | blob | history
catalog-model/pom.xml diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ByToscaNameDerivedNodeTypeResolver.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTypeOperation.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacade.java diff | blob | history
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java diff | blob | history
SDC Parent Project Catalog FE and BE