vCPE Tunnel XConn : allottedResourcEtype is

 - failing to match SO trigger

Change-Id: I5e56408f619487c436e7547c0935b3791d24016d
Issue-ID: SDC-1909
Signed-off-by: Tal Gitelman <tal.gitelman@att.com>

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 5f28c14..bb59cc4 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml
@@ -148,7 +148,7 @@ resources:
           name: "Allotted Resource"
           icons: ['allotted_resource']
       TunnelXConnect:
-          name: "Tunnel XConnect"
+          name: "TunnelXConn"
           icons: ['tunnel_x_connect'] 
       IpMuxDemux:
           name: "IP Mux Demux"

diff --git a/catalog-ui/src/app/view-models/admin-dashboard/add-category-modal/add-category-modal-view.html b/catalog-ui/src/app/view-models/admin-dashboard/add-category-modal/add-category-modal-view.html
index 6762860..002cc29 100644 (file)
--- a/catalog-ui/src/app/view-models/admin-dashboard/add-category-modal/add-category-modal-view.html
+++ b/catalog-ui/src/app/view-models/admin-dashboard/add-category-modal/add-category-modal-view.html
@@ -37,14 +37,14 @@
                            type="text"
                            name="categoryName"
                            required="required"
-                           data-ng-minlength="4"
+                           data-ng-minlength="3"
                            data-ng-pattern="namePattern"
                            maxlength="25"
                            autofocus />
 
                     <div class="input-error" data-ng-show="forms.editForm.categoryName.$dirty && forms.editForm.categoryName.$invalid">
                         <span ng-show="forms.editForm.categoryName.$error.required" translate="CREATE_CATEGORY_MODAL_REQUIRED" translate-values="{'modelType': '{{modelType}}' }"></span>
-                        <span ng-show="forms.editForm.categoryName.$error.minlength" translate="CREATE_CATEGORY_MODAL_MINLENGTH" translate-values="{'minlength': '4', 'modelType': '{{modelType}}' }"></span>
+                        <span ng-show="forms.editForm.categoryName.$error.minlength" translate="CREATE_CATEGORY_MODAL_MINLENGTH" translate-values="{'minlength': '3', 'modelType': '{{modelType}}' }"></span>
                         <span ng-show="forms.editForm.categoryName.$error.pattern" translate="CREATE_CATEGORY_MODAL_PATTERN" translate-values="{'modelType': '{{modelType}}' }"></span>
                     </div>
 

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 1e4792f..0ee097b 100644 (file)
--- 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
@@ -96,7 +96,7 @@ public class ValidationUtils {
        public final static Integer ARTIFACT_LABEL_LENGTH = 255;
        public final static Pattern ARTIFACT_DISPLAY_NAME_PATTERN = Pattern.compile("^[a-zA-Z0-9][a-zA-Z0-9 &\\.'#=:@_\\-+]+$");
        public final static Pattern CATEGORY_LABEL_PATTERN = Pattern.compile("^[a-zA-Z0-9][a-zA-Z0-9 &\\.'#=:@_\\-+]+$");
-       public final static Integer CATEGORY_LABEL_MIN_LENGTH = 4;
+       public final static Integer CATEGORY_LABEL_MIN_LENGTH = 3;
        public final static Integer CATEGORY_LABEL_MAX_LENGTH = 25;
 
        public final static Pattern COMPONENT_NAME_DELIMETER_PATTERN = Pattern.compile("[\\.\\-\\_]+");

diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java
index 51490a6..e59f6a0 100644 (file)
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java
@@ -421,7 +421,7 @@ public class CommonUtilsTest {
                assertTrue(ValidationUtils.validateCategoryDisplayNameLength("Netele-2_3#456&+.'=:@@@@@"));
                assertTrue(ValidationUtils.validateCategoryDisplayNameLength("Nete"));
                assertFalse(ValidationUtils.validateCategoryDisplayNameLength("Netele-2_3#456&+.'=:@@@@@1"));
-               assertFalse(ValidationUtils.validateCategoryDisplayNameLength("Net"));
+               assertFalse(ValidationUtils.validateCategoryDisplayNameLength("Ne"));
                assertFalse(ValidationUtils.validateCategoryDisplayNameLength(null));
        }