summaryrefslogtreecommitdiffstats
path: root/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main
diff options
context:
space:
mode:
authorstasys10 <stasys.jurgaitis@est.tech>2022-02-11 10:26:10 +0000
committerStasys Jurgaitis <stasys.jurgaitis@est.tech>2022-02-15 13:38:22 +0000
commit1105a525206d3c8e36cfdd77d6b033e821617e21 (patch)
treef4dfc4c7c9dae300df923dc9dd305768854a3498 /catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main
parent8549cdded4f452a52aea32be1c97c820fa79b5af (diff)
Fix NSD plugin get version from model name
Issue-ID: SDC-3881 Signed-off-by: stasys10 <stasys.jurgaitis@est.tech> Change-Id: Ib90020e46079866b5846b50aa3f183ae5bf74f6c
Diffstat (limited to 'catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main')
-rw-r--r--catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/EtsiNfvNsCsarEntryGenerator.java6
1 files changed, 5 insertions, 1 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 4640492441..f5d7828e2d 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
@@ -90,7 +90,11 @@ public class EtsiNfvNsCsarEntryGenerator implements CsarEntryGenerator {
}
private EtsiVersion getComponentEtsiVersion(Component component) {
- final String etsiVersion = component.getCategorySpecificMetadata().get(ETSI_VERSION_METADATA);
+ String etsiVersion = component.getCategorySpecificMetadata().get(ETSI_VERSION_METADATA);
+ final String modelName = component.getModel();
+ if (etsiVersion == null && modelName.matches(".*\\d+\\.\\d+\\.\\d+.*" )){
+ etsiVersion = modelName.replaceAll(".*?(\\d+\\.\\d+\\.\\d+).*", "$1");
+ }
return EtsiVersion.convertOrNull(etsiVersion);
}