From 44f41b4e5406c978214a6f6a743020983d9ea301 Mon Sep 17 00:00:00 2001 From: "dhanush.p" Date: Mon, 9 Mar 2026 10:51:27 +0100 Subject: [PATCH] [SDC]: Added new categories for models Issue-ID: SDC-4799 Change-Id: I6e0cfc36697d7456c856abcd6c3d8c288bfe3c09 Signed-off-by: dhanush.p --- .../src/main/resources/config/configuration.yaml | 12 ++++++++++ .../import/tosca/categories/categoryTypes.yml | 24 +++++++++++++++++++ .../resources/config/catalog-be/configuration.yaml | 28 ++++++++++++++++++++++ catalog-ui/cypress/fixtures/common/setup-ui.json | 12 ++++++++++ catalog-ui/src/app/utils/constants.ts | 4 ++++ .../openecomp/sdc/common/api/ArtifactTypeEnum.java | 6 ++++- docs/configuration.rst | 16 +++++++++++++ docs/openapi/openapi-sdce-1.json | 6 ++--- docs/openapi/openapi-sdce-1.yaml | 12 ++++++++++ .../catalog-be/configuration.yaml | 28 ++++++++++++++++++++++ .../ci/tests/datatypes/enums/ArtifactTypeEnum.java | 2 +- .../sdc/heat/datatypes/manifest/FileData.java | 4 ++++ 12 files changed, 149 insertions(+), 5 deletions(-) diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index 8c8ca1cb37..6af82169a9 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -582,6 +582,18 @@ resourceInformationalArtifacts: MURANO_PKG: acceptedTypes: validForResourceTypes: *allResourceTypes + CERTIFICATE: + acceptedTypes: + validForResourceTypes: *allResourceTypes + LICENSE: + acceptedTypes: + validForResourceTypes: *allResourceTypes + CONFIG_TEMPLATE: + acceptedTypes: + validForResourceTypes: *allResourceTypes + MAPPING_TEMPLATE: + acceptedTypes: + validForResourceTypes: *allResourceTypes OTHER: acceptedTypes: validForResourceTypes: diff --git a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml index 1f712b44cf..6a4bf4f670 100644 --- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml @@ -221,3 +221,27 @@ resources: SecurityZone: name: "Security Zone" icons: ['security_zone'] + RAN: + name: "RAN" + subcategories: + BBU: + name: "BBU" + icons: [ 'router' ] + eNB: + name: "eNB" + icons: [ 'vRouter' ] + gNB: + name: "gNB" + icons: [ 'vRouter' ] + CUCP: + name: "CUCP" + icons: [ 'vRouter' ] + CUUP: + name: "CUUP" + icons: [ 'vRouter' ] + DU: + name: "DU" + icons: [ 'vRouter' ] + RU: + name: "RU" + icons: [ 'router' ] diff --git a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml index 3ec3793d43..d05cb10e42 100644 --- a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml +++ b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml @@ -1070,6 +1070,34 @@ artifacts: - RESOURCE resourceTypes: *allResourceTypes acceptedTypes: + - type: CERTIFICATE + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: LICENSE + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: CONFIG_TEMPLATE + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: MAPPING_TEMPLATE + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: - type: PNF_SW_INFORMATION categories: - INFORMATIONAL diff --git a/catalog-ui/cypress/fixtures/common/setup-ui.json b/catalog-ui/cypress/fixtures/common/setup-ui.json index 2c619a3eb2..e56280ee3b 100644 --- a/catalog-ui/cypress/fixtures/common/setup-ui.json +++ b/catalog-ui/cypress/fixtures/common/setup-ui.json @@ -78,6 +78,18 @@ { "name": "MURANO_PKG" }, + { + "name": "CERTIFICATE" + }, + { + "name": "LICENSE" + }, + { + "name": "CONFIG_TEMPLATE" + }, + { + "name": "MAPPING_TEMPLATE" + }, { "name": "WORKFLOW" }, diff --git a/catalog-ui/src/app/utils/constants.ts b/catalog-ui/src/app/utils/constants.ts index 8c62cec739..7749a8473f 100644 --- a/catalog-ui/src/app/utils/constants.ts +++ b/catalog-ui/src/app/utils/constants.ts @@ -129,6 +129,10 @@ export class ArtifactType { static HEAT_NET = "HEAT_NET"; static VF_LICENSE = "VF_LICENSE"; static PM_DICTIONARY = "PM_DICTIONARY"; + static CERTIFICATE = "CERTIFICATE"; + static LICENSE = "LICENSE"; + static CONFIG_TEMPLATE = "CONFIG_TEMPLATE"; + static MAPPING_TEMPLATE = "MAPPING_TEMPLATE"; static VENDOR_LICENSE = "VENDOR_LICENSE"; static THIRD_PARTY_RESERVED_TYPES = { WORKFLOW: "WORKFLOW", diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java b/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java index 6cb17e8116..22be875dc7 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java @@ -95,6 +95,10 @@ public enum ArtifactTypeEnum { WORKFLOW("WORKFLOW"), YANG_MODULE("YANG_MODULE"), YANG_XML("YANG_XML"), + CERTIFICATE("CERTIFICATE"), + LICENSE("LICENSE"), + CONFIG_TEMPLATE("CONFIG_TEMPLATE"), + MAPPING_TEMPLATE("MAPPING_TEMPLATE"), YANG("YANG"); // @formatter:on @@ -129,7 +133,7 @@ public enum ArtifactTypeEnum { MODEL_INVENTORY_PROFILE, MODEL_QUERY_SPEC, MURANO_PKG, NETWORK_CALL_FLOW, ONBOARDED_PACKAGE, OTHER, PERFORMANCE_COUNTER, PLAN, PM_DICTIONARY, PNF_SW_INFORMATION, PUPPET, SHELL, SHELL_SCRIPT, SNMP_POLL, SNMP_TRAP, TOSCA_CSAR, TOSCA_TEMPLATE, UCPE_LAYER_2_CONFIGURATION, VENDOR_LICENSE, VES_EVENTS, VF_LICENSE, VF_MODULES_METADATA, VNF_CATALOG, WORKFLOW, YANG, YANG_MODULE, - YANG_XML); + YANG_XML, CERTIFICATE, LICENSE, CONFIG_TEMPLATE, MAPPING_TEMPLATE); return new HashSet<>(artifactTypeEnums); } diff --git a/docs/configuration.rst b/docs/configuration.rst index 480aeadd8b..f84aa8ba1a 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -293,6 +293,10 @@ BE-configuration.yaml - BPEL - DG_XML - MURANO_PKG + - CERTIFICATE + - MAPPING_TEMPLATE + - LICENSE + - CONFIG_TEMPLATE - WORKFLOW - NETWORK_CALL_FLOW - TOSCA_TEMPLATE @@ -751,6 +755,18 @@ BE-configuration.yaml MURANO_PKG: acceptedTypes: validForResourceTypes: *allResourceTypes + CERTIFICATE: + acceptedTypes: + validForResourceTypes: *allResourceTypes + LICENSE: + acceptedTypes: + validForResourceTypes: *allResourceTypes + CONFIG_TEMPLATE: + acceptedTypes: + validForResourceTypes: *allResourceTypes + MAPPING_TEMPLATE: + acceptedTypes: + validForResourceTypes: *allResourceTypes OTHER: acceptedTypes: validForResourceTypes: diff --git a/docs/openapi/openapi-sdce-1.json b/docs/openapi/openapi-sdce-1.json index e70283dbb5..aa5b8750c7 100644 --- a/docs/openapi/openapi-sdce-1.json +++ b/docs/openapi/openapi-sdce-1.json @@ -8260,7 +8260,7 @@ }, "type" : { "type" : "string", - "enum" : [ "HEAT", "HEAT_ENV", "HEAT_NET", "HEAT_VOL", "CHEF", "PUPPET", "SHELL", "YANG", "YANG_XML", "BPEL", "DG_XML", "MURANO_PKG", "VENDOR_LICENSE", "VF_LICENSE", "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT", "CONTROLLER_BLUEPRINT_ARCHIVE", "HELM", "OTHER", "PNF_SW_INFORMATION", "PM_DICTIONARY" ] + "enum" : [ "HEAT", "HEAT_ENV", "HEAT_NET", "HEAT_VOL", "CHEF", "PUPPET", "SHELL", "YANG", "YANG_XML", "BPEL", "DG_XML", "MURANO_PKG", "VENDOR_LICENSE", "VF_LICENSE", "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT", "CONTROLLER_BLUEPRINT_ARCHIVE", "HELM", "OTHER", "PNF_SW_INFORMATION", "PM_DICTIONARY", "CERTIFICATE", "LICENSE", "CONFIG_TEMPLATE", "MAPPING_TEMPLATE" ] } } }, @@ -9186,7 +9186,7 @@ }, "type" : { "type" : "string", - "enum" : [ "HEAT", "HEAT_ENV", "HEAT_NET", "HEAT_VOL", "CHEF", "PUPPET", "SHELL", "YANG", "YANG_XML", "BPEL", "DG_XML", "MURANO_PKG", "VENDOR_LICENSE", "VF_LICENSE", "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT", "CONTROLLER_BLUEPRINT_ARCHIVE", "HELM", "OTHER", "PNF_SW_INFORMATION", "PM_DICTIONARY" ] + "enum" : [ "HEAT", "HEAT_ENV", "HEAT_NET", "HEAT_VOL", "CHEF", "PUPPET", "SHELL", "YANG", "YANG_XML", "BPEL", "DG_XML", "MURANO_PKG", "VENDOR_LICENSE", "VF_LICENSE", "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT", "CONTROLLER_BLUEPRINT_ARCHIVE", "HELM", "OTHER", "PNF_SW_INFORMATION", "PM_DICTIONARY", "CERTIFICATE", "LICENSE", "CONFIG_TEMPLATE", "MAPPING_TEMPLATE" ] }, "volume" : { "type" : "array", @@ -9731,7 +9731,7 @@ }, "type" : { "type" : "string", - "enum" : [ "HEAT", "HEAT_ENV", "HEAT_NET", "HEAT_VOL", "CHEF", "PUPPET", "SHELL", "YANG", "YANG_XML", "BPEL", "DG_XML", "MURANO_PKG", "VENDOR_LICENSE", "VF_LICENSE", "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT", "CONTROLLER_BLUEPRINT_ARCHIVE", "HELM", "OTHER", "PNF_SW_INFORMATION", "PM_DICTIONARY" ] + "enum" : [ "HEAT", "HEAT_ENV", "HEAT_NET", "HEAT_VOL", "CHEF", "PUPPET", "SHELL", "YANG", "YANG_XML", "BPEL", "DG_XML", "MURANO_PKG", "VENDOR_LICENSE", "VF_LICENSE", "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT", "CONTROLLER_BLUEPRINT_ARCHIVE", "HELM", "OTHER", "PNF_SW_INFORMATION", "PM_DICTIONARY", "CERTIFICATE", "LICENSE", "CONFIG_TEMPLATE", "MAPPING_TEMPLATE" ] }, "vol" : { "type" : "string" diff --git a/docs/openapi/openapi-sdce-1.yaml b/docs/openapi/openapi-sdce-1.yaml index 3dd236e9e6..addf6563a8 100644 --- a/docs/openapi/openapi-sdce-1.yaml +++ b/docs/openapi/openapi-sdce-1.yaml @@ -6158,6 +6158,10 @@ components: - BPEL - DG_XML - MURANO_PKG + - CERTIFICATE + - LICENSE + - CONFIG_TEMPLATE + - MAPPING_TEMPLATE - VENDOR_LICENSE - VF_LICENSE - CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT @@ -6972,6 +6976,10 @@ components: - BPEL - DG_XML - MURANO_PKG + - CERTIFICATE + - LICENSE + - CONFIG_TEMPLATE + - MAPPING_TEMPLATE - VENDOR_LICENSE - VF_LICENSE - CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT @@ -7408,6 +7416,10 @@ components: - BPEL - DG_XML - MURANO_PKG + - CERTIFICATE + - LICENSE + - CONFIG_TEMPLATE + - MAPPING_TEMPLATE - VENDOR_LICENSE - VF_LICENSE - CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT diff --git a/integration-tests/catalog-be-resources/catalog-be/configuration.yaml b/integration-tests/catalog-be-resources/catalog-be/configuration.yaml index 3552acb8b6..3b3c9f32ae 100644 --- a/integration-tests/catalog-be-resources/catalog-be/configuration.yaml +++ b/integration-tests/catalog-be-resources/catalog-be/configuration.yaml @@ -722,6 +722,34 @@ artifacts: - RESOURCE resourceTypes: *allResourceTypes acceptedTypes: + - type: CERTIFICATE + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: LICENSE + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: CONFIG_TEMPLATE + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: MAPPING_TEMPLATE + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: - type: PNF_SW_INFORMATION categories: - INFORMATIONAL diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ArtifactTypeEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ArtifactTypeEnum.java index 5271fed564..88125fa369 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ArtifactTypeEnum.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ArtifactTypeEnum.java @@ -30,7 +30,7 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum ArtifactTypeEnum { - CHEF("CHEF"), PUPPET("PUPPET"), YANG("YANG"), SHELL_SCRIPT("SHELL_SCRIPT"), ICON("ICON"), UNKNOWN("UNKNOWN"), HEAT("HEAT"), DG_XML("DG_XML"), MURANO_PKG("MURANO_PKG"), + CHEF("CHEF"), PUPPET("PUPPET"), YANG("YANG"), SHELL_SCRIPT("SHELL_SCRIPT"), ICON("ICON"), UNKNOWN("UNKNOWN"), HEAT("HEAT"), DG_XML("DG_XML"), MURANO_PKG("MURANO_PKG"), CERTIFICATE("CERTIFICATE"), LICENSE("LICENSE"), CONFIG_TEMPLATE("CONFIG_TEMPLATE"), MAPPING_TEMPLATE("MAPPING_TEMPLATE"), HEAT_ENV("HEAT_ENV"), YANG_XML("YANG_XML"), HEAT_VOL("HEAT_VOL"), HEAT_NET("HEAT_NET"), OTHER("OTHER"), WORKFLOW("WORKFLOW"), NETWORK_CALL_FLOW("NETWORK_CALL_FLOW"), TOSCA_TEMPLATE("TOSCA_TEMPLATE"), TOSCA_CSAR("TOSCA_CSAR"), VNF_CATALOG("VNF_CATALOG"), VF_LICENSE("VF_LICENSE"), VENDOR_LICENSE("VENDOR_LICENSE"), MODEL_INVENTORY_PROFILE("MODEL_INVENTORY_PROFILE"), MODEL_QUERY_SPEC("MODEL_QUERY_SPEC"), APPC_CONFIG("APPC_CONFIG"), HEAT_NESTED("HEAT_NESTED"), diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/manifest/FileData.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/manifest/FileData.java index 0e079414d2..bfe7341f95 100644 --- a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/manifest/FileData.java +++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/manifest/FileData.java @@ -88,6 +88,10 @@ public class FileData { BPEL("BPEL"), DG_XML("DG_XML"), MURANO_PKG("MURANO_PKG"), + CERTIFICATE("CERTIFICATE"), + LICENSE("LICENSE"), + CONFIG_TEMPLATE("CONFIG_TEMPLATE"), + MAPPING_TEMPLATE("MAPPING_TEMPLATE"), VENDOR_LICENSE("VENDOR_LICENSE"), VF_LICENSE("VF_LICENSE"), CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT("CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT"), -- 2.16.6