summaryrefslogtreecommitdiffstats
path: root/asdc-tests/src/test/resources/CI/importResourceTests
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-02-19 10:28:42 +0200
committerMichael Lando <ml636r@att.com>2017-02-19 10:51:01 +0200
commit451a3400b76511393c62a444f588a4ed15f4a549 (patch)
treee4f5873a863d1d3e55618eab48b83262f874719d /asdc-tests/src/test/resources/CI/importResourceTests
parent5abfe4e1fb5fae4bbd5fbc340519f52075aff3ff (diff)
Initial OpenECOMP SDC commit
Change-Id: I0924d5a6ae9cdc161ae17c68d3689a30d10f407b Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'asdc-tests/src/test/resources/CI/importResourceTests')
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/VSPPackage.csarbin0 -> 26339 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/caseSensitiveTest_1.csarbin0 -> 1316 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/caseSensitiveTest_2.csarbin0 -> 1316 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/csars.zipbin0 -> 34892 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/fiveLinesAsBlock0.csarbin0 -> 1325 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion.csarbin0 -> 1317 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion2.csarbin0 -> 1315 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion3.csarbin0 -> 1317 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion4.csarbin0 -> 1317 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion5.csarbin0 -> 1319 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile1.csarbin0 -> 1322 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile2.csarbin0 -> 1322 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile3.csarbin0 -> 1319 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile4.csarbin0 -> 1319 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile5.csarbin0 -> 1319 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/missingEntryDefintionPair.csarbin0 -> 1285 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/missingOneLineInToscaMeta.csarbin0 -> 1295 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/mock_vf.csarbin0 -> 1316 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/mock_vf2.csarbin0 -> 1314 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/moreThanOneMetaFile.csarbin0 -> 1808 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/moreThenOneYamlFile.csarbin0 -> 2470 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/noCSARVersion.csarbin0 -> 1316 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/noCreatedByValue.csarbin0 -> 1304 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/noEntryDefinitionsValue.csarbin0 -> 1296 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/noNewLineAfterBLock0.csarbin0 -> 1316 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/noTOSCAMetaFileVersionValue.csarbin0 -> 1315 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/notContainYamlAndMetaFiles.csarbin0 -> 490 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/notContainYamlFile.csarbin0 -> 757 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/someValueAfterBlock0.csarbin0 -> 1322 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaFolderNotExists.csarbin0 -> 907 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaMetaFileNotExists.csarbin0 -> 1049 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaMetaOutsideTheFolder.csarbin0 -> 1286 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/underscoreInsteadOfDash.csarbin0 -> 1316 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/validCsarVersion.csarbin0 -> 1320 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/valid_vf.csarbin0 -> 1316 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/valid_vf_zip.zipbin0 -> 1316 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_category/empty_category.json22
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_category/normative-types-new-empty_category.yml16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_category/normative-types-new-empty_category.zipbin0 -> 394 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/empty_contact.json22
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/normative-types-new-empty_contact.yml18
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/normative-types-new-empty_contact.zipbin0 -> 445 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/empty_desc.json22
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/normative-types-new-empty_desc.yml16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/normative-types-new-empty_desc.zipbin0 -> 386 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/empty_icon.json22
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/normative-types-new-empty_icon.yml16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/normative-types-new-empty_icon.zipbin0 -> 386 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/empty_payloadName.json22
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/normative-types-new-empty_payloadName.yml16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/normative-types-new-empty_payloadName.zipbin0 -> 400 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/empty_resource_name.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/normative-types-new-empty_resource_name.yml18
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/normative-types-new-empty_resource_name.zipbin0 -> 456 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/empty_tag.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/normative-types-new-empty_tag.yml18
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/normative-types-new-empty_tag.zipbin0 -> 436 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/import _multiple_tags.json18
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/normative-types-new-import _multiple_tags.yml16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/normative-types-new-import _multiple_tags.zipbin0 -> 408 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/importResource4test.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/normative-types-new-importResource4test.yml30
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/normative-types-new-importResource4test.zipbin0 -> 630 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/importResource4testCP.json17
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/normative-types-new-importResource4testCP.yml30
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/normative-types-new-importResource4testCP.zipbin0 -> 637 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/importResource4testMissingNameSpace.json17
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/normative-types-new-importResource4testMissingNameSpace.yml30
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/normative-types-new-importResource4testMissingNameSpace.zipbin0 -> 662 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/importResource4testUnknown.json17
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/normative-types-new-importResource4testUnknown.yml30
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/normative-types-new-importResource4testUnknown.zipbin0 -> 651 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/importResource4testUpdateVendorNameAndCategory.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/normative-types-new-importResource4testUpdateVendorNameAndCategory.yml12
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/normative-types-new-importResource4testUpdateVendorNameAndCategory.zipbin0 -> 447 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/importResource4testUpdateWithoutReqCap.json17
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/normative-types-new-importResource4testUpdateWithoutReqCap.yml12
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/normative-types-new-importResource4testUpdateWithoutReqCap.zipbin0 -> 460 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/importResource4testVF.json17
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/normative-types-new-importResource4testVF.yml30
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/normative-types-new-importResource4testVF.zipbin0 -> 637 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/importResource4testVFC.json17
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/normative-types-new-importResource4testVFC.yml30
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/normative-types-new-importResource4testVFC.zipbin0 -> 641 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/importResource4testVL.json17
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/normative-types-new-importResource4testVL.yml30
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/normative-types-new-importResource4testVL.zipbin0 -> 637 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypes.yml141
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypes.zipbin0 -> 979 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi.zipbin0 -> 990 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi_MissingDerivedFrom.yml132
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi_WithoutRoot.yml141
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_category/missing_category.json12
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_category/normative-types-new-missing_category.yml18
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_category/normative-types-new-missing_category.zipbin0 -> 450 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/missing_contact.json21
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/normative-types-new-missing_contact.yml18
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/normative-types-new-missing_contact.zipbin0 -> 449 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/missing_derived_from.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/normative-types-new-missing_derived_from.yml15
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/normative-types-new-missing_derived_from.zipbin0 -> 391 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/missing_desc.json15
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/normative-types-new-missing_desc.yml18
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/normative-types-new-missing_desc.zipbin0 -> 442 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/missing_icon.json15
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/normative-types-new-missing_icon.yml18
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/normative-types-new-missing_icon.zipbin0 -> 442 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/missing_payloadName.json15
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/normative-types-new-missing_payloadName.yml18
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/normative-types-new-missing_payloadName.zipbin0 -> 456 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/missing_resource_name.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/normative-types-new-missing_resource_name.yml18
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/normative-types-new-missing_resource_name.zipbin0 -> 460 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/missing_tags.json15
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/normative-types-new-missing_tags.yml18
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/normative-types-new-missing_tags.zipbin0 -> 442 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/myCompute/myCompute.json24
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.yml35
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.zipbin0 -> 567 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/normative-types-new-portInvalidDefaultValue.yml29
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/normative-types-new-portInvalidDefaultValue.zipbin0 -> 470 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/portInvalidDefaultValue.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/userCompute/normative-types-new-userCompute.yml35
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/userCompute/normative-types-new-userCompute.zipbin0 -> 610 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/userCompute/userCompute.json26
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/normative-types-new-userUpdateCompute.yml29
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/normative-types-new-userUpdateCompute.zipbin0 -> 580 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/userUpdateCompute.json22
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/normative-types-new-validateProporties_happyScenarios.yml39
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/normative-types-new-validateProporties_happyScenarios.zipbin0 -> 591 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/validateProporties_happyScenarios.json14
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/normative-types-new-validateProporties_typeBoolean_valueInit.yml21
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/normative-types-new-validateProporties_typeBoolean_valueInit.zipbin0 -> 578 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/validateProporties_typeBoolean_valueInit.json14
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/normative-types-new-validateProporties_typeBoolean_valueString.yml21
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/normative-types-new-validateProporties_typeBoolean_valueString.zipbin0 -> 579 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/validateProporties_typeBoolean_valueString.json14
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/normative-types-new-validateProporties_typeFloat_valueBoolean.yml21
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/normative-types-new-validateProporties_typeFloat_valueBoolean.zipbin0 -> 575 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/validateProporties_typeFloat_valueBoolean.json14
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/normative-types-new-validateProporties_typeFloat_valueString.yml21
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/normative-types-new-validateProporties_typeFloat_valueString.zipbin0 -> 574 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/validateProporties_typeFloat_valueString.json14
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/normative-types-new-validateProporties_typeInit_valueBoolean.yml21
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/normative-types-new-validateProporties_typeInit_valueBoolean.zipbin0 -> 574 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/validateProporties_typeInit_valueBoolean.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/normative-types-new-validateProporties_typeInit_valueFloat.yml21
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/normative-types-new-validateProporties_typeInit_valueFloat.zipbin0 -> 572 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/validateProporties_typeInit_valueFloat.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/normative-types-new-validateProporties_typeInit_valueString.yml21
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/normative-types-new-validateProporties_typeInit_valueString.zipbin0 -> 572 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/validateProporties_typeInit_valueString.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/normative-types-new-validateProporties_typeList_valueUrlCredential.yml50
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/normative-types-new-validateProporties_typeList_valueUrlCredential.zipbin0 -> 717 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/validateProporties_typeList_valueUrlCredential.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/normative-types-new-validateProporties_typeMap_valueUrlCredential.yml29
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/normative-types-new-validateProporties_typeMap_valueUrlCredential.zipbin0 -> 628 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/validateProporties_typeMap_valueUrlCredential.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_special_chars/normative-types-new-validateProporties_typeString_valueString_special_chars.yml19
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_special_chars/validateProporties_typeString_valueString_special_chars.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_trimming/normative-types-new-validateProporties_typeString_valueString_trimming.yml19
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_trimming/validateProporties_typeString_valueString_trimming.json16
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/normative-types-new-validateProporties_typeMap.yml32
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/normative-types-new-validateProporties_typeMap.zipbin0 -> 638 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/validateProporties_typeTestDataType.json16
165 files changed, 2108 insertions, 0 deletions
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/VSPPackage.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/VSPPackage.csar
new file mode 100644
index 0000000000..b4aa77511b
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/VSPPackage.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/caseSensitiveTest_1.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/caseSensitiveTest_1.csar
new file mode 100644
index 0000000000..4b167cfa69
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/caseSensitiveTest_1.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/caseSensitiveTest_2.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/caseSensitiveTest_2.csar
new file mode 100644
index 0000000000..1f7bc5ac8d
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/caseSensitiveTest_2.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/csars.zip b/asdc-tests/src/test/resources/CI/importResourceTests/csars/csars.zip
new file mode 100644
index 0000000000..8a7f5de6e3
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/csars.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/fiveLinesAsBlock0.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/fiveLinesAsBlock0.csar
new file mode 100644
index 0000000000..870a777c66
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/fiveLinesAsBlock0.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion.csar
new file mode 100644
index 0000000000..273fab3a0b
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion2.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion2.csar
new file mode 100644
index 0000000000..aa0027f48e
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion2.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion3.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion3.csar
new file mode 100644
index 0000000000..ce9a80b240
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion3.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion4.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion4.csar
new file mode 100644
index 0000000000..88ccb448e7
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion4.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion5.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion5.csar
new file mode 100644
index 0000000000..a429110ea1
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion5.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile1.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile1.csar
new file mode 100644
index 0000000000..3361bfd867
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile1.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile2.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile2.csar
new file mode 100644
index 0000000000..200fbd95af
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile2.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile3.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile3.csar
new file mode 100644
index 0000000000..5ffdf6c4c4
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile3.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile4.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile4.csar
new file mode 100644
index 0000000000..30da05f951
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile4.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile5.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile5.csar
new file mode 100644
index 0000000000..e5a3fb862b
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile5.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/missingEntryDefintionPair.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/missingEntryDefintionPair.csar
new file mode 100644
index 0000000000..63a58bcd27
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/missingEntryDefintionPair.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/missingOneLineInToscaMeta.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/missingOneLineInToscaMeta.csar
new file mode 100644
index 0000000000..ac949ce734
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/missingOneLineInToscaMeta.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/mock_vf.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/mock_vf.csar
new file mode 100644
index 0000000000..4b37f44c73
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/mock_vf.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/mock_vf2.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/mock_vf2.csar
new file mode 100644
index 0000000000..ec1a65ebb9
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/mock_vf2.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/moreThanOneMetaFile.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/moreThanOneMetaFile.csar
new file mode 100644
index 0000000000..084ada11cb
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/moreThanOneMetaFile.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/moreThenOneYamlFile.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/moreThenOneYamlFile.csar
new file mode 100644
index 0000000000..9615c62e73
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/moreThenOneYamlFile.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/noCSARVersion.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/noCSARVersion.csar
new file mode 100644
index 0000000000..65a21c12b8
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/noCSARVersion.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/noCreatedByValue.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/noCreatedByValue.csar
new file mode 100644
index 0000000000..cb08b19463
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/noCreatedByValue.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/noEntryDefinitionsValue.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/noEntryDefinitionsValue.csar
new file mode 100644
index 0000000000..a3a0e8fd1f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/noEntryDefinitionsValue.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/noNewLineAfterBLock0.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/noNewLineAfterBLock0.csar
new file mode 100644
index 0000000000..4b37f44c73
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/noNewLineAfterBLock0.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/noTOSCAMetaFileVersionValue.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/noTOSCAMetaFileVersionValue.csar
new file mode 100644
index 0000000000..c2f4d0442a
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/noTOSCAMetaFileVersionValue.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/notContainYamlAndMetaFiles.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/notContainYamlAndMetaFiles.csar
new file mode 100644
index 0000000000..74058d5f82
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/notContainYamlAndMetaFiles.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/notContainYamlFile.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/notContainYamlFile.csar
new file mode 100644
index 0000000000..31cc2942d5
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/notContainYamlFile.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/someValueAfterBlock0.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/someValueAfterBlock0.csar
new file mode 100644
index 0000000000..e600a39693
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/someValueAfterBlock0.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaFolderNotExists.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaFolderNotExists.csar
new file mode 100644
index 0000000000..17a7e5e39f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaFolderNotExists.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaMetaFileNotExists.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaMetaFileNotExists.csar
new file mode 100644
index 0000000000..55e7179505
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaMetaFileNotExists.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaMetaOutsideTheFolder.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaMetaOutsideTheFolder.csar
new file mode 100644
index 0000000000..53d6987ac7
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaMetaOutsideTheFolder.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/underscoreInsteadOfDash.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/underscoreInsteadOfDash.csar
new file mode 100644
index 0000000000..c217dd5006
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/underscoreInsteadOfDash.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/validCsarVersion.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/validCsarVersion.csar
new file mode 100644
index 0000000000..60ac6e3dd2
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/validCsarVersion.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/valid_vf.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/valid_vf.csar
new file mode 100644
index 0000000000..01bf159071
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/valid_vf.csar
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/valid_vf_zip.zip b/asdc-tests/src/test/resources/CI/importResourceTests/csars/valid_vf_zip.zip
new file mode 100644
index 0000000000..66922ae15e
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/csars/valid_vf_zip.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_category/empty_category.json b/asdc-tests/src/test/resources/CI/importResourceTests/empty_category/empty_category.json
new file mode 100644
index 0000000000..7ce1fd5e5f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_category/empty_category.json
@@ -0,0 +1,22 @@
+{
+ "payloadName": "normative-types-new-empty_category.yml",
+ "contactId": "adminid",
+ "name": "tosca.nodes.empty_category",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "defaulticon",
+ "categories": [
+ {
+ "name": "",
+ "subcategories": [
+ {
+ "name": "Infrastructure"
+ }
+ ]
+ }
+],
+ "tags": [
+ "tosca.nodes.empty_category"
+ ],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_category/normative-types-new-empty_category.yml b/asdc-tests/src/test/resources/CI/importResourceTests/empty_category/normative-types-new-empty_category.yml
new file mode 100644
index 0000000000..0ab5ac9322
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_category/normative-types-new-empty_category.yml
@@ -0,0 +1,16 @@
+tosca.nodes.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_category/normative-types-new-empty_category.zip b/asdc-tests/src/test/resources/CI/importResourceTests/empty_category/normative-types-new-empty_category.zip
new file mode 100644
index 0000000000..537787f955
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_category/normative-types-new-empty_category.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/empty_contact.json b/asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/empty_contact.json
new file mode 100644
index 0000000000..6e043f5606
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/empty_contact.json
@@ -0,0 +1,22 @@
+{
+ "payloadName": "normative-types-new-empty_contact.yml",
+ "contactId": "",
+ "name": "tosca.nodes.empty_contact",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "defaulticon",
+"categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Infrastructure"
+ }
+ ]
+ }
+],
+ "tags": [
+ "tosca.nodes.empty_contact"
+ ],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/normative-types-new-empty_contact.yml b/asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/normative-types-new-empty_contact.yml
new file mode 100644
index 0000000000..3d9c111871
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/normative-types-new-empty_contact.yml
@@ -0,0 +1,18 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.missing_contact:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/normative-types-new-empty_contact.zip b/asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/normative-types-new-empty_contact.zip
new file mode 100644
index 0000000000..bee0ffef8f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/normative-types-new-empty_contact.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/empty_desc.json b/asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/empty_desc.json
new file mode 100644
index 0000000000..7aa4c167b4
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/empty_desc.json
@@ -0,0 +1,22 @@
+{
+ "payloadName": "normative-types-new-empty_desc.yml",
+ "contactId": "adminid",
+ "name": "tosca.nodes.empty_desc",
+ "description": "",
+ "resourceIconPath": "defaulticon",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Infrastructure"
+ }
+ ]
+ }
+],
+ "tags": [
+ "tosca.nodes.empty_desc"
+ ],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/normative-types-new-empty_desc.yml b/asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/normative-types-new-empty_desc.yml
new file mode 100644
index 0000000000..0ab5ac9322
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/normative-types-new-empty_desc.yml
@@ -0,0 +1,16 @@
+tosca.nodes.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/normative-types-new-empty_desc.zip b/asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/normative-types-new-empty_desc.zip
new file mode 100644
index 0000000000..c105c0989f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/normative-types-new-empty_desc.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/empty_icon.json b/asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/empty_icon.json
new file mode 100644
index 0000000000..e1980cee79
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/empty_icon.json
@@ -0,0 +1,22 @@
+{
+ "payloadName": "normative-types-new-empty_icon.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.empty_icon",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Infrastructure"
+ }
+ ]
+ }
+],
+ "tags": [
+ "tosca.nodes.empty_icon"
+ ],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/normative-types-new-empty_icon.yml b/asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/normative-types-new-empty_icon.yml
new file mode 100644
index 0000000000..0ab5ac9322
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/normative-types-new-empty_icon.yml
@@ -0,0 +1,16 @@
+tosca.nodes.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/normative-types-new-empty_icon.zip b/asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/normative-types-new-empty_icon.zip
new file mode 100644
index 0000000000..a500656ff7
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/normative-types-new-empty_icon.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/empty_payloadName.json b/asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/empty_payloadName.json
new file mode 100644
index 0000000000..2e46c69243
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/empty_payloadName.json
@@ -0,0 +1,22 @@
+{
+ "payloadName": "",
+ "contactId": "adminid",
+ "name": "tosca.nodes.empty_payloadName",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "defaulticon",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Infrastructure"
+ }
+ ]
+ }
+],
+ "tags": [
+ "tosca.nodes.empty_payloadName"
+ ],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/normative-types-new-empty_payloadName.yml b/asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/normative-types-new-empty_payloadName.yml
new file mode 100644
index 0000000000..0ab5ac9322
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/normative-types-new-empty_payloadName.yml
@@ -0,0 +1,16 @@
+tosca.nodes.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/normative-types-new-empty_payloadName.zip b/asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/normative-types-new-empty_payloadName.zip
new file mode 100644
index 0000000000..901d2de441
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/normative-types-new-empty_payloadName.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/empty_resource_name.json b/asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/empty_resource_name.json
new file mode 100644
index 0000000000..dff8e13ad5
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/empty_resource_name.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-empty_resource_name.yml",
+ "contactId": "adminid",
+ "name": "",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["empty_resource_name"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/normative-types-new-empty_resource_name.yml b/asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/normative-types-new-empty_resource_name.yml
new file mode 100644
index 0000000000..bad0c73a1f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/normative-types-new-empty_resource_name.yml
@@ -0,0 +1,18 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/normative-types-new-empty_resource_name.zip b/asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/normative-types-new-empty_resource_name.zip
new file mode 100644
index 0000000000..940a74ab05
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/normative-types-new-empty_resource_name.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/empty_tag.json b/asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/empty_tag.json
new file mode 100644
index 0000000000..5028baa786
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/empty_tag.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-empty_tag.yml",
+ "contactId": "adminid",
+ "name": "tosca.nodes.empty_tag",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": [""],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/normative-types-new-empty_tag.yml b/asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/normative-types-new-empty_tag.yml
new file mode 100644
index 0000000000..bad0c73a1f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/normative-types-new-empty_tag.yml
@@ -0,0 +1,18 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/normative-types-new-empty_tag.zip b/asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/normative-types-new-empty_tag.zip
new file mode 100644
index 0000000000..cd75d64a89
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/normative-types-new-empty_tag.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/import _multiple_tags.json b/asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/import _multiple_tags.json
new file mode 100644
index 0000000000..ec361827b0
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/import _multiple_tags.json
@@ -0,0 +1,18 @@
+{
+ "payloadName": "normative-types-new-import _multiple_tags.yml",
+ "contactId": "adminid",
+ "name": "tosca.nodes.import _multiple_tags",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["tosca.nodes.import _multiple_tags",
+ "import _multiple_tags",
+ "import _multiple_tags2"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/normative-types-new-import _multiple_tags.yml b/asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/normative-types-new-import _multiple_tags.yml
new file mode 100644
index 0000000000..0ab5ac9322
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/normative-types-new-import _multiple_tags.yml
@@ -0,0 +1,16 @@
+tosca.nodes.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/normative-types-new-import _multiple_tags.zip b/asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/normative-types-new-import _multiple_tags.zip
new file mode 100644
index 0000000000..1de1fac68c
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/normative-types-new-import _multiple_tags.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/importResource4test.json b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/importResource4test.json
new file mode 100644
index 0000000000..c6a4b47903
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/importResource4test.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-importResource4test.yml",
+ "contactId": "jh0003",
+ "name": "importResource4test",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["importResource4test"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/normative-types-new-importResource4test.yml b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/normative-types-new-importResource4test.yml
new file mode 100644
index 0000000000..bce6af3db4
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/normative-types-new-importResource4test.yml
@@ -0,0 +1,30 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.importResource4test:
+ derived_from: tosca.nodes.Root
+ description: The TOSCA Node Type all other TOSCA base Node Types derive from
+ attributes:
+ tosca_id:
+ type: string
+ tosca_name:
+ type: string
+ state:
+ type: string
+ capabilities:
+ feature2:
+ type: tosca.capabilities.Node
+ requirements:
+ - dependency2 :
+ capability: tosca.capabilities.Node
+ node: tosca.nodes.importResource4test
+ relationship: tosca.relationships.DependsOn
+ occurrences: [ 0, UNBOUNDED ]
+ properties:
+ root_password:
+ type: string
+ required: false
+ description: the optional root password for the DBMS service
+ port:
+ type: integer
+ required: false
+ description: the port the DBMS service will listen to for data and requests
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/normative-types-new-importResource4test.zip b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/normative-types-new-importResource4test.zip
new file mode 100644
index 0000000000..eb69428cf1
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/normative-types-new-importResource4test.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/importResource4testCP.json b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/importResource4testCP.json
new file mode 100644
index 0000000000..417d8a2854
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/importResource4testCP.json
@@ -0,0 +1,17 @@
+{
+ "payloadName": "normative-types-new-importResource4testCP.yml",
+ "contactId": "jh0003",
+ "name": "importResource4test",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["importResource4test"],
+ "resourceType" : "VFC",
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/normative-types-new-importResource4testCP.yml b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/normative-types-new-importResource4testCP.yml
new file mode 100644
index 0000000000..fb0cef1068
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/normative-types-new-importResource4testCP.yml
@@ -0,0 +1,30 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.CP.importResource4test:
+ derived_from: tosca.nodes.Root
+ description: The TOSCA Node Type all other TOSCA base Node Types derive from
+ attributes:
+ tosca_id:
+ type: string
+ tosca_name:
+ type: string
+ state:
+ type: string
+ capabilities:
+ feature2:
+ type: tosca.capabilities.Node
+ requirements:
+ - dependency2 :
+ capability: tosca.capabilities.Node
+ node: tosca.nodes.importResource4test
+ relationship: tosca.relationships.DependsOn
+ occurrences: [ 0, UNBOUNDED ]
+ properties:
+ root_password:
+ type: string
+ required: false
+ description: the optional root password for the DBMS service
+ port:
+ type: integer
+ required: false
+ description: the port the DBMS service will listen to for data and requests
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/normative-types-new-importResource4testCP.zip b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/normative-types-new-importResource4testCP.zip
new file mode 100644
index 0000000000..be77395250
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/normative-types-new-importResource4testCP.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/importResource4testMissingNameSpace.json b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/importResource4testMissingNameSpace.json
new file mode 100644
index 0000000000..3a14cfc1c8
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/importResource4testMissingNameSpace.json
@@ -0,0 +1,17 @@
+{
+ "payloadName": "normative-types-new-importResource4testMissingNameSpace.yml",
+ "contactId": "jh0003",
+ "name": "importResource4test",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["importResource4test"],
+ "resourceType" : "VFC",
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/normative-types-new-importResource4testMissingNameSpace.yml b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/normative-types-new-importResource4testMissingNameSpace.yml
new file mode 100644
index 0000000000..693ec75b51
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/normative-types-new-importResource4testMissingNameSpace.yml
@@ -0,0 +1,30 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.vfc.importResource4test:
+ derived_from: tosca.nodes.Root
+ description: The TOSCA Node Type all other TOSCA base Node Types derive from
+ attributes:
+ tosca_id:
+ type: string
+ tosca_name:
+ type: string
+ state:
+ type: string
+ capabilities:
+ feature2:
+ type: tosca.capabilities.Node
+ requirements:
+ - dependency2 :
+ capability: tosca.capabilities.Node
+ node: tosca.nodes.importResource4test
+ relationship: tosca.relationships.DependsOn
+ occurrences: [ 0, UNBOUNDED ]
+ properties:
+ root_password:
+ type: string
+ required: false
+ description: the optional root password for the DBMS service
+ port:
+ type: integer
+ required: false
+ description: the port the DBMS service will listen to for data and requests
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/normative-types-new-importResource4testMissingNameSpace.zip b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/normative-types-new-importResource4testMissingNameSpace.zip
new file mode 100644
index 0000000000..3160c73fe7
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/normative-types-new-importResource4testMissingNameSpace.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/importResource4testUnknown.json b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/importResource4testUnknown.json
new file mode 100644
index 0000000000..3059d99eec
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/importResource4testUnknown.json
@@ -0,0 +1,17 @@
+{
+ "payloadName": "normative-types-new-importResource4testUnknown.yml",
+ "contactId": "jh0003",
+ "name": "importResource4test",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["importResource4test"],
+ "resourceType" : "VFC",
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/normative-types-new-importResource4testUnknown.yml b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/normative-types-new-importResource4testUnknown.yml
new file mode 100644
index 0000000000..115a61a12b
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/normative-types-new-importResource4testUnknown.yml
@@ -0,0 +1,30 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.Unknown.importResource4test:
+ derived_from: tosca.nodes.Root
+ description: The TOSCA Node Type all other TOSCA base Node Types derive from
+ attributes:
+ tosca_id:
+ type: string
+ tosca_name:
+ type: string
+ state:
+ type: string
+ capabilities:
+ feature2:
+ type: tosca.capabilities.Node
+ requirements:
+ - dependency2 :
+ capability: tosca.capabilities.Node
+ node: tosca.nodes.importResource4test
+ relationship: tosca.relationships.DependsOn
+ occurrences: [ 0, UNBOUNDED ]
+ properties:
+ root_password:
+ type: string
+ required: false
+ description: the optional root password for the DBMS service
+ port:
+ type: integer
+ required: false
+ description: the port the DBMS service will listen to for data and requests
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/normative-types-new-importResource4testUnknown.zip b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/normative-types-new-importResource4testUnknown.zip
new file mode 100644
index 0000000000..67b81c3d7f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/normative-types-new-importResource4testUnknown.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/importResource4testUpdateVendorNameAndCategory.json b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/importResource4testUpdateVendorNameAndCategory.json
new file mode 100644
index 0000000000..4e9affe462
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/importResource4testUpdateVendorNameAndCategory.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-importResource4testUpdateVendorNameAndCategory.yml",
+ "contactId": "jh0003",
+ "name": "importResource4test",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Network L2-3",
+ "subcategories": [{
+ "name": "Router"
+ }]
+ }],
+ "tags": ["importResource4test"],
+ "vendorName": "ATT (Tosaaaaaaaaaaaaa)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/normative-types-new-importResource4testUpdateVendorNameAndCategory.yml b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/normative-types-new-importResource4testUpdateVendorNameAndCategory.yml
new file mode 100644
index 0000000000..69d88984ac
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/normative-types-new-importResource4testUpdateVendorNameAndCategory.yml
@@ -0,0 +1,12 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.importResource4test:
+ derived_from: tosca.nodes.Root
+ description: update update
+ attributes:
+ tosca_id:
+ type: string
+ tosca_name:
+ type: string
+ state:
+ type: string
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/normative-types-new-importResource4testUpdateVendorNameAndCategory.zip b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/normative-types-new-importResource4testUpdateVendorNameAndCategory.zip
new file mode 100644
index 0000000000..a092a1c14b
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/normative-types-new-importResource4testUpdateVendorNameAndCategory.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/importResource4testUpdateWithoutReqCap.json b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/importResource4testUpdateWithoutReqCap.json
new file mode 100644
index 0000000000..f6ab834378
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/importResource4testUpdateWithoutReqCap.json
@@ -0,0 +1,17 @@
+{
+ "payloadName": "normative-types-new-importResource4testUpdateWithoutReqCap.yml",
+ "contactId": "cs0004",
+ "name": "importResource4test",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.Update",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["importResource4test",
+ "updatedTag"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.3.33"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/normative-types-new-importResource4testUpdateWithoutReqCap.yml b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/normative-types-new-importResource4testUpdateWithoutReqCap.yml
new file mode 100644
index 0000000000..a580e8b7c6
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/normative-types-new-importResource4testUpdateWithoutReqCap.yml
@@ -0,0 +1,12 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.importResource4test:
+ derived_from: tosca.nodes.Root
+ description: The TOSCA Node Type all other TOSCA base Node Types derive from
+ attributes:
+ tosca_id:
+ type: string
+ tosca_name:
+ type: string
+ state:
+ type: string
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/normative-types-new-importResource4testUpdateWithoutReqCap.zip b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/normative-types-new-importResource4testUpdateWithoutReqCap.zip
new file mode 100644
index 0000000000..3005f9231f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/normative-types-new-importResource4testUpdateWithoutReqCap.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/importResource4testVF.json b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/importResource4testVF.json
new file mode 100644
index 0000000000..6ebba43604
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/importResource4testVF.json
@@ -0,0 +1,17 @@
+{
+ "payloadName": "normative-types-new-importResource4testVF.yml",
+ "contactId": "jh0003",
+ "name": "importResource4test",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["importResource4test"],
+ "resourceType" : "VFC",
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/normative-types-new-importResource4testVF.yml b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/normative-types-new-importResource4testVF.yml
new file mode 100644
index 0000000000..2879ab8cc8
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/normative-types-new-importResource4testVF.yml
@@ -0,0 +1,30 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.vF.importResource4test:
+ derived_from: tosca.nodes.Root
+ description: The TOSCA Node Type all other TOSCA base Node Types derive from
+ attributes:
+ tosca_id:
+ type: string
+ tosca_name:
+ type: string
+ state:
+ type: string
+ capabilities:
+ feature2:
+ type: tosca.capabilities.Node
+ requirements:
+ - dependency2 :
+ capability: tosca.capabilities.Node
+ node: tosca.nodes.importResource4test
+ relationship: tosca.relationships.DependsOn
+ occurrences: [ 0, UNBOUNDED ]
+ properties:
+ root_password:
+ type: string
+ required: false
+ description: the optional root password for the DBMS service
+ port:
+ type: integer
+ required: false
+ description: the port the DBMS service will listen to for data and requests
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/normative-types-new-importResource4testVF.zip b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/normative-types-new-importResource4testVF.zip
new file mode 100644
index 0000000000..46c652fd24
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/normative-types-new-importResource4testVF.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/importResource4testVFC.json b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/importResource4testVFC.json
new file mode 100644
index 0000000000..b5e2e329bd
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/importResource4testVFC.json
@@ -0,0 +1,17 @@
+{
+ "payloadName": "normative-types-new-importResource4testVFC.yml",
+ "contactId": "jh0003",
+ "name": "importResource4test",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["importResource4test"],
+ "vendorName": "ATT (Tosca)",
+ "resourceType" : "VFC",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/normative-types-new-importResource4testVFC.yml b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/normative-types-new-importResource4testVFC.yml
new file mode 100644
index 0000000000..cdf347e872
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/normative-types-new-importResource4testVFC.yml
@@ -0,0 +1,30 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.VFC.importResource4test:
+ derived_from: tosca.nodes.Root
+ description: The TOSCA Node Type all other TOSCA base Node Types derive from
+ attributes:
+ tosca_id:
+ type: string
+ tosca_name:
+ type: string
+ state:
+ type: string
+ capabilities:
+ feature2:
+ type: tosca.capabilities.Node
+ requirements:
+ - dependency2 :
+ capability: tosca.capabilities.Node
+ node: tosca.nodes.importResource4test
+ relationship: tosca.relationships.DependsOn
+ occurrences: [ 0, UNBOUNDED ]
+ properties:
+ root_password:
+ type: string
+ required: false
+ description: the optional root password for the DBMS service
+ port:
+ type: integer
+ required: false
+ description: the port the DBMS service will listen to for data and requests
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/normative-types-new-importResource4testVFC.zip b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/normative-types-new-importResource4testVFC.zip
new file mode 100644
index 0000000000..0ca8098ff9
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/normative-types-new-importResource4testVFC.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/importResource4testVL.json b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/importResource4testVL.json
new file mode 100644
index 0000000000..158530a3e5
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/importResource4testVL.json
@@ -0,0 +1,17 @@
+{
+ "payloadName": "normative-types-new-importResource4testVL.yml",
+ "contactId": "jh0003",
+ "resourceType" : "VFC",
+ "name": "importResource4test",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["importResource4test"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/normative-types-new-importResource4testVL.yml b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/normative-types-new-importResource4testVL.yml
new file mode 100644
index 0000000000..55888da2bc
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/normative-types-new-importResource4testVL.yml
@@ -0,0 +1,30 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.Vl.importResource4test:
+ derived_from: tosca.nodes.Root
+ description: The TOSCA Node Type all other TOSCA base Node Types derive from
+ attributes:
+ tosca_id:
+ type: string
+ tosca_name:
+ type: string
+ state:
+ type: string
+ capabilities:
+ feature2:
+ type: tosca.capabilities.Node
+ requirements:
+ - dependency2 :
+ capability: tosca.capabilities.Node
+ node: tosca.nodes.importResource4test
+ relationship: tosca.relationships.DependsOn
+ occurrences: [ 0, UNBOUNDED ]
+ properties:
+ root_password:
+ type: string
+ required: false
+ description: the optional root password for the DBMS service
+ port:
+ type: integer
+ required: false
+ description: the port the DBMS service will listen to for data and requests
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/normative-types-new-importResource4testVL.zip b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/normative-types-new-importResource4testVL.zip
new file mode 100644
index 0000000000..9a1a28b1f6
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/normative-types-new-importResource4testVL.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypes.yml b/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypes.yml
new file mode 100644
index 0000000000..72fe26e0d1
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypes.yml
@@ -0,0 +1,141 @@
+tosca.capabilities.Root:
+ description: The TOSCA root Capability Type all other TOSCA base Capability Types derive from
+tosca.capabilities.Node:
+ derived_from: tosca.capabilities.Root
+tosca.capabilities.Container:
+ derived_from: tosca.capabilities.Root
+ properties:
+ num_cpus:
+ type: integer
+ required: false
+ constraints:
+ - greater_or_equal: 1
+ cpu_frequency:
+ type: scalar-unit.frequency
+ required: false
+ constraints:
+ - greater_or_equal: 0.1 GHz
+ disk_size:
+ type: scalar-unit.size
+ required: false
+ constraints:
+ - greater_or_equal: 0 MB
+ mem_size:
+ type: scalar-unit.size
+ required: false
+ constraints:
+ - greater_or_equal: 0 MB
+tosca.capabilities.Endpoint:
+ derived_from: tosca.capabilities.Root
+ properties:
+ protocol:
+ type: string
+ default: tcp
+ port:
+ type: PortDef
+ required: false
+ secure:
+ type: boolean
+ default: false
+ url_path:
+ type: string
+ required: false
+ port_name:
+ type: string
+ required: false
+ network_name:
+ type: string
+ required: false
+ default: PRIVATE
+ initiator:
+ type: string
+ default: source
+ constraints:
+ - valid_values: [ source, target, peer ]
+ ports:
+ type: map
+ required: false
+ constraints:
+ - min_length: 1
+ entry_schema:
+ type: PortSpec
+ attributes:
+ ip_address:
+ type: string
+tosca.capabilities.Endpoint.Public:
+ derived_from: tosca.capabilities.Endpoint
+ properties:
+ # Change the default network_name to use the first public network found
+ network_name: PUBLIC
+ floating:
+ description: >
+ indicates that the public address should be allocated from a pool of floating IPs that are associated with the network.
+ type: boolean
+ default: false
+ status: experimental
+ dns_name:
+ description: The optional name to register with DNS
+ type: string
+ required: false
+ status: experimental
+tosca.capabilities.Endpoint.Admin:
+ derived_from: tosca.capabilities.Endpoint
+ # Change Endpoint secure indicator to true from its default of false
+ properties:
+ secure: true
+tosca.capabilities.Endpoint.Database:
+ derived_from: tosca.capabilities.Endpoint
+tosca.capabilities.OperatingSystem:
+ derived_from: tosca.capabilities.Root
+ properties:
+ architecture:
+ type: string
+ required: false
+ type:
+ type: string
+ required: false
+ distribution:
+ type: string
+ required: false
+ version:
+ type: version
+ required: false
+tosca.capabilities.Scalable:
+ derived_from: tosca.capabilities.Root
+ properties:
+ min_instances:
+ type: integer
+ default: 1
+ max_instances:
+ type: integer
+ default: 1
+ default_instances:
+ type: integer
+tosca.capabilities.network.Bindable:
+ derived_from: tosca.capabilities.Node
+
+
+tosca.capabilities.Container.Docker:
+ derived_from: tosca.capabilities.Container
+ properties:
+ version:
+ type: list
+ required: false
+ entry_schema: version
+ publish_all:
+ type: boolean
+ default: false
+ required: false
+ publish_ports:
+ type: list
+ entry_schema: PortSpec
+ required: false
+ expose_ports:
+ type: list
+ entry_schema: PortSpec
+ required: false
+ volumes:
+ type: list
+ entry_schema: string
+ required: false
+
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypes.zip b/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypes.zip
new file mode 100644
index 0000000000..4f945a7d1f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypes.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi.zip b/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi.zip
new file mode 100644
index 0000000000..550cd756f4
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi_MissingDerivedFrom.yml b/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi_MissingDerivedFrom.yml
new file mode 100644
index 0000000000..31fac955e3
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi_MissingDerivedFrom.yml
@@ -0,0 +1,132 @@
+tosca.capabilities.Root:
+ description: The TOSCA root Capability Type all other TOSCA base Capability Types derive from
+tosca.capabilities.Node:
+tosca.capabilities.Container:
+ properties:
+ num_cpus:
+ type: integer
+ required: false
+ constraints:
+ - greater_or_equal: 1
+ cpu_frequency:
+ type: scalar-unit.frequency
+ required: false
+ constraints:
+ - greater_or_equal: 0.1 GHz
+ disk_size:
+ type: scalar-unit.size
+ required: false
+ constraints:
+ - greater_or_equal: 0 MB
+ mem_size:
+ type: scalar-unit.size
+ required: false
+ constraints:
+ - greater_or_equal: 0 MB
+tosca.capabilities.Test.Ci:
+tosca.capabilities.Endpoint:
+ properties:
+ protocol:
+ type: string
+ default: tcp
+ port:
+ type: PortDef
+ required: false
+ secure:
+ type: boolean
+ default: false
+ url_path:
+ type: string
+ required: false
+ port_name:
+ type: string
+ required: false
+ network_name:
+ type: string
+ required: false
+ default: PRIVATE
+ initiator:
+ type: string
+ default: source
+ constraints:
+ - valid_values: [ source, target, peer ]
+ ports:
+ type: map
+ required: false
+ constraints:
+ - min_length: 1
+ entry_schema:
+ type: PortSpec
+ attributes:
+ ip_address:
+ type: string
+tosca.capabilities.Endpoint.Public:
+ properties:
+ # Change the default network_name to use the first public network found
+ network_name: PUBLIC
+ floating:
+ description: >
+ indicates that the public address should be allocated from a pool of floating IPs that are associated with the network.
+ type: boolean
+ default: false
+ status: experimental
+ dns_name:
+ description: The optional name to register with DNS
+ type: string
+ required: false
+ status: experimental
+tosca.capabilities.Endpoint.Admin:
+ # Change Endpoint secure indicator to true from its default of false
+ properties:
+ secure: true
+tosca.capabilities.Endpoint.Database:
+tosca.capabilities.OperatingSystem:
+ properties:
+ architecture:
+ type: string
+ required: false
+ type:
+ type: string
+ required: false
+ distribution:
+ type: string
+ required: false
+ version:
+ type: version
+ required: false
+tosca.capabilities.Scalable:
+ properties:
+ min_instances:
+ type: integer
+ default: 1
+ max_instances:
+ type: integer
+ default: 1
+ default_instances:
+ type: integer
+tosca.capabilities.network.Bindable:
+
+
+tosca.capabilities.Container.Docker:
+ properties:
+ version:
+ type: list
+ required: false
+ entry_schema: version
+ publish_all:
+ type: boolean
+ default: false
+ required: false
+ publish_ports:
+ type: list
+ entry_schema: PortSpec
+ required: false
+ expose_ports:
+ type: list
+ entry_schema: PortSpec
+ required: false
+ volumes:
+ type: list
+ entry_schema: string
+ required: false
+
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi_WithoutRoot.yml b/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi_WithoutRoot.yml
new file mode 100644
index 0000000000..12c7d5a977
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi_WithoutRoot.yml
@@ -0,0 +1,141 @@
+tosca.capabilities.Node:
+ derived_from: tosca.capabilities.Root
+tosca.capabilities.Container:
+ derived_from: tosca.capabilities.Root
+ properties:
+ num_cpus:
+ type: integer
+ required: false
+ constraints:
+ - greater_or_equal: 1
+ cpu_frequency:
+ type: scalar-unit.frequency
+ required: false
+ constraints:
+ - greater_or_equal: 0.1 GHz
+ disk_size:
+ type: scalar-unit.size
+ required: false
+ constraints:
+ - greater_or_equal: 0 MB
+ mem_size:
+ type: scalar-unit.size
+ required: false
+ constraints:
+ - greater_or_equal: 0 MB
+tosca.capabilities.Test.Ci:
+ derived_from: tosca.capabilities.Root
+tosca.capabilities.Endpoint:
+ derived_from: tosca.capabilities.Root
+ properties:
+ protocol:
+ type: string
+ default: tcp
+ port:
+ type: PortDef
+ required: false
+ secure:
+ type: boolean
+ default: false
+ url_path:
+ type: string
+ required: false
+ port_name:
+ type: string
+ required: false
+ network_name:
+ type: string
+ required: false
+ default: PRIVATE
+ initiator:
+ type: string
+ default: source
+ constraints:
+ - valid_values: [ source, target, peer ]
+ ports:
+ type: map
+ required: false
+ constraints:
+ - min_length: 1
+ entry_schema:
+ type: PortSpec
+ attributes:
+ ip_address:
+ type: string
+tosca.capabilities.Endpoint.Public:
+ derived_from: tosca.capabilities.Endpoint
+ properties:
+ # Change the default network_name to use the first public network found
+ network_name: PUBLIC
+ floating:
+ description: >
+ indicates that the public address should be allocated from a pool of floating IPs that are associated with the network.
+ type: boolean
+ default: false
+ status: experimental
+ dns_name:
+ description: The optional name to register with DNS
+ type: string
+ required: false
+ status: experimental
+tosca.capabilities.Endpoint.Admin:
+ derived_from: tosca.capabilities.Endpoint
+ # Change Endpoint secure indicator to true from its default of false
+ properties:
+ secure: true
+tosca.capabilities.Endpoint.Database:
+ derived_from: tosca.capabilities.Endpoint
+tosca.capabilities.OperatingSystem:
+ derived_from: tosca.capabilities.Root
+ properties:
+ architecture:
+ type: string
+ required: false
+ type:
+ type: string
+ required: false
+ distribution:
+ type: string
+ required: false
+ version:
+ type: version
+ required: false
+tosca.capabilities.Scalable:
+ derived_from: tosca.capabilities.Root
+ properties:
+ min_instances:
+ type: integer
+ default: 1
+ max_instances:
+ type: integer
+ default: 1
+ default_instances:
+ type: integer
+tosca.capabilities.network.Bindable:
+ derived_from: tosca.capabilities.Node
+
+
+tosca.capabilities.Container.Docker:
+ derived_from: tosca.capabilities.Container
+ properties:
+ version:
+ type: list
+ required: false
+ entry_schema: version
+ publish_all:
+ type: boolean
+ default: false
+ required: false
+ publish_ports:
+ type: list
+ entry_schema: PortSpec
+ required: false
+ expose_ports:
+ type: list
+ entry_schema: PortSpec
+ required: false
+ volumes:
+ type: list
+ entry_schema: string
+ required: false
+
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_category/missing_category.json b/asdc-tests/src/test/resources/CI/importResourceTests/missing_category/missing_category.json
new file mode 100644
index 0000000000..23a7d76103
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_category/missing_category.json
@@ -0,0 +1,12 @@
+{
+ "payloadName": "normative-types-new-missing_category.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.missing_category",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "defaulticon",
+ "tags": [
+ "tosca.nodes.missing_category"
+ ],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_category/normative-types-new-missing_category.yml b/asdc-tests/src/test/resources/CI/importResourceTests/missing_category/normative-types-new-missing_category.yml
new file mode 100644
index 0000000000..bad0c73a1f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_category/normative-types-new-missing_category.yml
@@ -0,0 +1,18 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_category/normative-types-new-missing_category.zip b/asdc-tests/src/test/resources/CI/importResourceTests/missing_category/normative-types-new-missing_category.zip
new file mode 100644
index 0000000000..51a01c1bb9
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_category/normative-types-new-missing_category.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/missing_contact.json b/asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/missing_contact.json
new file mode 100644
index 0000000000..8f3e5ae2e2
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/missing_contact.json
@@ -0,0 +1,21 @@
+{
+ "payloadName": "normative-types-new-missing_contact.yml",
+ "name": "tosca.nodes.missing_contact",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "defaulticon",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Infrastructure"
+ }
+ ]
+ }
+],
+ "tags": [
+ "tosca.nodes.missing_contact"
+ ],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/normative-types-new-missing_contact.yml b/asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/normative-types-new-missing_contact.yml
new file mode 100644
index 0000000000..3d9c111871
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/normative-types-new-missing_contact.yml
@@ -0,0 +1,18 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.missing_contact:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/normative-types-new-missing_contact.zip b/asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/normative-types-new-missing_contact.zip
new file mode 100644
index 0000000000..21d14a9a73
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/normative-types-new-missing_contact.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/missing_derived_from.json b/asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/missing_derived_from.json
new file mode 100644
index 0000000000..37a55bf17a
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/missing_derived_from.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-missing_derived_from.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.missing_derived_from",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["tosca.nodes.missing_derived_from"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/normative-types-new-missing_derived_from.yml b/asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/normative-types-new-missing_derived_from.yml
new file mode 100644
index 0000000000..82069ecb7b
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/normative-types-new-missing_derived_from.yml
@@ -0,0 +1,15 @@
+tosca.nodes.missing_userId:
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/normative-types-new-missing_derived_from.zip b/asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/normative-types-new-missing_derived_from.zip
new file mode 100644
index 0000000000..22e3d4da29
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/normative-types-new-missing_derived_from.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/missing_desc.json b/asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/missing_desc.json
new file mode 100644
index 0000000000..bec3896cfd
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/missing_desc.json
@@ -0,0 +1,15 @@
+{
+ "payloadName": "normative-types-new-missing_desc.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.missing_desc",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["tosca.nodes.missing_desc"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/normative-types-new-missing_desc.yml b/asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/normative-types-new-missing_desc.yml
new file mode 100644
index 0000000000..bad0c73a1f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/normative-types-new-missing_desc.yml
@@ -0,0 +1,18 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/normative-types-new-missing_desc.zip b/asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/normative-types-new-missing_desc.zip
new file mode 100644
index 0000000000..bd5174df62
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/normative-types-new-missing_desc.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/missing_icon.json b/asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/missing_icon.json
new file mode 100644
index 0000000000..9e9b7572bc
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/missing_icon.json
@@ -0,0 +1,15 @@
+{
+ "payloadName": "normative-types-new-missing_icon.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.missing_icon",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["tosca.nodes.missing_icon"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/normative-types-new-missing_icon.yml b/asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/normative-types-new-missing_icon.yml
new file mode 100644
index 0000000000..bad0c73a1f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/normative-types-new-missing_icon.yml
@@ -0,0 +1,18 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/normative-types-new-missing_icon.zip b/asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/normative-types-new-missing_icon.zip
new file mode 100644
index 0000000000..45d8e192f1
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/normative-types-new-missing_icon.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/missing_payloadName.json b/asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/missing_payloadName.json
new file mode 100644
index 0000000000..58df0f7400
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/missing_payloadName.json
@@ -0,0 +1,15 @@
+{
+ "contactId": "jh0003",
+ "name": "tosca.nodes.missing_payloadName",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["tosca.nodes.missing_payloadName"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/normative-types-new-missing_payloadName.yml b/asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/normative-types-new-missing_payloadName.yml
new file mode 100644
index 0000000000..bad0c73a1f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/normative-types-new-missing_payloadName.yml
@@ -0,0 +1,18 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/normative-types-new-missing_payloadName.zip b/asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/normative-types-new-missing_payloadName.zip
new file mode 100644
index 0000000000..3a72360c25
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/normative-types-new-missing_payloadName.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/missing_resource_name.json b/asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/missing_resource_name.json
new file mode 100644
index 0000000000..dbf7ef82f1
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/missing_resource_name.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-missing_resource_name.yml",
+ "contactId": "jh0003",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "defaulticon",
+ "category": "Generic/Infrastructure",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["missing_resource_name"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/normative-types-new-missing_resource_name.yml b/asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/normative-types-new-missing_resource_name.yml
new file mode 100644
index 0000000000..bad0c73a1f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/normative-types-new-missing_resource_name.yml
@@ -0,0 +1,18 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/normative-types-new-missing_resource_name.zip b/asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/normative-types-new-missing_resource_name.zip
new file mode 100644
index 0000000000..24294b9647
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/normative-types-new-missing_resource_name.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/missing_tags.json b/asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/missing_tags.json
new file mode 100644
index 0000000000..36c845f001
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/missing_tags.json
@@ -0,0 +1,15 @@
+{
+ "payloadName": "normative-types-new-missing_tags.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.missing_tags",
+ "description": "Represents a server-local block storage device (i.e., not shared) offering evenly sized blocks of data from which raw storage volumes can be created.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/normative-types-new-missing_tags.yml b/asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/normative-types-new-missing_tags.yml
new file mode 100644
index 0000000000..bad0c73a1f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/normative-types-new-missing_tags.yml
@@ -0,0 +1,18 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.missing_userId:
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ type: scalar-unit.size
+ constraints:
+ - greater_or_equal: 1 MB
+ volume_id:
+ type: string
+ required: false
+ snapshot_id:
+ type: string
+ required: false
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/normative-types-new-missing_tags.zip b/asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/normative-types-new-missing_tags.zip
new file mode 100644
index 0000000000..1d619e8c93
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/normative-types-new-missing_tags.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/myCompute.json b/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/myCompute.json
new file mode 100644
index 0000000000..af216b7c21
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/myCompute.json
@@ -0,0 +1,24 @@
+{
+ "payloadName": "normative-types-new-myCompute.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.MyCompute",
+ "description": "Represents a real or virtual machine or server. Information specified on the Compute
+ node will be used to find the machine that fits the given requirements in the cloud
+ available machines. If no sizing information are specified the cloud provider default
+ machine will be used. It is strongly recommended to specify the required CPUs and memory
+ at least.",
+ "resourceIconPath": "defaulticon",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Infrastructure"
+ }
+ ]
+ }
+],
+ "tags": [
+ "tosca.nodes.MyCompute"
+ ]
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.yml b/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.yml
new file mode 100644
index 0000000000..dff93f621a
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.yml
@@ -0,0 +1,35 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ tosca.nodes.MyCompute:
+ derived_from: tosca.nodes.Root
+ attributes:
+ private_address:
+ type: string
+ public_address:
+ type: string
+ networks:
+ type: map
+ entry_schema:
+ type: tosca.datatypes.network.NetworkInfo
+ ports:
+ type: map
+ entry_schema:
+ type: tosca.datatypes.network.PortInfo
+ requirements:
+ - local_storage:
+ capability: tosca.capabilities.Attachment
+ node: tosca.nodes.BlockStorage
+ relationship: tosca.relationships.AttachesTo
+ occurrences: [0, UNBOUNDED]
+ capabilities:
+ host:
+ type: tosca.capabilities.Container
+ valid_source_types: [tosca.nodes.SoftwareComponent]
+ endpoint :
+ type: tosca.capabilities.Endpoint.Admin
+ os:
+ type: tosca.capabilities.OperatingSystem
+ scalable:
+ type: tosca.capabilities.Scalable
+ binding:
+ type: tosca.capabilities.network.Bindable
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.zip b/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.zip
new file mode 100644
index 0000000000..a4fb8979fc
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/normative-types-new-portInvalidDefaultValue.yml b/asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/normative-types-new-portInvalidDefaultValue.yml
new file mode 100644
index 0000000000..eccfd4ddc5
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/normative-types-new-portInvalidDefaultValue.yml
@@ -0,0 +1,29 @@
+tosca.nodes.network.PortInvalidDefaultValue:
+ derived_from: tosca.nodes.Root
+ properties:
+ ip_address:
+ type: string
+ required: false
+ order:
+ type: integer
+ required: true
+ default: 1.5
+ constraints:
+ - greater_or_equal: 0
+ is_default:
+ type: boolean
+ required: false
+ default: false
+ ip_range_start:
+ type: string
+ required: false
+ ip_range_end:
+ type: string
+ required: false
+ requirements:
+ - link:
+ capability: tosca.capabilities.network.Linkable
+ relationship: tosca.relationships.network.LinksTo
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ relationship: tosca.relationships.network.BindsTo
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/normative-types-new-portInvalidDefaultValue.zip b/asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/normative-types-new-portInvalidDefaultValue.zip
new file mode 100644
index 0000000000..fed020cdd3
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/normative-types-new-portInvalidDefaultValue.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/portInvalidDefaultValue.json b/asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/portInvalidDefaultValue.json
new file mode 100644
index 0000000000..6b6e064a30
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/portInvalidDefaultValue.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-portInvalidDefaultValue.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.network.PortInvalidDefaultValue",
+ "description": "Represents a logical entity that associates between Compute and Network normative types.",
+ "resourceIconPath": "port",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Network Elements"
+ }]
+ }],
+ "tags": ["tosca.nodes.network.PortInvalidDefaultValue"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/userCompute/normative-types-new-userCompute.yml b/asdc-tests/src/test/resources/CI/importResourceTests/userCompute/normative-types-new-userCompute.yml
new file mode 100644
index 0000000000..de109820a9
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/userCompute/normative-types-new-userCompute.yml
@@ -0,0 +1,35 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.Compute:
+ derived_from: tosca.nodes.Root
+ attributes:
+ private_address:
+ type: string
+ public_address:
+ type: string
+ networks:
+ type: map
+ entry_schema:
+ type: tosca.datatypes.network.NetworkInfo
+ ports:
+ type: map
+ entry_schema:
+ type: tosca.datatypes.network.PortInfo
+ requirements:
+ - local_storage:
+ capability: tosca.capabilities.Attachment
+ node: tosca.nodes.BlockStorage
+ relationship: tosca.relationships.AttachesTo
+ occurrences: [0, UNBOUNDED]
+ capabilities:
+ host:
+ type: tosca.capabilities.Container
+ valid_source_types: [tosca.nodes.SoftwareComponent]
+ endpoint :
+ type: tosca.capabilities.Endpoint.Admin
+ os:
+ type: tosca.capabilities.OperatingSystem
+ scalable:
+ type: tosca.capabilities.Scalable
+ binding:
+ type: tosca.capabilities.network.Bindable
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/userCompute/normative-types-new-userCompute.zip b/asdc-tests/src/test/resources/CI/importResourceTests/userCompute/normative-types-new-userCompute.zip
new file mode 100644
index 0000000000..bda162b32f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/userCompute/normative-types-new-userCompute.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/userCompute/userCompute.json b/asdc-tests/src/test/resources/CI/importResourceTests/userCompute/userCompute.json
new file mode 100644
index 0000000000..ab10c0b523
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/userCompute/userCompute.json
@@ -0,0 +1,26 @@
+{
+ "payloadName": "normative-types-new-userCompute.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.userCompute",
+ "description": "Represents a real or virtual machine or server. Information specified on the Compute
+ node will be used to find the machine that fits the given requirements in the cloud
+ available machines. If no sizing information are specified the cloud provider default
+ machine will be used. It is strongly recommended to specify the required CPUs and memory
+ at least.",
+ "resourceIconPath": "defaulticon",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Infrastructure"
+ }
+ ]
+ }
+],
+ "tags": [
+ "tosca.nodes.userCompute"
+ ],
+ "vendorName": "UserVendor",
+ "vendorRelease": "1.1.1"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/normative-types-new-userUpdateCompute.yml b/asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/normative-types-new-userUpdateCompute.yml
new file mode 100644
index 0000000000..5c73365640
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/normative-types-new-userUpdateCompute.yml
@@ -0,0 +1,29 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.Compute:
+ derived_from: tosca.nodes.Root
+ attributes:
+ private_address:
+ type: string
+ public_address:
+ type: string
+ networks:
+ type: map
+ entry_schema:
+ type: tosca.datatypes.network.NetworkInfo
+ ports:
+ type: map
+ entry_schema:
+ type: tosca.datatypes.network.PortInfo
+ requirements:
+ - local_storage:
+ capability: tosca.capabilities.Attachment
+ node: tosca.nodes.BlockStorage
+ relationship: tosca.relationships.AttachesTo
+ occurrences: [0, UNBOUNDED]
+ capabilities:
+ host:
+ type: tosca.capabilities.Container
+ valid_source_types: [tosca.nodes.SoftwareComponent]
+ endpoint :
+ type: tosca.capabilities.Endpoint.Admin \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/normative-types-new-userUpdateCompute.zip b/asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/normative-types-new-userUpdateCompute.zip
new file mode 100644
index 0000000000..3ecead7579
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/normative-types-new-userUpdateCompute.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/userUpdateCompute.json b/asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/userUpdateCompute.json
new file mode 100644
index 0000000000..6e63c434fb
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/userUpdateCompute.json
@@ -0,0 +1,22 @@
+{
+ "payloadName": "normative-types-new-userUpdateCompute.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.userCompute",
+ "description": "Short description",
+ "resourceIconPath": "defaulticon",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Infrastructure"
+ }
+ ]
+ }
+],
+ "vendorName": "UpdatedVendor",
+ "vendorRelease": "1.1.2",
+ "tags": [
+ "tosca.nodes.userCompute"
+ ]
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/normative-types-new-validateProporties_happyScenarios.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/normative-types-new-validateProporties_happyScenarios.yml
new file mode 100644
index 0000000000..af70663fbe
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/normative-types-new-validateProporties_happyScenarios.yml
@@ -0,0 +1,39 @@
+validateProporties_happyScenarios:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ validation_test1:
+ type: boolean
+ required: false
+ default: true
+ validation_test2:
+ type: boolean
+ required: false
+ default: false
+ validation_test3:
+ type: integer
+ required: false
+ default: 1234
+ validation_test4:
+ type: float
+ required: false
+ default: 123.123
+ validation_test5:
+ type: string
+ required: false
+ default: cooolString
+ validation_test6:
+ type: scalar-unit.size
+ required: false
+ default: cooolString
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/normative-types-new-validateProporties_happyScenarios.zip b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/normative-types-new-validateProporties_happyScenarios.zip
new file mode 100644
index 0000000000..4104dc3618
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/normative-types-new-validateProporties_happyScenarios.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/validateProporties_happyScenarios.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/validateProporties_happyScenarios.json
new file mode 100644
index 0000000000..1235ba57e6
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/validateProporties_happyScenarios.json
@@ -0,0 +1,14 @@
+{
+ "payloadName": "normative-types-new-validateProporties_happyScenarios.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.SoftwareComponent",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Infrastructure"
+ }]
+ }],
+ "tags": ["tosca.nodes.SoftwareComponent"]
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/normative-types-new-validateProporties_typeBoolean_valueInit.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/normative-types-new-validateProporties_typeBoolean_valueInit.yml
new file mode 100644
index 0000000000..14778745ef
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/normative-types-new-validateProporties_typeBoolean_valueInit.yml
@@ -0,0 +1,21 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.validateProporties_typeBoolean_valueInit:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ validation_test:
+ type: boolean
+ required: false
+ default: 123456
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/normative-types-new-validateProporties_typeBoolean_valueInit.zip b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/normative-types-new-validateProporties_typeBoolean_valueInit.zip
new file mode 100644
index 0000000000..6eb2d7e7af
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/normative-types-new-validateProporties_typeBoolean_valueInit.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/validateProporties_typeBoolean_valueInit.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/validateProporties_typeBoolean_valueInit.json
new file mode 100644
index 0000000000..c4f4b37911
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/validateProporties_typeBoolean_valueInit.json
@@ -0,0 +1,14 @@
+{
+ "payloadName": "normative-types-new-validateProporties_typeBoolean_valueInit.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.SoftwareComponent",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Abstract"
+ }]
+ }],
+ "tags": ["tosca.nodes.SoftwareComponent"]
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/normative-types-new-validateProporties_typeBoolean_valueString.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/normative-types-new-validateProporties_typeBoolean_valueString.yml
new file mode 100644
index 0000000000..4d529ad285
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/normative-types-new-validateProporties_typeBoolean_valueString.yml
@@ -0,0 +1,21 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.validateProporties_typeBoolean_valueString:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ validation_test:
+ type: boolean
+ required: false
+ default: abcd
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/normative-types-new-validateProporties_typeBoolean_valueString.zip b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/normative-types-new-validateProporties_typeBoolean_valueString.zip
new file mode 100644
index 0000000000..538ba0e3ef
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/normative-types-new-validateProporties_typeBoolean_valueString.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/validateProporties_typeBoolean_valueString.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/validateProporties_typeBoolean_valueString.json
new file mode 100644
index 0000000000..f1ff279a84
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/validateProporties_typeBoolean_valueString.json
@@ -0,0 +1,14 @@
+{
+ "payloadName": "normative-types-new-validateProporties_typeBoolean_valueString.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.SoftwareComponent",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Abstract"
+ }]
+ }],
+ "tags": ["tosca.nodes.SoftwareComponent"]
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/normative-types-new-validateProporties_typeFloat_valueBoolean.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/normative-types-new-validateProporties_typeFloat_valueBoolean.yml
new file mode 100644
index 0000000000..fee8c9b68e
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/normative-types-new-validateProporties_typeFloat_valueBoolean.yml
@@ -0,0 +1,21 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.validateProporties_typeFloat_valueBoolean:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ validation_test:
+ type: float
+ required: false
+ default: true
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/normative-types-new-validateProporties_typeFloat_valueBoolean.zip b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/normative-types-new-validateProporties_typeFloat_valueBoolean.zip
new file mode 100644
index 0000000000..a577aeb1e3
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/normative-types-new-validateProporties_typeFloat_valueBoolean.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/validateProporties_typeFloat_valueBoolean.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/validateProporties_typeFloat_valueBoolean.json
new file mode 100644
index 0000000000..f1769769d4
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/validateProporties_typeFloat_valueBoolean.json
@@ -0,0 +1,14 @@
+{
+ "payloadName": "normative-types-new-validateProporties_typeFloat_valueBoolean.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.SoftwareComponent",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Abstract"
+ }]
+ }],
+ "tags": ["tosca.nodes.SoftwareComponent"]
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/normative-types-new-validateProporties_typeFloat_valueString.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/normative-types-new-validateProporties_typeFloat_valueString.yml
new file mode 100644
index 0000000000..88e5bb85c3
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/normative-types-new-validateProporties_typeFloat_valueString.yml
@@ -0,0 +1,21 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.validateProporties_typeFloat_valueString:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ validation_test:
+ type: float
+ required: false
+ default: abcd
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/normative-types-new-validateProporties_typeFloat_valueString.zip b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/normative-types-new-validateProporties_typeFloat_valueString.zip
new file mode 100644
index 0000000000..a9ec4d791e
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/normative-types-new-validateProporties_typeFloat_valueString.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/validateProporties_typeFloat_valueString.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/validateProporties_typeFloat_valueString.json
new file mode 100644
index 0000000000..3eab4bb311
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/validateProporties_typeFloat_valueString.json
@@ -0,0 +1,14 @@
+{
+ "payloadName": "normative-types-new-validateProporties_typeFloat_valueString.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.SoftwareComponent",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Abstract"
+ }]
+ }],
+ "tags": ["tosca.nodes.SoftwareComponent"]
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/normative-types-new-validateProporties_typeInit_valueBoolean.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/normative-types-new-validateProporties_typeInit_valueBoolean.yml
new file mode 100644
index 0000000000..69bd3ba41e
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/normative-types-new-validateProporties_typeInit_valueBoolean.yml
@@ -0,0 +1,21 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.validateProporties_typeInit_valueBoolean:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ validation_test:
+ type: integer
+ required: false
+ default: true
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/normative-types-new-validateProporties_typeInit_valueBoolean.zip b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/normative-types-new-validateProporties_typeInit_valueBoolean.zip
new file mode 100644
index 0000000000..9e76fbee46
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/normative-types-new-validateProporties_typeInit_valueBoolean.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/validateProporties_typeInit_valueBoolean.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/validateProporties_typeInit_valueBoolean.json
new file mode 100644
index 0000000000..bb145d2f28
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/validateProporties_typeInit_valueBoolean.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-validateProporties_typeInit_valueBoolean.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.SoftwareComponent",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Abstract"
+ }]
+ }],
+ "tags": [
+ "tosca.nodes.SoftwareComponent"
+ ]
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/normative-types-new-validateProporties_typeInit_valueFloat.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/normative-types-new-validateProporties_typeInit_valueFloat.yml
new file mode 100644
index 0000000000..60ae3b6333
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/normative-types-new-validateProporties_typeInit_valueFloat.yml
@@ -0,0 +1,21 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.validateProporties_typeInit_valueFloat:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ validation_test:
+ type: integer
+ required: false
+ default: 0.123
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/normative-types-new-validateProporties_typeInit_valueFloat.zip b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/normative-types-new-validateProporties_typeInit_valueFloat.zip
new file mode 100644
index 0000000000..91b69dd746
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/normative-types-new-validateProporties_typeInit_valueFloat.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/validateProporties_typeInit_valueFloat.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/validateProporties_typeInit_valueFloat.json
new file mode 100644
index 0000000000..2e7f5f232a
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/validateProporties_typeInit_valueFloat.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-validateProporties_typeInit_valueFloat.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.SoftwareComponent",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Abstract"
+ }]
+ }],
+ "tags": [
+ "tosca.nodes.SoftwareComponent"
+ ]
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/normative-types-new-validateProporties_typeInit_valueString.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/normative-types-new-validateProporties_typeInit_valueString.yml
new file mode 100644
index 0000000000..7bd723e915
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/normative-types-new-validateProporties_typeInit_valueString.yml
@@ -0,0 +1,21 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.validateProporties_typeInit_valueString:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ validation_test:
+ type: integer
+ required: false
+ default: abcd
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/normative-types-new-validateProporties_typeInit_valueString.zip b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/normative-types-new-validateProporties_typeInit_valueString.zip
new file mode 100644
index 0000000000..747e215071
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/normative-types-new-validateProporties_typeInit_valueString.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/validateProporties_typeInit_valueString.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/validateProporties_typeInit_valueString.json
new file mode 100644
index 0000000000..29e4b29be0
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/validateProporties_typeInit_valueString.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-validateProporties_typeInit_valueString.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.SoftwareComponent",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Abstract"
+ }]
+ }],
+ "tags": [
+ "tosca.nodes.SoftwareComponent"
+ ]
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/normative-types-new-validateProporties_typeList_valueUrlCredential.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/normative-types-new-validateProporties_typeList_valueUrlCredential.yml
new file mode 100644
index 0000000000..217f3405e2
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/normative-types-new-validateProporties_typeList_valueUrlCredential.yml
@@ -0,0 +1,50 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.validateProporties_typeList_valueUrlCredential:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ validation_test:
+ type: list
+ required: false
+ default:
+ - protocol: protocol1~!#@~$%^*()[];:'"|\/
+ token: token1
+ - protocol: protocol2~!#@~$%^*()[];:'"|\/
+ token: token2
+ entry_schema:
+ type: tosca.datatypes.Credential
+ attributes:
+ validation_test_list:
+ type: list
+ required: false
+ default:
+ - protocol: protocol1~!#@~$%^*()[];:'"|\/
+ token: token1
+ - protocol: protocol2~!#@~$%^*()[];:'"|\/
+ token: token2
+ entry_schema:
+ type: tosca.datatypes.Credential
+ validation_test_map:
+ type: map
+ required: false
+ default:
+ key1:
+ protocol: protocol1~!#@~$%^*()[];:'"|\/
+ token: token1
+ key2:
+ protocol: protocol2~!#@~$%^*()[];:'"|\/
+ token: token2
+ entry_schema:
+ type: tosca.datatypes.Credential
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/normative-types-new-validateProporties_typeList_valueUrlCredential.zip b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/normative-types-new-validateProporties_typeList_valueUrlCredential.zip
new file mode 100644
index 0000000000..10b1ce10ac
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/normative-types-new-validateProporties_typeList_valueUrlCredential.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/validateProporties_typeList_valueUrlCredential.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/validateProporties_typeList_valueUrlCredential.json
new file mode 100644
index 0000000000..59d6bbff21
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/validateProporties_typeList_valueUrlCredential.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-validateProporties_typeList_valueUrlCredential.yml",
+ "contactId": "jh0003",
+ "name": "resourceListValueCredential",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Abstract"
+ }]
+ }],
+ "tags": ["resourceListValueCredential"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/normative-types-new-validateProporties_typeMap_valueUrlCredential.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/normative-types-new-validateProporties_typeMap_valueUrlCredential.yml
new file mode 100644
index 0000000000..2ce14b21a9
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/normative-types-new-validateProporties_typeMap_valueUrlCredential.yml
@@ -0,0 +1,29 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.validateProporties_typeMap_valueUrlCredential:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ validation_test:
+ type: map
+ required: false
+ default:
+ key1:
+ protocol: protocol1
+ token: token1
+ key2:
+ protocol: protocol2
+ token: token2
+ entry_schema:
+ type: tosca.datatypes.Credential
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/normative-types-new-validateProporties_typeMap_valueUrlCredential.zip b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/normative-types-new-validateProporties_typeMap_valueUrlCredential.zip
new file mode 100644
index 0000000000..9a8f093d95
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/normative-types-new-validateProporties_typeMap_valueUrlCredential.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/validateProporties_typeMap_valueUrlCredential.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/validateProporties_typeMap_valueUrlCredential.json
new file mode 100644
index 0000000000..3fb0bec243
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/validateProporties_typeMap_valueUrlCredential.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-validateProporties_typeMap_valueUrlCredential.yml",
+ "contactId": "jh0003",
+ "name": "resourceMapValueCredential",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Abstract"
+ }]
+ }],
+ "tags": ["resourceMapValueCredential"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_special_chars/normative-types-new-validateProporties_typeString_valueString_special_chars.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_special_chars/normative-types-new-validateProporties_typeString_valueString_special_chars.yml
new file mode 100644
index 0000000000..cc109d1528
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_special_chars/normative-types-new-validateProporties_typeString_valueString_special_chars.yml
@@ -0,0 +1,19 @@
+validateProporties_typeString_valueString_special_chars:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ validation_test:
+ type: string
+ required: false
+ default: ~!#@~
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_special_chars/validateProporties_typeString_valueString_special_chars.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_special_chars/validateProporties_typeString_valueString_special_chars.json
new file mode 100644
index 0000000000..90f66e800e
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_special_chars/validateProporties_typeString_valueString_special_chars.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-validateProporties_typeString_valueString_special_chars.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.SoftwareComponent",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Abstract"
+ }]
+ }],
+ "tags": [
+ "tosca.nodes.SoftwareComponent"
+ ]
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_trimming/normative-types-new-validateProporties_typeString_valueString_trimming.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_trimming/normative-types-new-validateProporties_typeString_valueString_trimming.yml
new file mode 100644
index 0000000000..4ecd161682
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_trimming/normative-types-new-validateProporties_typeString_valueString_trimming.yml
@@ -0,0 +1,19 @@
+validateProporties_typeBoolean_valueInit:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ validation_test:
+ type: boolean
+ required: false
+ default: true
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_trimming/validateProporties_typeString_valueString_trimming.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_trimming/validateProporties_typeString_valueString_trimming.json
new file mode 100644
index 0000000000..34d9321b7e
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_trimming/validateProporties_typeString_valueString_trimming.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-validateProporties_typeBoolean_valueInit.yml",
+ "contactId": "jh0003",
+ "name": "tosca.nodes.SoftwareComponent",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Abstract"
+ }]
+ }],
+ "tags": [
+ "tosca.nodes.SoftwareComponent"
+ ]
+} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/normative-types-new-validateProporties_typeMap.yml b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/normative-types-new-validateProporties_typeMap.yml
new file mode 100644
index 0000000000..feb13b367f
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/normative-types-new-validateProporties_typeMap.yml
@@ -0,0 +1,32 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.validateProporties_type:
+ derived_from: tosca.nodes.Root
+ properties:
+ # domain-specific software component version
+ component_version:
+ type: version
+ required: false
+ admin_credential:
+ type: tosca.datatypes.Credential
+ required: false
+ myprop:
+ type: tosca.datatypes.network.PortInfoComplex
+ default:
+ addressesMap:
+ key1:
+ protocol: protocol1
+ token: token1
+ key2:
+ protocol: protocol2
+ token: token2
+ addressesList:
+ - protocol: protocol1~!#@~$%^*()[];:'"|\/
+ token: token1
+ - protocol: protocol2~!#@~$%^*()[];:'"|\/
+ token: token2
+ requirements:
+ - host:
+ capability: tosca.capabilities.Container
+ node: tosca.nodes.Compute
+ relationship: tosca.relationships.HostedOn
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/normative-types-new-validateProporties_typeMap.zip b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/normative-types-new-validateProporties_typeMap.zip
new file mode 100644
index 0000000000..e8f0470948
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/normative-types-new-validateProporties_typeMap.zip
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/validateProporties_typeTestDataType.json b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/validateProporties_typeTestDataType.json
new file mode 100644
index 0000000000..b751545f11
--- /dev/null
+++ b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/validateProporties_typeTestDataType.json
@@ -0,0 +1,16 @@
+{
+ "payloadName": "normative-types-new-validateProporties_typeMap.yml",
+ "contactId": "jh0003",
+ "name": "resourceMapValueTest",
+ "description": "Represents a generic software component that can be managed and run by a Compute Node Type.",
+ "resourceIconPath": "defaulticon",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Abstract"
+ }]
+ }],
+ "tags": ["resourceMapValueTest"],
+ "vendorName": "ATT (Tosca)",
+ "vendorRelease": "1.0.0.wd03"
+} \ No newline at end of file