Onboard PNF software version Ui test case

[sdc.git] / test-apis-ci / src / main / java / org / openecomp / sdc / ci / tests / utils / general / ElementFactory.java

diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/ElementFactory.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/ElementFactory.java
index d170124..31b8c5b 100644 (file)
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/ElementFactory.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/ElementFactory.java
@@ -24,6 +24,8 @@ import org.apache.commons.lang.StringUtils;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
@@ -47,7 +49,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-public class ElementFactory {
+public final class ElementFactory {
 
        private static final String CI_SERVICE = "ciService";
        private static final String CI_RES = "ciRes";
@@ -56,6 +58,10 @@ public class ElementFactory {
        private static final String RESOURCE_INSTANCE_POS_X = "20";
        private static final String RESOURCE_INSTANCE_POS_Y = "20";
        private static final String RESOURCE_INSTANCE_DESCRIPTION = "description";
+
+       private ElementFactory() {
+
+       }
        
        // *** Getters ***
        
@@ -131,7 +137,7 @@ public class ElementFactory {
        }
 
        public static ResourceReqDetails getDefaultResource(String resourceName, NormativeTypesEnum derived, ResourceCategoryEnum category, String contactId) {
-               resourceName = (resourceName + generateUUIDforSufix());
+               resourceName = addRandomSuffixToName(resourceName);
                String description = "Represents a generic software component that can be managed and run by a Compute Node Type.";
                ArrayList<String> resourceTags = new ArrayList<>();
                resourceTags.add(resourceName);
@@ -154,7 +160,7 @@ public class ElementFactory {
        }
 
        public static ResourceReqDetails getDefaultResource(String resourceName, Resource derived, ResourceCategoryEnum category, String contactId) {
-               resourceName = (resourceName + generateUUIDforSufix());
+               resourceName = addRandomSuffixToName(resourceName);
                String description = "Represents a generic software component that can be managed and run by a Compute Node Type.";
                ArrayList<String> resourceTags = new ArrayList<>();
                resourceTags.add(resourceName);
@@ -171,6 +177,10 @@ public class ElementFactory {
 
        }
 
+       public static String addRandomSuffixToName(final String name) {
+               return name + generateUUIDforSufix();
+       }
+
        public static ResourceReqDetails getDefaultResourceByType(String resourceName, NormativeTypesEnum derived, ResourceCategoryEnum category, String contactId, ResourceTypeEnum resourceType) {
                return getDefaultResourceByType(resourceName, derived, category, contactId, resourceType.toString());
        }
@@ -287,26 +297,26 @@ public class ElementFactory {
 
        // *** SERVICE ***
        public static ServiceReqDetails getDefaultService() {
-               return getDefaultService(CI_SERVICE, ServiceCategoriesEnum.MOBILITY, "al1976");
+               return getDefaultService(CI_SERVICE, ServiceCategoriesEnum.MOBILITY, "al1976", ServiceInstantiationType.A_LA_CARTE.getValue());
        }
 
        public static ServiceReqDetails getDefaultService(String contactId) {
-               return getDefaultService(CI_SERVICE, ServiceCategoriesEnum.MOBILITY, contactId);
+               return getDefaultService(CI_SERVICE, ServiceCategoriesEnum.MOBILITY, contactId, ServiceInstantiationType.A_LA_CARTE.getValue());
        }
 
        public static ServiceReqDetails getDefaultService(User user) {
-               return getDefaultService(CI_SERVICE, ServiceCategoriesEnum.MOBILITY, user.getUserId());
+               return getDefaultService(CI_SERVICE, ServiceCategoriesEnum.MOBILITY, user.getUserId(), ServiceInstantiationType.A_LA_CARTE.getValue());
        }
-
-       public static ServiceReqDetails getServiceByCategory(ServiceCategoriesEnum category) {
-               return getDefaultService(CI_SERVICE, category, "al1976");
-       }
-
+       
        public static ServiceReqDetails getDefaultService(ServiceCategoriesEnum category, User user) {
-               return getDefaultService(CI_SERVICE, category, user.getUserId());
+               return getDefaultService(CI_SERVICE, category, user.getUserId(), ServiceInstantiationType.A_LA_CARTE.getValue());
+       }
+       
+       public static ServiceReqDetails getServiceByCategory(ServiceCategoriesEnum category) {
+               return getDefaultService(CI_SERVICE, category, "al1976", ServiceInstantiationType.A_LA_CARTE.getValue());
        }
 
-       public static ServiceReqDetails getDefaultService(String serviceName, ServiceCategoriesEnum category, String contactId) {
+       public static ServiceReqDetails getDefaultService(String serviceName, ServiceCategoriesEnum category, String contactId, String instantiationType) {
                serviceName = (serviceName + generateUUIDforSufix());
                ArrayList<String> tags = new ArrayList<>();
                tags.add("serviceTag");
@@ -315,7 +325,7 @@ public class ElementFactory {
                String description = "service Description";
                String icon = "defaulticon";
 
-               ServiceReqDetails serviceDetails = new ServiceReqDetails(serviceName, category.getValue(), tags, description, contactId, icon);
+               ServiceReqDetails serviceDetails = new ServiceReqDetails(serviceName, category.getValue(), tags, description, contactId, icon, instantiationType);
 
                return serviceDetails;
        }
@@ -375,7 +385,7 @@ public class ElementFactory {
 
        public static ComponentInstanceReqDetails getDefaultComponentInstance(String name) {
                String resourceUid = "resourceId";
-               ComponentInstanceReqDetails resourceInstanceDetails = new ComponentInstanceReqDetails(resourceUid, RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, name);
+               ComponentInstanceReqDetails resourceInstanceDetails = new ComponentInstanceReqDetails(resourceUid, RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, name, null);
 
                return resourceInstanceDetails;
 
@@ -383,16 +393,26 @@ public class ElementFactory {
 
        public static ComponentInstanceReqDetails getDefaultComponentInstance(String name, ComponentReqDetails componentReqDetails) {
                String resourceUid = componentReqDetails.getUniqueId();
-               ComponentInstanceReqDetails resourceInstanceDetails = new ComponentInstanceReqDetails(resourceUid, RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, name);
+               ComponentInstanceReqDetails resourceInstanceDetails = new ComponentInstanceReqDetails(resourceUid, RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, name, null);
 
                return resourceInstanceDetails;
 
        }
 
+    public static ComponentInstanceReqDetails getDefaultComponentInstance(String serviceUniqueId, String originType) {
+        ComponentInstanceReqDetails componentInstanceReqDetails = new ComponentInstanceReqDetails(serviceUniqueId,
+                RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, null, originType);
+
+        componentInstanceReqDetails.setUniqueId(serviceUniqueId + Math.random());
+
+        return componentInstanceReqDetails;
+
+    }
+
        public static ComponentInstanceReqDetails getComponentResourceInstance(ComponentReqDetails compInstOriginDetails) {
                String compInstName = (compInstOriginDetails.getName() != null ? compInstOriginDetails.getName() : "resourceInstanceName");
                String resourceUid = compInstOriginDetails.getUniqueId();
-               ComponentInstanceReqDetails resourceInstanceDetails = new ComponentInstanceReqDetails(resourceUid, RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, compInstName);
+               ComponentInstanceReqDetails resourceInstanceDetails = new ComponentInstanceReqDetails(resourceUid, RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, compInstName, null);
                return resourceInstanceDetails;
 
        }
@@ -400,11 +420,21 @@ public class ElementFactory {
        public static ComponentInstanceReqDetails getComponentInstance(Component compInstOriginDetails) {
                String compInstName = (compInstOriginDetails.getName() != null ? compInstOriginDetails.getName() : "componentInstanceName");
                String compInsUid = compInstOriginDetails.getUniqueId();
-               ComponentInstanceReqDetails componentInstanceDetails = new ComponentInstanceReqDetails(compInsUid, RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, compInstName);
+               ComponentInstanceReqDetails componentInstanceDetails = new ComponentInstanceReqDetails(compInsUid, RESOURCE_INSTANCE_DESCRIPTION, RESOURCE_INSTANCE_POS_X, RESOURCE_INSTANCE_POS_Y, compInstName, compInstOriginDetails.getComponentType() == ComponentTypeEnum.SERVICE ? OriginTypeEnum.ServiceProxy.name() : null);
                return componentInstanceDetails;
 
        }
 
+       //********ServiceFilter**********
+    public static ServiceFilterDetails getDefaultEqualOperatorFilter(String propertyName, String valueString) {
+        return new ServiceFilterDetails(propertyName, "equal", "static", "static", valueString);
+    }
+
+    public static ServiceFilterDetails getDefaultFilter(String propertyName, String valueString,
+                                                                    String operator) {
+        return new ServiceFilterDetails(propertyName, operator, "static", "static", valueString);
+    }
+
        // ******* USER **********************
        public static User getDefaultUser(UserRoleEnum userRole) {
                User sdncModifierDetails = new User();
@@ -1006,10 +1036,8 @@ public class ElementFactory {
        }
 
        public static String generateUUIDforSufix() {
-
-               String uniqueSufix = UUID.randomUUID().toString();
-               String[] split = uniqueSufix.split("-");
-               return uniqueSufix = split[4];
+               final String uniqueSuffix = UUID.randomUUID().toString();
+               return uniqueSuffix.split("-")[4];
        }
 
        private static String normalizeArtifactLabel(String label) {