diff options
| author |   davsad <david.sadlier@est.tech> | 2021-01-19 10:57:11 +0000 |
|---|---|---|
| committer |   Christophe Closset <christophe.closset@intl.att.com> | 2021-01-30 09:21:27 +0000 |
| commit | 7ceb6f99ee7490cebc0e2641acfe453029875cc0 (patch) | |
| tree | 0b4a28ccae9db8cf5ca62bab4792603aff6b27d4 | |
| parent | 042fd65934cebd6447ba3f08571d4bf8a635b665 (diff) | |
Fix onboarding artifact name error
Allowing for @ in Yang files names e.g. samplefile@2021-01-19.yang
Issue-ID: SDC-3414
Change-Id: I20b1f5fceeace24709799b3953d82238bc2b85df
Signed-off-by: davsad <david.sadlier@est.tech>
3 files changed, 7 insertions, 2 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java index 123e1b18ad..764213209b 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java @@ -153,7 +153,7 @@ public class CsarUtils { public static final String ARTIFACTS = "Artifacts"; private static final String DEFINITION = "Definitions"; private static final String DEL_PATTERN = "([/\\\\]+)"; - private static final String WORD_PATTERN = "\\w\\_\\-\\.\\s]+)"; + private static final String WORD_PATTERN = "\\w\\_\\@\\-\\.\\s]+)"; public static final String VALID_ENGLISH_ARTIFACT_NAME = "([" + WORD_PATTERN; private static final String VALID_ENGLISH_ARTIFACT_NAME_WITH_DIGITS = "([\\d" + WORD_PATTERN; private static final String ARTIFACT_NAME_UNIQUE_ID = "ArtifactName {}, unique ID {}"; diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java b/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java index 57cf96e068..dfecf927d8 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java @@ -99,7 +99,7 @@ public class ValidationUtils { Arrays.asList("of", "to", "for", "as", "a", "an", "the")); public static final Pattern COST_PATTERN = Pattern.compile("^[0-9]{1,5}\\.[0-9]{1,3}$"); - public static final Pattern ARTIFACT_LABEL_PATTERN = Pattern.compile("^[a-zA-Z0-9 \\-+]+$"); + public static final Pattern ARTIFACT_LABEL_PATTERN = Pattern.compile("^[a-zA-Z0-9 \\-@+]+$"); public static final Integer ARTIFACT_LABEL_LENGTH = 255; public static final Pattern ARTIFACT_DISPLAY_NAME_PATTERN = Pattern.compile("^[a-zA-Z0-9][a-zA-Z0-9 &\\.'#=:@_\\-+]+$"); public static final Pattern CATEGORY_LABEL_PATTERN = Pattern.compile("^[a-zA-Z0-9][a-zA-Z0-9 &\\.'#=:@_\\-+]+$"); diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java index 467f1cf545..2d5122a13f 100644 --- a/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java +++ b/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java @@ -902,6 +902,11 @@ final String testArtifactDisplayName="test=notValid=Label"; } @Test + public void checkValidateArtifactLabelReturnsTrueWithAtSymbol() { + assertTrue(ValidationUtils.validateArtifactLabel("test@label")); + } + + @Test public void checkValidateConsumerNameReturnsTrueIfLabelIsValid() { final String testConsumerName = "testConsumerName"; |