aboutsummaryrefslogtreecommitdiffstats
path: root/asdc-tests/src/test/resources/CI/importResourceTests
diff options
context:
space:
mode:
Diffstat (limited to 'asdc-tests/src/test/resources/CI/importResourceTests')
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/Derived_VFC/Derived_VFC.json26
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/Derived_VFC/normative-types-new-Derived_VFC.yml5
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/Derived_VFC/normative-types-new-Derived_VFC.zipbin322 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/VSPPackage.csarbin26339 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/caseSensitiveTest_1.csarbin1316 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/caseSensitiveTest_2.csarbin1316 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/csars.zipbin34892 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/fiveLinesAsBlock0.csarbin1325 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion.csarbin1317 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion2.csarbin1315 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion3.csarbin1317 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion4.csarbin1317 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion5.csarbin1319 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile1.csarbin1322 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile2.csarbin1322 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile3.csarbin1319 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile4.csarbin1319 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile5.csarbin1319 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/missingEntryDefintionPair.csarbin1285 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/missingOneLineInToscaMeta.csarbin1295 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/mock_vf.csarbin1316 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/mock_vf2.csarbin1314 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/moreThanOneMetaFile.csarbin1808 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/moreThenOneYamlFile.csarbin2470 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/noCSARVersion.csarbin1316 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/noCreatedByValue.csarbin1304 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/noEntryDefinitionsValue.csarbin1296 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/noNewLineAfterBLock0.csarbin1316 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/noTOSCAMetaFileVersionValue.csarbin1315 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/notContainYamlAndMetaFiles.csarbin490 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/notContainYamlFile.csarbin757 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/someValueAfterBlock0.csarbin1322 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaFolderNotExists.csarbin907 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaMetaFileNotExists.csarbin1049 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaMetaOutsideTheFolder.csarbin1286 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/underscoreInsteadOfDash.csarbin1316 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/validCsarVersion.csarbin1320 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/valid_vf.csarbin1316 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/csars/valid_vf_zip.zipbin1316 -> 0 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.zipbin394 -> 0 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.zipbin409 -> 0 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.zipbin386 -> 0 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.zipbin386 -> 0 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.zipbin400 -> 0 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.zipbin420 -> 0 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.zipbin400 -> 0 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.zipbin408 -> 0 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.zipbin596 -> 0 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.zipbin603 -> 0 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.zipbin628 -> 0 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.zipbin616 -> 0 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.zipbin411 -> 0 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.zipbin422 -> 0 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.zipbin603 -> 0 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.zipbin607 -> 0 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.zipbin603 -> 0 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.zipbin979 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi.zipbin990 -> 0 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.zipbin414 -> 0 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.zipbin413 -> 0 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.zipbin391 -> 0 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.zipbin406 -> 0 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.zipbin406 -> 0 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.zipbin420 -> 0 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.zipbin424 -> 0 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.zipbin406 -> 0 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.zipbin567 -> 0 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.zipbin470 -> 0 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.zipbin610 -> 0 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.zipbin580 -> 0 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.zipbin591 -> 0 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.zipbin542 -> 0 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.zipbin542 -> 0 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.zipbin539 -> 0 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.zipbin538 -> 0 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.zipbin538 -> 0 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.zipbin536 -> 0 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.zipbin536 -> 0 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.zipbin685 -> 0 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.zipbin593 -> 0 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_typeTestDataType.zipbin608 -> 0 bytes
-rw-r--r--asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/validateProporties_typeTestDataType.json16
168 files changed, 0 insertions, 2139 deletions
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/Derived_VFC/Derived_VFC.json b/asdc-tests/src/test/resources/CI/importResourceTests/Derived_VFC/Derived_VFC.json
deleted file mode 100644
index a26149e8e5..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/Derived_VFC/Derived_VFC.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "payloadName": "normative-types-new-Derived_VFC.yml",
- "contactId": "jh0003",
- "name": "ciDerivedVFC",
- "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": [
- "ciDerivedVFC"
- ],
- "vendorName": "UserVendor",
- "vendorRelease": "1.1.1"
-} \ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/Derived_VFC/normative-types-new-Derived_VFC.yml b/asdc-tests/src/test/resources/CI/importResourceTests/Derived_VFC/normative-types-new-Derived_VFC.yml
deleted file mode 100644
index 949fa6e633..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/Derived_VFC/normative-types-new-Derived_VFC.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-node_types:
- org.openecomp.resource.vfc.nodes.VFCderive:
- derived_from: org.openecomp.resource.abstract.nodes.VFC
-
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/Derived_VFC/normative-types-new-Derived_VFC.zip b/asdc-tests/src/test/resources/CI/importResourceTests/Derived_VFC/normative-types-new-Derived_VFC.zip
deleted file mode 100644
index dcc9eb37db..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/Derived_VFC/normative-types-new-Derived_VFC.zip
+++ /dev/null
Binary files differ
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/csars/VSPPackage.csar b/asdc-tests/src/test/resources/CI/importResourceTests/csars/VSPPackage.csar
deleted file mode 100644
index b4aa77511b..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/VSPPackage.csar
+++ /dev/null
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
deleted file mode 100644
index 4b167cfa69..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/caseSensitiveTest_1.csar
+++ /dev/null
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
deleted file mode 100644
index 1f7bc5ac8d..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/caseSensitiveTest_2.csar
+++ /dev/null
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
deleted file mode 100644
index 8a7f5de6e3..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/csars.zip
+++ /dev/null
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
deleted file mode 100644
index 870a777c66..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/fiveLinesAsBlock0.csar
+++ /dev/null
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
deleted file mode 100644
index 273fab3a0b..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion.csar
+++ /dev/null
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
deleted file mode 100644
index aa0027f48e..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion2.csar
+++ /dev/null
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
deleted file mode 100644
index ce9a80b240..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion3.csar
+++ /dev/null
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
deleted file mode 100644
index 88ccb448e7..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion4.csar
+++ /dev/null
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
deleted file mode 100644
index a429110ea1..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/invalidCsarVersion5.csar
+++ /dev/null
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
deleted file mode 100644
index 3361bfd867..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile1.csar
+++ /dev/null
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
deleted file mode 100644
index 200fbd95af..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile2.csar
+++ /dev/null
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
deleted file mode 100644
index 5ffdf6c4c4..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile3.csar
+++ /dev/null
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
deleted file mode 100644
index 30da05f951..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile4.csar
+++ /dev/null
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
deleted file mode 100644
index e5a3fb862b..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/longNamesInToscaMetaFile5.csar
+++ /dev/null
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
deleted file mode 100644
index 63a58bcd27..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/missingEntryDefintionPair.csar
+++ /dev/null
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
deleted file mode 100644
index ac949ce734..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/missingOneLineInToscaMeta.csar
+++ /dev/null
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
deleted file mode 100644
index 4b37f44c73..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/mock_vf.csar
+++ /dev/null
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
deleted file mode 100644
index ec1a65ebb9..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/mock_vf2.csar
+++ /dev/null
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
deleted file mode 100644
index 084ada11cb..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/moreThanOneMetaFile.csar
+++ /dev/null
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
deleted file mode 100644
index 9615c62e73..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/moreThenOneYamlFile.csar
+++ /dev/null
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
deleted file mode 100644
index 65a21c12b8..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/noCSARVersion.csar
+++ /dev/null
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
deleted file mode 100644
index cb08b19463..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/noCreatedByValue.csar
+++ /dev/null
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
deleted file mode 100644
index a3a0e8fd1f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/noEntryDefinitionsValue.csar
+++ /dev/null
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
deleted file mode 100644
index 4b37f44c73..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/noNewLineAfterBLock0.csar
+++ /dev/null
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
deleted file mode 100644
index c2f4d0442a..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/noTOSCAMetaFileVersionValue.csar
+++ /dev/null
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
deleted file mode 100644
index 74058d5f82..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/notContainYamlAndMetaFiles.csar
+++ /dev/null
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
deleted file mode 100644
index 31cc2942d5..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/notContainYamlFile.csar
+++ /dev/null
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
deleted file mode 100644
index e600a39693..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/someValueAfterBlock0.csar
+++ /dev/null
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
deleted file mode 100644
index 17a7e5e39f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaFolderNotExists.csar
+++ /dev/null
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
deleted file mode 100644
index 55e7179505..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaMetaFileNotExists.csar
+++ /dev/null
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
deleted file mode 100644
index 53d6987ac7..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/toscaMetaOutsideTheFolder.csar
+++ /dev/null
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
deleted file mode 100644
index c217dd5006..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/underscoreInsteadOfDash.csar
+++ /dev/null
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
deleted file mode 100644
index 60ac6e3dd2..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/validCsarVersion.csar
+++ /dev/null
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
deleted file mode 100644
index 01bf159071..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/valid_vf.csar
+++ /dev/null
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
deleted file mode 100644
index 66922ae15e..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/csars/valid_vf_zip.zip
+++ /dev/null
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
deleted file mode 100644
index 7ce1fd5e5f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_category/empty_category.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "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
deleted file mode 100644
index 0ab5ac9322..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_category/normative-types-new-empty_category.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 537787f955..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_category/normative-types-new-empty_category.zip
+++ /dev/null
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
deleted file mode 100644
index 6e043f5606..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/empty_contact.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "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
deleted file mode 100644
index 3d9c111871..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/normative-types-new-empty_contact.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index a91defb4f6..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_contact/normative-types-new-empty_contact.zip
+++ /dev/null
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
deleted file mode 100644
index 7aa4c167b4..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/empty_desc.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "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
deleted file mode 100644
index 0ab5ac9322..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/normative-types-new-empty_desc.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index c105c0989f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_desc/normative-types-new-empty_desc.zip
+++ /dev/null
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
deleted file mode 100644
index e1980cee79..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/empty_icon.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "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
deleted file mode 100644
index 0ab5ac9322..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/normative-types-new-empty_icon.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index a500656ff7..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_icon/normative-types-new-empty_icon.zip
+++ /dev/null
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
deleted file mode 100644
index 2e46c69243..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/empty_payloadName.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "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
deleted file mode 100644
index 0ab5ac9322..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/normative-types-new-empty_payloadName.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 901d2de441..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_payloadName/normative-types-new-empty_payloadName.zip
+++ /dev/null
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
deleted file mode 100644
index dff8e13ad5..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/empty_resource_name.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index bad0c73a1f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/normative-types-new-empty_resource_name.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 6146cb8524..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_resource_name/normative-types-new-empty_resource_name.zip
+++ /dev/null
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
deleted file mode 100644
index 5028baa786..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/empty_tag.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index bad0c73a1f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/normative-types-new-empty_tag.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 069b3d1979..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/empty_tag/normative-types-new-empty_tag.zip
+++ /dev/null
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
deleted file mode 100644
index ec361827b0..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/import _multiple_tags.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "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
deleted file mode 100644
index 0ab5ac9322..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/normative-types-new-import _multiple_tags.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 1de1fac68c..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/import _multiple_tags/normative-types-new-import _multiple_tags.zip
+++ /dev/null
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
deleted file mode 100644
index c6a4b47903..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/importResource4test.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index bce6af3db4..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/normative-types-new-importResource4test.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index facd591e1d..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4test/normative-types-new-importResource4test.zip
+++ /dev/null
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
deleted file mode 100644
index 417d8a2854..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/importResource4testCP.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "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
deleted file mode 100644
index fb0cef1068..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/normative-types-new-importResource4testCP.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 9efacc69eb..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testCP/normative-types-new-importResource4testCP.zip
+++ /dev/null
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
deleted file mode 100644
index 3a14cfc1c8..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/importResource4testMissingNameSpace.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "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
deleted file mode 100644
index 693ec75b51..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/normative-types-new-importResource4testMissingNameSpace.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 688fe84b5f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testMissingNameSpace/normative-types-new-importResource4testMissingNameSpace.zip
+++ /dev/null
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
deleted file mode 100644
index 3059d99eec..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/importResource4testUnknown.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "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
deleted file mode 100644
index 115a61a12b..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/normative-types-new-importResource4testUnknown.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 5e2b0ac582..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUnknown/normative-types-new-importResource4testUnknown.zip
+++ /dev/null
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
deleted file mode 100644
index 4e9affe462..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/importResource4testUpdateVendorNameAndCategory.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index 69d88984ac..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/normative-types-new-importResource4testUpdateVendorNameAndCategory.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index bf42a80ed9..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateVendorNameAndCategory/normative-types-new-importResource4testUpdateVendorNameAndCategory.zip
+++ /dev/null
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
deleted file mode 100644
index f6ab834378..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/importResource4testUpdateWithoutReqCap.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "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
deleted file mode 100644
index a580e8b7c6..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/normative-types-new-importResource4testUpdateWithoutReqCap.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 75622b7c25..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testUpdateWithoutReqCap/normative-types-new-importResource4testUpdateWithoutReqCap.zip
+++ /dev/null
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
deleted file mode 100644
index 6ebba43604..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/importResource4testVF.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "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
deleted file mode 100644
index 2879ab8cc8..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/normative-types-new-importResource4testVF.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index b6ccc062eb..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVF/normative-types-new-importResource4testVF.zip
+++ /dev/null
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
deleted file mode 100644
index b5e2e329bd..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/importResource4testVFC.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "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
deleted file mode 100644
index cdf347e872..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/normative-types-new-importResource4testVFC.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 97daa8e401..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVFC/normative-types-new-importResource4testVFC.zip
+++ /dev/null
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
deleted file mode 100644
index 158530a3e5..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/importResource4testVL.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "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
deleted file mode 100644
index 55888da2bc..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/normative-types-new-importResource4testVL.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 5d3a7e6b50..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/importResource4testVL/normative-types-new-importResource4testVL.zip
+++ /dev/null
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
deleted file mode 100644
index 72fe26e0d1..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypes.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-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
deleted file mode 100644
index 4f945a7d1f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypes.zip
+++ /dev/null
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
deleted file mode 100644
index 550cd756f4..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi.zip
+++ /dev/null
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
deleted file mode 100644
index 31fac955e3..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi_MissingDerivedFrom.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-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
deleted file mode 100644
index 12c7d5a977..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/import_capabilitiesTypes/capabilityTypesCi_WithoutRoot.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-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
deleted file mode 100644
index 23a7d76103..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_category/missing_category.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "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
deleted file mode 100644
index bad0c73a1f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_category/normative-types-new-missing_category.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 7a458426b4..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_category/normative-types-new-missing_category.zip
+++ /dev/null
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
deleted file mode 100644
index 8f3e5ae2e2..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/missing_contact.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "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
deleted file mode 100644
index 3d9c111871..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/normative-types-new-missing_contact.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index d89b711cdb..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_contact/normative-types-new-missing_contact.zip
+++ /dev/null
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
deleted file mode 100644
index 37a55bf17a..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/missing_derived_from.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index 82069ecb7b..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/normative-types-new-missing_derived_from.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 22e3d4da29..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_derived_from/normative-types-new-missing_derived_from.zip
+++ /dev/null
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
deleted file mode 100644
index bec3896cfd..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/missing_desc.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "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
deleted file mode 100644
index bad0c73a1f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/normative-types-new-missing_desc.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 6cdde04c67..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_desc/normative-types-new-missing_desc.zip
+++ /dev/null
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
deleted file mode 100644
index 9e9b7572bc..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/missing_icon.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "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
deleted file mode 100644
index bad0c73a1f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/normative-types-new-missing_icon.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 5a53c7b5bf..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_icon/normative-types-new-missing_icon.zip
+++ /dev/null
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
deleted file mode 100644
index 58df0f7400..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/missing_payloadName.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "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
deleted file mode 100644
index bad0c73a1f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/normative-types-new-missing_payloadName.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 2de80ad97a..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_payloadName/normative-types-new-missing_payloadName.zip
+++ /dev/null
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
deleted file mode 100644
index dbf7ef82f1..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/missing_resource_name.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index bad0c73a1f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/normative-types-new-missing_resource_name.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index b6ae3ba9ad..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_resource_name/normative-types-new-missing_resource_name.zip
+++ /dev/null
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
deleted file mode 100644
index 36c845f001..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/missing_tags.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "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
deleted file mode 100644
index bad0c73a1f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/normative-types-new-missing_tags.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 0ad7b6ee05..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/missing_tags/normative-types-new-missing_tags.zip
+++ /dev/null
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
deleted file mode 100644
index af216b7c21..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/myCompute.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "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
deleted file mode 100644
index dff93f621a..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-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
deleted file mode 100644
index a4fb8979fc..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.zip
+++ /dev/null
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
deleted file mode 100644
index eccfd4ddc5..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/normative-types-new-portInvalidDefaultValue.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index fed020cdd3..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/normative-types-new-portInvalidDefaultValue.zip
+++ /dev/null
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
deleted file mode 100644
index 6b6e064a30..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/portInvalidDefaultValue/portInvalidDefaultValue.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index de109820a9..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/userCompute/normative-types-new-userCompute.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-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
deleted file mode 100644
index 895d397728..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/userCompute/normative-types-new-userCompute.zip
+++ /dev/null
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
deleted file mode 100644
index ab10c0b523..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/userCompute/userCompute.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "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
deleted file mode 100644
index 5c73365640..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/normative-types-new-userUpdateCompute.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index 25a0312031..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/normative-types-new-userUpdateCompute.zip
+++ /dev/null
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
deleted file mode 100644
index 6e63c434fb..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/userUpdateCompute/userUpdateCompute.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "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
deleted file mode 100644
index af70663fbe..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/normative-types-new-validateProporties_happyScenarios.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index 4104dc3618..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/normative-types-new-validateProporties_happyScenarios.zip
+++ /dev/null
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
deleted file mode 100644
index 1235ba57e6..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_happyScenarios/validateProporties_happyScenarios.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "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
deleted file mode 100644
index 14778745ef..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/normative-types-new-validateProporties_typeBoolean_valueInit.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 46dc70477b..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/normative-types-new-validateProporties_typeBoolean_valueInit.zip
+++ /dev/null
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
deleted file mode 100644
index c4f4b37911..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueInit/validateProporties_typeBoolean_valueInit.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "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
deleted file mode 100644
index 4d529ad285..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/normative-types-new-validateProporties_typeBoolean_valueString.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 5cc2e4f916..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/normative-types-new-validateProporties_typeBoolean_valueString.zip
+++ /dev/null
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
deleted file mode 100644
index f1ff279a84..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeBoolean_valueString/validateProporties_typeBoolean_valueString.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "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
deleted file mode 100644
index fee8c9b68e..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/normative-types-new-validateProporties_typeFloat_valueBoolean.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 9ac3bb72e4..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/normative-types-new-validateProporties_typeFloat_valueBoolean.zip
+++ /dev/null
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
deleted file mode 100644
index f1769769d4..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueBoolean/validateProporties_typeFloat_valueBoolean.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "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
deleted file mode 100644
index 88e5bb85c3..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/normative-types-new-validateProporties_typeFloat_valueString.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 88d67edc48..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/normative-types-new-validateProporties_typeFloat_valueString.zip
+++ /dev/null
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
deleted file mode 100644
index 3eab4bb311..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeFloat_valueString/validateProporties_typeFloat_valueString.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "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
deleted file mode 100644
index 69bd3ba41e..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/normative-types-new-validateProporties_typeInit_valueBoolean.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 04b32e1dee..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/normative-types-new-validateProporties_typeInit_valueBoolean.zip
+++ /dev/null
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
deleted file mode 100644
index bb145d2f28..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueBoolean/validateProporties_typeInit_valueBoolean.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index 60ae3b6333..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/normative-types-new-validateProporties_typeInit_valueFloat.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index b224b70d40..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/normative-types-new-validateProporties_typeInit_valueFloat.zip
+++ /dev/null
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
deleted file mode 100644
index 2e7f5f232a..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueFloat/validateProporties_typeInit_valueFloat.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index 7bd723e915..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/normative-types-new-validateProporties_typeInit_valueString.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index d7eb9f59b1..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/normative-types-new-validateProporties_typeInit_valueString.zip
+++ /dev/null
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
deleted file mode 100644
index 29e4b29be0..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeInit_valueString/validateProporties_typeInit_valueString.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index 217f3405e2..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/normative-types-new-validateProporties_typeList_valueUrlCredential.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index 7fee84c8a5..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/normative-types-new-validateProporties_typeList_valueUrlCredential.zip
+++ /dev/null
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
deleted file mode 100644
index 59d6bbff21..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeList_valueUrlCredential/validateProporties_typeList_valueUrlCredential.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index 2ce14b21a9..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/normative-types-new-validateProporties_typeMap_valueUrlCredential.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index c7e65e7068..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/normative-types-new-validateProporties_typeMap_valueUrlCredential.zip
+++ /dev/null
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
deleted file mode 100644
index 3fb0bec243..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeMap_valueUrlCredential/validateProporties_typeMap_valueUrlCredential.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index cc109d1528..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_special_chars/normative-types-new-validateProporties_typeString_valueString_special_chars.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 90f66e800e..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_special_chars/validateProporties_typeString_valueString_special_chars.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index 4ecd161682..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_trimming/normative-types-new-validateProporties_typeString_valueString_trimming.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 34d9321b7e..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeString_valueString_trimming/validateProporties_typeString_valueString_trimming.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index feb13b367f..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/normative-types-new-validateProporties_typeMap.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-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_typeTestDataType.zip b/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/normative-types-new-validateProporties_typeTestDataType.zip
deleted file mode 100644
index 27ce7bc887..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/normative-types-new-validateProporties_typeTestDataType.zip
+++ /dev/null
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
deleted file mode 100644
index b751545f11..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/validateProporties_typeTestDataType/validateProporties_typeTestDataType.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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