R2 model updates 81/48181/9
authordekstroza <dejan.kitic@ericsson.com>
Fri, 18 May 2018 14:23:12 +0000 (15:23 +0100)
committerMichael Lando <ml636r@att.com>
Sun, 27 May 2018 20:13:27 +0000 (23:13 +0300)
commitcb72310ab92091c47502f7e3c1bf2162884dca83
treecfd6fbf0abf585c35f16dd72380a703cbdc13e8b
parenta4d6b57e6b8babca1007680fa51fa38f2eccf536
R2 model updates

All model verification changes and updated in single patch.

Change-Id: Ie794dc141400490bf1a858a8d6c9d1c45e5b9443
Issue-ID: SDC-1253
Signed-off-by: Michael Lando <ml636r@att.com>
83 files changed:
catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.yml
catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip
catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml
catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip
catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip
catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.yml
catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip
catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.json [moved from catalog-be/src/main/resources/import/tosca/onap-types/VDU/VDU.json with 68% similarity]
catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.yml [new file with mode: 0644]
catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.zip [new file with mode: 0644]
catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.json [moved from catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.json with 61% similarity]
catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.yml [new file with mode: 0644]
catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.zip [new file with mode: 0644]
catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml
catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.zip
catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.json [moved from catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.json with 64% similarity]
catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml [new file with mode: 0644]
catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip [new file with mode: 0644]
catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.yml [deleted file]
catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.zip [deleted file]
catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml
catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.zip
catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.json [moved from catalog-be/src/main/resources/import/tosca/onap-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.json with 55% similarity]
catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.yml [new file with mode: 0644]
catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.zip [new file with mode: 0644]
catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.json [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.yml [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.zip [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/VDU/VDU.yml [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/VDU/VDU.zip [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.json [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.yml [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.zip [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extLocalStorage/extLocalStorage.json [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extLocalStorage/extLocalStorage.yml [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extLocalStorage/extLocalStorage.zip [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.yml [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.zip [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.json [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.yml [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.zip [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/vduCompute/vduCompute.json [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/vduCompute/vduCompute.yml [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/vduCompute/vduCompute.zip [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.json [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.json [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.yml [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.zip [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.yml [deleted file]
catalog-be/src/main/resources/import/tosca/onap-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.zip [deleted file]
catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip
catalog-be/src/main/resources/scripts/import/tosca/importNfvTypes.py
common/onap-tosca-datatype/src/main/resources/globalTypes/onap/_index.yml
common/onap-tosca-datatype/src/main/resources/globalTypes/onap/artifacts.yml [new file with mode: 0644]
common/onap-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml
common/onap-tosca-datatype/src/main/resources/globalTypes/onap/data.yml
common/onap-tosca-datatype/src/main/resources/globalTypes/onap/interfaces.yml [new file with mode: 0644]
common/onap-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml
common/onap-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java
openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/converter/impl/ToscaConvertorDefinitionsTest.java
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vPCRF.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vPCRF_aligned_fixed.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vSPGW.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/Huawei_vSPGW_fixed.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/ZteEpcSpgwVf-csar.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/ZteEpcSpgwVf.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/cscf_si.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/cscf_si_fixed.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vCSCF.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vCSCF_aligned.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vCSCF_v3.0.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vSBC.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vSBC_aligned.csar [deleted file]
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs/vSBC_update_v03.csar [new file with mode: 0644]
utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb