From 1eeee67f4e115e70ddb6ad62b1446fa6ff6f48a9 Mon Sep 17 00:00:00 2001 From: "andre.schmid" Date: Thu, 10 Dec 2020 18:00:32 +0000 Subject: Update ETSI NFV Network Service category Change-Id: Idbc88a7a047e539d1826997e8d98af23c3ee9bbd Issue-ID: SDC-3416 Signed-off-by: andre.schmid --- .../plugins/etsi/nfv/nsd/generator/EtsiNfvNsCsarEntryGenerator.java | 2 +- .../sdc-catalog-be/templates/default/BE-configuration.yaml.erb | 4 ++-- .../src/main/resources/import/tosca/categories/categoryTypes.yml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/EtsiNfvNsCsarEntryGenerator.java b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/EtsiNfvNsCsarEntryGenerator.java index 00aef05ed7..217b334f1a 100644 --- a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/EtsiNfvNsCsarEntryGenerator.java +++ b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/EtsiNfvNsCsarEntryGenerator.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; public class EtsiNfvNsCsarEntryGenerator implements CsarEntryGenerator { private static final Logger LOGGER = LoggerFactory.getLogger(EtsiNfvNsCsarEntryGenerator.class); - static final String ETSI_NS_COMPONENT_CATEGORY = "ETSI Network Service"; + static final String ETSI_NS_COMPONENT_CATEGORY = "ETSI NFV Network Service"; static final String NSD_FILE_PATH_FORMAT = "Artifacts/%s/%s.csar"; private final EtsiNfvNsdCsarGenerator etsiNfvNsdCsarGenerator; diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index 20f00954e3..8e62c4fbf6 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -1019,10 +1019,10 @@ genericAssetNodeTypes: CR : org.openecomp.resource.abstract.nodes.CR PNF: org.openecomp.resource.abstract.nodes.PNF Service: org.openecomp.resource.abstract.nodes.service - ETSI Network Service: tosca.nodes.nfv.NS + ETSI NFV Network Service: tosca.nodes.nfv.NS serviceNodeTypes: - ETSI Network Service: tosca.nodes.nfv.NS + ETSI NFV Network Service: tosca.nodes.nfv.NS workloadContext: Production 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 91fed025e7..7e185c5d60 100644 --- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml @@ -20,9 +20,9 @@ services: Partner_Domain_Service: name: "Partner Domain Service" icons: ['partner_domain_service'] - ETSI_Network_Service: - name: "ETSI Network Service" - icons: ['etsi_network_service'] + ETSI_NFV_Network_Service: + name: "ETSI NFV Network Service" + icons: ['etsi_nfv_network_service'] resources: NetworkLayer23: name: "Network L2-3" -- cgit 1.2.3-korg