diff options
Diffstat (limited to 'test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes')
14 files changed, 112 insertions, 86 deletions
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactReqDetails.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactReqDetails.java index 15e1e0aab3..207d8694fd 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactReqDetails.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactReqDetails.java @@ -20,10 +20,10 @@ package org.openecomp.sdc.ci.tests.datatypes; -import java.util.List; - import org.openecomp.sdc.be.model.HeatParameterDefinition; +import java.util.List; + public class ArtifactReqDetails { public ArtifactReqDetails() { diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ComponentInstanceReqDetails.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ComponentInstanceReqDetails.java index 13e51a092f..d6699d32d7 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ComponentInstanceReqDetails.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ComponentInstanceReqDetails.java @@ -30,6 +30,7 @@ public class ComponentInstanceReqDetails { String posY; String name; String uniqueId; + String originType; public ComponentInstanceReqDetails() { super(); @@ -43,9 +44,10 @@ public class ComponentInstanceReqDetails { this.posY = componentInstance.getPosY(); // this.name = "myResourceInstance"; this.name = componentInstance.getName(); + this.originType = componentInstance.getOriginType().name(); } - public ComponentInstanceReqDetails(String resourceUid, String description, String posX, String posY, String name) { + public ComponentInstanceReqDetails(String resourceUid, String description, String posX, String posY, String name, String originType) { super(); this.componentUid = resourceUid; this.description = description; @@ -53,6 +55,7 @@ public class ComponentInstanceReqDetails { this.posY = posY; // this.name = "myResourceInstance"; this.name = name; + this.originType = originType; } public ComponentInstanceReqDetails(String resourceUid, String description, String posX, String posY) { @@ -111,6 +114,14 @@ public class ComponentInstanceReqDetails { this.uniqueId = uniqueId; } + public String getOriginType() { + return originType; + } + + public void setOriginType(String originType) { + this.originType = originType; + } + @Override public String toString() { return "ResourceInstanceReqDetails [resourceUid=" + componentUid + ", description=" + description + ", posX=" diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ComponentReqDetails.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ComponentReqDetails.java index 8546732414..36c9fc8cd7 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ComponentReqDetails.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ComponentReqDetails.java @@ -20,13 +20,13 @@ package org.openecomp.sdc.ci.tests.datatypes; -import java.util.ArrayList; -import java.util.List; - import org.openecomp.sdc.be.model.LifecycleStateEnum; import org.openecomp.sdc.be.model.category.CategoryDefinition; import org.openecomp.sdc.be.model.category.SubCategoryDefinition; +import java.util.ArrayList; +import java.util.List; + public abstract class ComponentReqDetails { protected String name; diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ImportReqDetails.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ImportReqDetails.java index e7899eeeb4..d877150ceb 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ImportReqDetails.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ImportReqDetails.java @@ -20,35 +20,24 @@ package org.openecomp.sdc.ci.tests.datatypes; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNotNull; -import static org.testng.AssertJUnit.assertTrue; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import com.fasterxml.jackson.databind.ObjectMapper; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; +import org.openecomp.sdc.be.model.Resource; import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse; import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils; import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser; import org.yaml.snakeyaml.Yaml; -import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.*; +import java.util.*; + +import static org.testng.AssertJUnit.*; public class ImportReqDetails extends ResourceReqDetails { + private static final String CAPS = "capabilities"; private String payloadName; private String payloadData; @@ -62,6 +51,12 @@ public class ImportReqDetails extends ResourceReqDetails { String vendorName, String vendorRelease, String contactId, String icon) { super(resourceName, description, tags, null, derivedFrom, vendorName, vendorRelease, contactId, icon); } + + public ImportReqDetails(Resource resource, String payloadName, String payloadData){ + super(resource); + this.payloadData = payloadData; + this.payloadName = payloadName; + } public String getPayloadName() { return payloadName; @@ -84,8 +79,7 @@ public class ImportReqDetails extends ResourceReqDetails { return "ImportReqDetails [payloadName=" + payloadName + ", payloadData=" + payloadData + "]"; } - public void setReqirementsAndCapabilities(String path, String fileName, User user, String derivedFromSource) - throws Exception { + public void setReqirementsAndCapabilities(String path, String fileName, User user, String derivedFromSource) throws IOException, JSONException{ setRequirements(path, fileName, user, derivedFromSource); setCapabilities(path, fileName, user, derivedFromSource); } @@ -110,14 +104,15 @@ public class ImportReqDetails extends ResourceReqDetails { return requirements; } - public void setRequirements(String path, String fileName, User user, String derivedFromSource) throws Exception { + public void setRequirements(String path, String fileName, User user, String derivedFromSource) throws IOException, JSONException { Map<String, Object> requirementsFromFile = getRequirementsMapFromFile(path + File.separator + fileName, toscaResourceName, "requirements"); - Map<String, Object> requirements = organizeRequirementsMap(requirementsFromFile); - getDerivedReqCap(user, requirements, "requirements", derivedFromSource); - this.requirements = requirements; + Map<String, Object> reqs = organizeRequirementsMap(requirementsFromFile); + getDerivedReqCap(user, reqs, "requirements", derivedFromSource); + this.requirements = reqs; } + @SuppressWarnings("unchecked") private void getDerivedReqCap(User user, Map<String, Object> reqCapMap, String field, String derivedFromResource) throws IOException, JSONException { @@ -134,17 +129,16 @@ public class ImportReqDetails extends ResourceReqDetails { List<Object> lst = (List<Object>) parsedFieldFromResponseAsMap.get(type); convertListToMap = convertListToMap(lst); - if (field.equals("capabilities")) { + if (field.equals(CAPS)) { convertListToMap.replace("capabilitySources", derivedList); - lst = new ArrayList<Object>(Arrays.asList(convertListToMap)); + lst = new ArrayList<>(Arrays.asList(convertListToMap)); } Object existingValue = reqCapMap.get(type); if (existingValue != null) { Map<String, Object> convertedExistingValue = convertListToMap((List<Object>) existingValue); - if (convertedExistingValue.get("name").toString().toLowerCase() - .equals(convertListToMap.get("name").toString().toLowerCase())) { - lst = new ArrayList<Object>(Arrays.asList(convertedExistingValue)); + if (convertedExistingValue.get("name").toString().equalsIgnoreCase(convertListToMap.get("name").toString())) { + lst = new ArrayList<>(Arrays.asList(convertedExistingValue)); } else { lst.add(convertedExistingValue); } @@ -174,19 +168,20 @@ public class ImportReqDetails extends ResourceReqDetails { return capabilities; } - public void setCapabilities(String path, String fileName, User user, String derivedFromSource) throws Exception { + public void setCapabilities(String path, String fileName, User user, String derivedFromSource) throws IOException, JSONException { Map<String, Object> capabilitiesFromFile = getCapabilitiesMapFromFile(path + File.separator + fileName, - toscaResourceName, "capabilities"); - Map<String, Object> capabilities = organizeCapabilitiesMap(capabilitiesFromFile); - getDerivedReqCap(user, capabilities, "capabilities", derivedFromSource); - this.capabilities = capabilities; + toscaResourceName, CAPS); + Map<String, Object> caps = organizeCapabilitiesMap(capabilitiesFromFile); + getDerivedReqCap(user, caps, CAPS, derivedFromSource); + this.capabilities = caps; } + @SuppressWarnings("unchecked") private Map<String, Object> organizeCapabilitiesMap(Map<String, Object> capabilitiesFromFile) { Iterator<String> iterator = capabilitiesFromFile.keySet().iterator(); - Map<String, Object> capMap = new HashMap<String, Object>(); + Map<String, Object> capMap = new HashMap<>(); while (iterator.hasNext()) { - List<Object> valueList = new ArrayList<Object>(); + List<Object> valueList = new ArrayList<>(); String next = iterator.next(); Map<String, Object> valuesMap = (Map<String, Object>) capabilitiesFromFile.get(next); String key = valuesMap.remove("type").toString(); @@ -204,26 +199,28 @@ public class ImportReqDetails extends ResourceReqDetails { valueList.add(valuesMap); } else { Map<String, Object> convertValue = convertListToMap((List<Object>) tempValue); - valueList = new ArrayList<Object>(Arrays.asList(convertValue, valuesMap)); + valueList = new ArrayList<>(Arrays.asList(convertValue, valuesMap)); } capMap.put(key, valueList); } return capMap; } + @SuppressWarnings("unchecked") private Map<String, Object> getCapabilitiesMapFromFile(String fileName, String toscaResourceName, - String fieldToTest) throws Exception { + String fieldToTest) throws FileNotFoundException { Map<String, Object> resourceToscaMap = getToscaResourceFromFile(fileName, toscaResourceName); Object capMap = resourceToscaMap.get(fieldToTest); if (capMap == null) { - return new HashMap<String, Object>(); + return new HashMap<>(); } return (Map<String, Object>) capMap; } + @SuppressWarnings("unchecked") private Map<String, Object> organizeRequirementsMap(Map<String, Object> requirementsFromFile) { - Map<String, Object> reqMap = new HashMap<String, Object>(); - List<Object> valueList = new ArrayList<Object>(); + Map<String, Object> reqMap = new HashMap<>(); + List<Object> valueList = new ArrayList<>(); Iterator<String> iterator = requirementsFromFile.keySet().iterator(); while (iterator.hasNext()) { String key = iterator.next(); @@ -244,19 +241,19 @@ public class ImportReqDetails extends ResourceReqDetails { return reqMap; } + @SuppressWarnings("unchecked") private Map<String, Object> getRequirementsMapFromFile(String fileName, String toscaResourceName, - String fieldToTest) throws Exception { + String fieldToTest) throws FileNotFoundException { Map<String, Object> resourceToscaMap = getToscaResourceFromFile(fileName, toscaResourceName); List<Object> reqListFromFile = (List<Object>) resourceToscaMap.get(fieldToTest); if (reqListFromFile == null) { - return new HashMap<String, Object>(); + return new HashMap<>(); } - Map<String, Object> testedMapFromFile = convertListToMap(reqListFromFile); - return testedMapFromFile; + return convertListToMap(reqListFromFile); } - private Map<String, Object> getToscaResourceFromFile(String fullFileName, String toscaResourceName) - throws Exception { + @SuppressWarnings("unchecked") + private Map<String, Object> getToscaResourceFromFile(String fullFileName, String toscaResourceName) throws FileNotFoundException{ Map<String, Object> nodesTypesMap = getNodesTypesMapFromFile(fullFileName); Map<String, Object> resourceToscaMap = (Map<String, Object>) nodesTypesMap.get(toscaResourceName); @@ -265,17 +262,18 @@ public class ImportReqDetails extends ResourceReqDetails { return resourceToscaMap; } + @SuppressWarnings("unchecked") private Map<String, Object> getNodesTypesMapFromFile(String fullFileName) throws FileNotFoundException { Yaml yaml = new Yaml(); File file = new File(fullFileName); InputStream inputStream = new FileInputStream(file); Map<?, ?> mapFromFile = (Map<?, ?>) yaml.load(inputStream); - Map<String, Object> nodesTypesMap = (Map<String, Object>) mapFromFile.get("node_types"); - return nodesTypesMap; + return (Map<String, Object>) mapFromFile.get("node_types"); } + @SuppressWarnings("unchecked") private Map<String, Object> convertListToMap(List<Object> testedListFromFile) { - Map<String, Object> testedMapFromFile = new HashMap<String, Object>(); + Map<String, Object> testedMapFromFile = new HashMap<>(); for (int i = 0; i < testedListFromFile.size(); i++) { Object req = testedListFromFile.get(i); ObjectMapper m = new ObjectMapper(); @@ -285,6 +283,7 @@ public class ImportReqDetails extends ResourceReqDetails { return testedMapFromFile; } + @SuppressWarnings("unchecked") public void compareRequirementsOrCapabilities(Map<String, Object> exepectedReq, Map<String, Object> actualReq) { Iterator<String> iterator = exepectedReq.keySet().iterator(); while (iterator.hasNext()) { @@ -317,14 +316,15 @@ public class ImportReqDetails extends ResourceReqDetails { } } + @SuppressWarnings("unchecked") private List<Map<String, Object>> convertListToMapList(List<Object> testedListFromFile) { - List<Map<String, Object>> listOfMaps = new ArrayList<Map<String, Object>>(); + List<Map<String, Object>> listOfMaps = new ArrayList<>(); for (int i = 0; i < testedListFromFile.size(); i++) { Object req = testedListFromFile.get(i); ObjectMapper m = new ObjectMapper(); Map<? extends String, ? extends String> mappedObject = m.convertValue(req, Map.class); mappedObject.remove("uniqueId"); - Map<String, Object> testedMapFromFile = new HashMap<String, Object>(); + Map<String, Object> testedMapFromFile = new HashMap<>(); testedMapFromFile.putAll(mappedObject); listOfMaps.add(testedMapFromFile); } diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ProductReqDetails.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ProductReqDetails.java index f2484e274d..61d923e6c4 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ProductReqDetails.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ProductReqDetails.java @@ -20,11 +20,11 @@ package org.openecomp.sdc.ci.tests.datatypes; +import org.openecomp.sdc.be.model.category.CategoryDefinition; + import java.util.ArrayList; import java.util.List; -import org.openecomp.sdc.be.model.category.CategoryDefinition; - public class ProductReqDetails extends ComponentReqDetails { private String fullName; diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java index 4d5806b90f..5a968fdcd4 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java @@ -20,10 +20,10 @@ package org.openecomp.sdc.ci.tests.datatypes; -import java.util.List; - import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; +import java.util.List; + public class ResourceExternalReqDetails extends ComponentReqDetails { String vendorName; String vendorRelease; diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceReqDetails.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceReqDetails.java index e3517a8ab4..cfb7845c63 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceReqDetails.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceReqDetails.java @@ -20,11 +20,11 @@ package org.openecomp.sdc.ci.tests.datatypes; -import java.util.List; - import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; import org.openecomp.sdc.be.model.Resource; +import java.util.List; + public class ResourceReqDetails extends ComponentReqDetails { List<String> derivedFrom; String vendorName; @@ -72,7 +72,6 @@ public class ResourceReqDetails extends ComponentReqDetails { this.name = resource.getName(); this.description = resource.getDescription(); this.tags = resource.getTags(); - // this.category = resource.getCategories(); this.derivedFrom = resource.getDerivedFrom(); this.vendorName = resource.getVendorName(); this.vendorRelease = resource.getVendorRelease(); @@ -99,7 +98,6 @@ public class ResourceReqDetails extends ComponentReqDetails { ResourceTypeEnum.VFC.toString()); } - // new public ResourceReqDetails(String resourceName, String description, List<String> tags, String category, List<String> derivedFrom, String vendorName, String vendorRelease, String contactId, String icon, String resourceType) { @@ -108,7 +106,6 @@ public class ResourceReqDetails extends ComponentReqDetails { this.name = resourceName; this.description = description; this.tags = tags; - // this.category = category; this.derivedFrom = derivedFrom; this.vendorName = vendorName; this.vendorRelease = vendorRelease; @@ -128,7 +125,6 @@ public class ResourceReqDetails extends ComponentReqDetails { this.name = originalResource.getName(); this.description = originalResource.getDescription(); this.tags = originalResource.getTags(); - // this.category = originalResource.getCategory(); this.derivedFrom = originalResource.getDerivedFrom(); this.vendorName = originalResource.getVendorName(); this.vendorRelease = originalResource.getVendorRelease(); diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceRespJavaObject.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceRespJavaObject.java index a915af4eb2..78408bd3ed 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceRespJavaObject.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceRespJavaObject.java @@ -20,10 +20,10 @@ package org.openecomp.sdc.ci.tests.datatypes; -import java.util.List; - import org.openecomp.sdc.be.model.category.CategoryDefinition; +import java.util.List; + public class ResourceRespJavaObject { String uniqueId; String name; diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ServiceReqDetails.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ServiceReqDetails.java index fbcbfd4fe0..76c17f0375 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ServiceReqDetails.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ServiceReqDetails.java @@ -20,10 +20,11 @@ package org.openecomp.sdc.ci.tests.datatypes; -import java.util.ArrayList; - import org.openecomp.sdc.be.model.Service; import org.openecomp.sdc.be.model.category.CategoryDefinition; +import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceInstantiationType; + +import java.util.ArrayList; public class ServiceReqDetails extends ComponentReqDetails { @@ -31,6 +32,7 @@ public class ServiceReqDetails extends ComponentReqDetails { protected String serviceRole = "MyServiceRole"; protected String namingPolicy = "MyServiceNamingPolicy"; protected Boolean ecompGeneratedNaming = true; + protected String instantiationType = ServiceInstantiationType.A_LA_CARTE.getValue(); public String getServiceType() { return serviceType; @@ -39,7 +41,11 @@ public class ServiceReqDetails extends ComponentReqDetails { public void setServiceType(String serviceType) { this.serviceType = serviceType; } - + + public String getInstantiationType() { + return instantiationType; + } + public String getServiceRole() { return serviceRole; } @@ -65,9 +71,8 @@ public class ServiceReqDetails extends ComponentReqDetails { } public ServiceReqDetails(String serviceName, String category, ArrayList<String> tags, String description, - String contactId, String icon) { + String contactId, String icon, String instantiationType) { this.name = serviceName; - // this.category = category; this.tags = tags; this.description = description; this.contactId = contactId; @@ -107,13 +112,13 @@ public class ServiceReqDetails extends ComponentReqDetails { @Override public String toString() { - return "ServiceDetails [name=" + name + ", category=" + getCategory() + ", tags=" + tags + ", description=" - + description + ", contactId=" + contactId + ", icon=" + icon + "]"; + return "ServiceDetails [name = " + name + ", category = " + getCategory() + ", tags = " + tags + ", description = " + + description + ", contactId = " + contactId + ", icon = " + icon + ", instantiation type = " + getInstantiationType() + "]"; } public ServiceReqDetails(ServiceReqDetails aService) { this(aService.getName(), aService.getCategory(), (ArrayList<String>) aService.getTags(), - aService.getDescription(), aService.getContactId(), aService.getIcon()); + aService.getDescription(), aService.getContactId(), aService.getIcon(), aService.getInstantiationType()); uniqueId = aService.getUniqueId(); version = aService.getVersion(); } diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ImportTestTypesEnum.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ImportTestTypesEnum.java index 21901e4635..ed71faa8ce 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ImportTestTypesEnum.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ImportTestTypesEnum.java @@ -20,11 +20,11 @@ package org.openecomp.sdc.ci.tests.datatypes.enums; +import org.openecomp.sdc.be.dao.api.ActionStatus; + import java.util.Arrays; import java.util.List; -import org.openecomp.sdc.be.dao.api.ActionStatus; - public enum ImportTestTypesEnum { MISSING_CONTACT("tosca.nodes.missing_contact", "missing_contact", ActionStatus.COMPONENT_MISSING_CONTACT, Arrays.asList("Resource"), true), diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ResourceCategoryEnum.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ResourceCategoryEnum.java index a0b13b7539..1ba6c5c7f1 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ResourceCategoryEnum.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ResourceCategoryEnum.java @@ -20,11 +20,6 @@ package org.openecomp.sdc.ci.tests.datatypes.enums; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Random; - import java.util.Random; public enum ResourceCategoryEnum { diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceInstantiationType.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceInstantiationType.java new file mode 100644 index 0000000000..80fa95b546 --- /dev/null +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceInstantiationType.java @@ -0,0 +1,15 @@ +package org.openecomp.sdc.ci.tests.datatypes.enums; + +public enum ServiceInstantiationType { + A_LA_CARTE("A-la-carte"), MACRO("Macro"); + + private String value; + + public String getValue() { + return value; + } + + private ServiceInstantiationType(String value) { + this.value = value; + } +} diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ToscaKeysEnum.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ToscaKeysEnum.java index b8635b3bda..24adc49ebe 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ToscaKeysEnum.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ToscaKeysEnum.java @@ -22,7 +22,12 @@ package org.openecomp.sdc.ci.tests.datatypes.enums; public enum ToscaKeysEnum { - TOSCA_DEFINITION_VERSION("tosca_definitions_version"), METADATA("metadata"), IMPORTS("imports"), NODE_TYPES("node_types"), TOPOLOGY_TEMPLATE("topology_template"); + TOSCA_DEFINITION_VERSION("tosca_definitions_version"), + METADATA("metadata"), + IMPORTS("imports"), + NODE_TYPES("node_types"), + TOPOLOGY_TEMPLATE("topology_template"), + ANNOTATION_TYPES("annotation_types"); private String toscaKey; diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java index 2435b10dd5..0e81a7b2ac 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java @@ -23,7 +23,6 @@ package org.openecomp.sdc.ci.tests.datatypes.http; import org.apache.commons.io.IOUtils; import org.apache.http.HttpEntity; import org.apache.http.annotation.NotThreadSafe; -import org.apache.http.client.ClientProtocolException; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; import org.apache.http.client.methods.HttpPost; |