aboutsummaryrefslogtreecommitdiffstats
path: root/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation
diff options
context:
space:
mode:
Diffstat (limited to 'test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation')
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ArtifactValidationUtils.java219
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/AuditValidationUtils.java1005
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/BaseValidationUtils.java116
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/CategoryValidationUtils.java124
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/CsarValidationUtils.java444
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/DistributionValidationUtils.java86
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ErrorValidationUtils.java120
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ProductValidationUtils.java238
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ResourceValidationUtils.java351
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ServiceValidationUtils.java131
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/UserValidationUtils.java274
11 files changed, 0 insertions, 3108 deletions
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ArtifactValidationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ArtifactValidationUtils.java
deleted file mode 100644
index 62d491a3b1..0000000000
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ArtifactValidationUtils.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.ci.tests.utils.validation;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.resources.data.DAOArtifactData;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Decoder;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.FileUtils;
-import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
-
-public class ArtifactValidationUtils {
-
- private static String desc = "description";
- private static String artifactType = "artifactType";
- private static String artifactName = "artifactName";
- private static String artifactChecksum = "artifactChecksum";
- private static String uniqueId = "uniqueId";
- protected Utils utils;
-
- public static void validateInformationalArtifact(ArtifactReqDetails expectedArtifact,
- Map<String, Object> actualArtifact) {
- assertTrue("description is not as expected",
- expectedArtifact.getDescription().equals(actualArtifact.get(desc).toString()));
- assertTrue("artifactType is not as expected",
- expectedArtifact.getArtifactType().toUpperCase().equals(actualArtifact.get(artifactType).toString()));
- assertTrue("artifactName is not as expected",
- expectedArtifact.getArtifactName().equals(actualArtifact.get(artifactName).toString()));
- assertTrue("uniqueId is not as expected",
- expectedArtifact.getUniqueId().equals(actualArtifact.get(uniqueId).toString()));
- assertTrue("description is not as expected", expectedArtifact.getArtifactLabel().toLowerCase()
- .equals(actualArtifact.get("artifactLabel").toString()));
- }
-
- public static void validateArtifactsNumberInComponent(Component component, ArtifactGroupTypeEnum artifactGroupType,
- ArtifactTypeEnum artifactType, int expectedNumber) {
- Map<String, ArtifactDefinition> deploymentArtifacts;
- int counter = 0;
- if (artifactGroupType == ArtifactGroupTypeEnum.DEPLOYMENT) {
- deploymentArtifacts = component.getDeploymentArtifacts();
- } else {
- deploymentArtifacts = component.getArtifacts();
- }
- if (deploymentArtifacts != null) {
- for (ArtifactDefinition artifactDefinition : deploymentArtifacts.values()) {
- if (artifactDefinition.getArtifactType().equals(artifactType.getType())) {
- counter++;
- }
- }
- }
- assertEquals("Unexpected number of " + artifactGroupType.getType() + " artifacts in component", expectedNumber,
- counter);
- }
-
- // Benny
- public static void validateArtifactsNumberInComponentInstance(ComponentInstance componentInstance,
- ArtifactGroupTypeEnum artifactGroupType, ArtifactTypeEnum artifactType, int expectedNumber) {
- Map<String, ArtifactDefinition> deploymentArtifacts = null;
- int counter = 0;
- if (artifactGroupType == ArtifactGroupTypeEnum.DEPLOYMENT) {
- deploymentArtifacts = componentInstance.getDeploymentArtifacts();
- }
- if (deploymentArtifacts != null) {
- for (ArtifactDefinition artifactDefinition : deploymentArtifacts.values()) {
- if (artifactDefinition.getArtifactType().equals(artifactType.getType())) {
- counter++;
- }
- }
- }
- assertEquals("Unexpected number of " + artifactGroupType.getType() + " artifacts in component", expectedNumber,
- counter);
- }
-
- public static DAOArtifactData parseArtifactRespFromES(RestResponse resResponse) throws Exception {
- String bodyToParse = resResponse.getResponse();
- JsonElement jElement = new JsonParser().parse(bodyToParse);
- JsonElement jsourceElement = jElement.getAsJsonObject().get("_source");
-
- ObjectMapper mapper = new ObjectMapper();
-
- return mapper.readValue(jsourceElement.toString(), DAOArtifactData.class);
-
- }
-
- public static void validateArtifactReqVsResp(ArtifactReqDetails expectedArtifactDetails,
- ArtifactDefinition actualArtifactJavaObject) {
- String expected;
-
- expected = expectedArtifactDetails.getArtifactName();
- if (expected == null)
- expected = "";
- assertEquals("artifact name is not correct ", expected, actualArtifactJavaObject.getArtifactName());
-
- expected = expectedArtifactDetails.getArtifactType();
- if (expected == null)
- expected = "";
- assertEquals("artifact type is not correct ", expected, actualArtifactJavaObject.getArtifactType());
-
- expected = expectedArtifactDetails.getDescription();
- if (expected == null)
- expected = "";
- assertEquals("artifact description is not correct ", expected, actualArtifactJavaObject.getDescription());
-
- expected = expectedArtifactDetails.getArtifactLabel();
- if (expected == null || expected == "") {
- expected = expectedArtifactDetails.getArtifactName().toLowerCase().substring(0,
- expectedArtifactDetails.getArtifactName().lastIndexOf("."));
- // expected = tmp.substring(0,
- // artifactInfo.getArtifactName().lastIndexOf("."));
- }
- assertEquals("artifact label is not correct ", expected, actualArtifactJavaObject.getArtifactLabel());
-
- expected = expectedArtifactDetails.getUrl();
- if (expected != "") {
- assertEquals(expected, actualArtifactJavaObject.getApiUrl());
- assertEquals(expectedArtifactDetails.getArtifactDisplayName(),
- actualArtifactJavaObject.getArtifactDisplayName());
- }
-
- // assertEquals(validChecksum,
- // actualArtifactJavaObject.getArtifactChecksum());
-
- // expected = expectedArtifactDetails.getArtifactDisplayName();
- // if (expected != "")
- // {
- // assertEquals(expected,
- // actualArtifactJavaObject.getArtifactDisplayName());
- // }
-
- boolean actual = actualArtifactJavaObject.getMandatory();
- assertEquals(expectedArtifactDetails.isMandatory(), actual);
-
- if (actualArtifactJavaObject.getServiceApi()) {
-
- boolean actual2 = actualArtifactJavaObject.getServiceApi();
- assertEquals(expectedArtifactDetails.isServiceApi(), actual2);
- }
-
- }
-
- public static void validateEsArtifactReqVsResp(ArtifactReqDetails expectedArtifactInfo,
- DAOArtifactData DAOArtifactData) throws Exception {
- String expectedArtifactUid = expectedArtifactInfo.getUniqueId();
- if (expectedArtifactUid == null)
- expectedArtifactUid = "";
- assertEquals("artifact name is not correct ", expectedArtifactUid, DAOArtifactData.getId());
-
- String actualPayload = Decoder.encode(DAOArtifactData.getData().array());
- assertEquals("artifact payloadData is not correct ", expectedArtifactInfo.getPayload(), actualPayload);
- }
-
- public static List<String> getListOfArtifactFromFolder(String folderName) throws IOException, Exception {
- Config config = Utils.getConfig();
- String sourceDir = config.getResourceConfigDir();
- String testResourcesPath = sourceDir + File.separator + folderName;
- List<String> listofFiles = FileUtils.getFileListFromBaseDirectoryByTestName(testResourcesPath);
- return listofFiles;
- }
-
- public static ArtifactReqDetails replaceDefaultArtWithArtFromList_(ArtifactReqDetails heatArtifactDetails,
- String heatExtension, String folderName, int positionInlist) throws IOException, Exception {
-
- Config config = Utils.getConfig();
- String ext = heatExtension;
- String sourceDir = config.getResourceConfigDir();
- String testResourcesPath = sourceDir + File.separator + folderName;
- List<String> listFileName = FileUtils.getFileListFromBaseDirectoryByTestName(testResourcesPath);
- String payload = FileUtils.loadPayloadFile(listFileName, ext, true);
- heatArtifactDetails.setPayload(payload);
- heatArtifactDetails.setArtifactName(listFileName.get(positionInlist) + "." + ext);
- return heatArtifactDetails;
- }
-
- public static ArtifactReqDetails replaceDefaultArtWithArtFromList(ArtifactReqDetails heatArtifactDetails,
- String heatExtension, String folderName, int positionInlist) throws IOException, Exception {
- List<String> listOfArtifactFromFolder = getListOfArtifactFromFolder(folderName);
- String payload = FileUtils.loadPayloadFileFromListUsingPosition(listOfArtifactFromFolder, heatExtension, true,
- positionInlist);
- heatArtifactDetails.setPayload(payload);
- heatArtifactDetails.setArtifactName(heatArtifactDetails.getArtifactType()
- + listOfArtifactFromFolder.get(positionInlist) + "." + heatExtension);
- return heatArtifactDetails;
- }
-}
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/AuditValidationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/AuditValidationUtils.java
deleted file mode 100644
index 1758fce232..0000000000
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/AuditValidationUtils.java
+++ /dev/null
@@ -1,1005 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.ci.tests.utils.validation;
-
-import com.datastax.driver.core.ColumnDefinitions;
-import com.datastax.driver.core.Row;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-import org.codehaus.jettison.json.JSONArray;
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONObject;
-import org.javatuples.Pair;
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.be.model.category.GroupingDefinition;
-import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.AuditEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.AuditJsonKeysEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ComponentType;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.expected.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.run.StartTest;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.cassandra.CassandraUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils.CategoryAuditJsonKeysEnum;
-import org.openecomp.sdc.ci.tests.utils.rest.ConsumerRestUtils.EcompConsumerAuditJsonKeysEnum;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.*;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
-
-public class AuditValidationUtils {
- protected static Logger logger = LogManager.getLogger(AuditValidationUtils.class);
- private static final String auditKeySpaceName = "sdcaudit";
-
- public AuditValidationUtils() {
- super();
-
- StartTest.enableLogger();
- logger = LogManager.getLogger(AuditValidationUtils.class);
-
- }
-
- public static String buildAuditDescription(ErrorInfo errorInfo, List<String> errorVariablesList) {
- String auditDesc;
- if(errorInfo.getMessageId() != null){
- auditDesc = errorInfo.getMessageId() + ": " + errorInfo.getMessage();
- }else{
- auditDesc = errorInfo.getMessage();
- }
-
-// if(! variables.isEmpty() && variables.get(0) != null && ! variables.get(0).isEmpty()){
-// for (int i = 0; i < variables.size(); i++) {
-// if (auditDesc.contains("%" + (i + 1))) {
-// auditDesc = auditDesc.replace("%" + (i + 1), variables.get(i));
-// }
-// }
-// }
- if(errorVariablesList != null && ! errorVariablesList.isEmpty() && errorVariablesList.get(0) != null){
- for (int i = 0; i < errorVariablesList.size(); i++) {
- if (auditDesc.contains("%" + (i + 1))) {
- auditDesc = auditDesc.replace("%" + (i + 1), errorVariablesList.get(i));
- }
- }
- }
- return auditDesc;
- }
-
- public static String getModifierString(String userName, String uid) {
-
- if (userName.isEmpty() && uid.isEmpty())
- return "(UNKNOWN)";
-
- StringBuilder sb = new StringBuilder();
- sb.append(userName).append("(").append(uid).append(")");
- return sb.toString();
-
- }
-
- public static void validateAuditDownloadExternalAPI(ExpectedResourceAuditJavaObject resourceAuditJavaObject,
- String action, String body, boolean checkAllFields) throws Exception {
- Map<String, Object> actualAuditRecords = parseAuditResourceByAction(action, null);
-
- validateField(actualAuditRecords, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(actualAuditRecords, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
- validateField(actualAuditRecords, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
- validateField(actualAuditRecords, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
- validateField(actualAuditRecords, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
-
- }
-
- public static void validateAudit(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action, String body, boolean checkAllFields) throws Exception {
- Map<String, Object> actualAuditRecords = parseAuditResourceByAction(action, null);
-
- if ((resourceAuditJavaObject.getModifierName() != null) && (resourceAuditJavaObject.getModifierUid() != null)) {
- resourceAuditJavaObject.setModifierUid(getModifierString(resourceAuditJavaObject.getModifierName(),
- resourceAuditJavaObject.getModifierUid()));
- }
-
- validateField(actualAuditRecords, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(actualAuditRecords, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
- validateField(actualAuditRecords, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
- validateField(actualAuditRecords, AuditJsonKeysEnum.PREV_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevVersion());
- validateField(actualAuditRecords, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
-
- validateField(actualAuditRecords, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), resourceAuditJavaObject.getModifierUid());
- validateField(actualAuditRecords, AuditJsonKeysEnum.PREV_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevState());
- validateField(actualAuditRecords, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrState());
- validateField(actualAuditRecords, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
- validateField(actualAuditRecords, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
- validateField(actualAuditRecords, AuditJsonKeysEnum.COMMENT.getAuditJsonKeyName(), resourceAuditJavaObject.getComment());
- validateField(actualAuditRecords, AuditJsonKeysEnum.TOSCA_NODE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getToscaNodeType());
- validateField(actualAuditRecords, AuditJsonKeysEnum.CURR_ARTIFACT_UUID.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrArtifactUuid());
- validateField(actualAuditRecords, AuditJsonKeysEnum.PREV_ARTIFACT_UUID.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevArtifactUuid());
-
- validateAtifactDataField(actualAuditRecords, AuditJsonKeysEnum.ARTIFACT_DATA.getAuditJsonKeyName(), resourceAuditJavaObject.getArtifactData(), checkAllFields);
- }
-
- public static void validateExternalAudit(ExpectedExternalAudit externalAuditObject, String action, Map<AuditingFieldsKey, String> body) throws Exception {
-
- Map<String, Object> actualAuditRecord = parseAuditResourceByAction(action, body);
-
- validateField(actualAuditRecord, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(actualAuditRecord, AuditJsonKeysEnum.CONSUMER_ID.getAuditJsonKeyName(), externalAuditObject.getCONSUMER_ID());
- // TODO
- validateField(actualAuditRecord, AuditJsonKeysEnum.RESOURCE_URL.getAuditJsonKeyName(), externalAuditObject.getRESOURCE_URL());
- //TODO
- validateField(actualAuditRecord, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), externalAuditObject.getRESOURCE_NAME());
- validateField(actualAuditRecord, AuditJsonKeysEnum.SERVICE_INSTANCE_ID.getAuditJsonKeyName(), externalAuditObject.getSERVICE_INSTANCE_ID());
- //TODO
- validateField(actualAuditRecord, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), externalAuditObject.getRESOURCE_TYPE());
- validateField(actualAuditRecord, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), externalAuditObject.getSTATUS());
- validateField(actualAuditRecord, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), externalAuditObject.getDESC());
- //TODO
-// validateField(actualAuditRecord, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), externalAuditObject.getMODIFIER());
- validateField(actualAuditRecord, AuditJsonKeysEnum.PREV_ARTIFACT_UUID.getAuditJsonKeyName(), externalAuditObject.getPREV_ARTIFACT_UUID());
- validateField(actualAuditRecord, AuditJsonKeysEnum.CURR_ARTIFACT_UUID.getAuditJsonKeyName(), externalAuditObject.getCURR_ARTIFACT_UUID());
- //TODO
- validateField(actualAuditRecord, AuditJsonKeysEnum.ARTIFACT_DATA.getAuditJsonKeyName(), externalAuditObject.getARTIFACT_DATA());
-
- }
-
- public enum ArtifactDataFieldEnum {
- attGroup, artLabel, artType, artName, artTimeout, artPayloadUUID, artVersion, artUUID
- }
-
- private static void validateAtifactDataField(Map<String, Object> map, String auditJsonKeyName,
- String expectedArtifactData, boolean checkAllFields) {
- Map<ArtifactDataFieldEnum, String> expectedArtifactDataFileds = new HashMap<ArtifactDataFieldEnum, String>();
- Map<ArtifactDataFieldEnum, String> actualAtifactDataFileds = new HashMap<ArtifactDataFieldEnum, String>();
- if (expectedArtifactData != null) {
- String[] expected = expectedArtifactData.split(",");
-
- assertTrue("Audit field " + auditJsonKeyName + " not found", map.containsKey(auditJsonKeyName));
- String actualValue = (String) map.get(auditJsonKeyName);
- String[] actual = actualValue.split(",");
-
- if (expected.length == 1 && actual.length == 1) {
- assertEquals(expectedArtifactData, actualValue);
- return;
- }
-
- assertEquals(ArtifactDataFieldEnum.values().length, expected.length);
- assertEquals(ArtifactDataFieldEnum.values().length, actual.length);
-
- for (ArtifactDataFieldEnum field : ArtifactDataFieldEnum.values()) {
-
- expectedArtifactDataFileds.put(field, expected[field.ordinal()]);
- actualAtifactDataFileds.put(field, actual[field.ordinal()]);
- }
- for (Map.Entry<ArtifactDataFieldEnum, String> entry : expectedArtifactDataFileds.entrySet()) {
- ArtifactDataFieldEnum field = entry.getKey();
- if (checkAllFields || (!field.equals(ArtifactDataFieldEnum.artVersion)
- && !field.equals(ArtifactDataFieldEnum.artUUID))) {
- assertTrue("Audit field ArtifactData dosn't containt " + field,
- actualAtifactDataFileds.containsKey(field));
- assertEquals("Audit field ArtifactData dosn't equal " + field,
- expectedArtifactDataFileds.get(field), actualAtifactDataFileds.get(field));
- }
-
- }
- }
- }
-
- // //Benny
- public static void validateEcompConsumerAudit(ExpectedEcomConsumerAudit ecompConsumerAuditJavaObject, String action) throws Exception {
-
- String fixedAction = BaseRestUtils.encodeUrlForDownload(action);
- Map<String, Object> map2 = parseAuditResourceByAction(fixedAction, null);
-
- validateField(map2, EcompConsumerAuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), ecompConsumerAuditJavaObject.getModifier());
- validateField(map2, EcompConsumerAuditJsonKeysEnum.ECOMP_USER.getAuditJsonKeyName(), ecompConsumerAuditJavaObject.getEcomUser());
- validateField(map2, EcompConsumerAuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), ecompConsumerAuditJavaObject.getStatus());
- validateField(map2, EcompConsumerAuditJsonKeysEnum.DESC.getAuditJsonKeyName(), ecompConsumerAuditJavaObject.getDesc());
- validateField(map2, EcompConsumerAuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- }
-
- public static void ecompConsumerAuditSuccess(String action, ConsumerDataDefinition consumerDataDefinition, User user, int status) throws Exception {
- ExpectedEcomConsumerAudit expectedEcomConsumerAuditJavaObject = new ExpectedEcomConsumerAudit();
- expectedEcomConsumerAuditJavaObject.setAction(action);
- expectedEcomConsumerAuditJavaObject.setEcomUser(
- consumerDataDefinition.getConsumerName() + "," + consumerDataDefinition.getConsumerSalt().toLowerCase()
- + "," + consumerDataDefinition.getConsumerPassword().toLowerCase());
- expectedEcomConsumerAuditJavaObject.setStatus(String.valueOf(status));
- expectedEcomConsumerAuditJavaObject.setDesc("OK");
- expectedEcomConsumerAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
- AuditValidationUtils.validateEcompConsumerAudit(expectedEcomConsumerAuditJavaObject, action);
- }
-
- public static void createEcompConsumerAuditFailure(String action, ConsumerDataDefinition consumerDataDefinition,
- User user, ActionStatus errorMessage, Object... variables) throws Exception {
- // validate audit
- ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorMessage.name());
- ExpectedEcomConsumerAudit expectedEcomConsumerAuditJavaObject = new ExpectedEcomConsumerAudit();
- expectedEcomConsumerAuditJavaObject.setAction(action);
- expectedEcomConsumerAuditJavaObject.setEcomUser(
- consumerDataDefinition.getConsumerName() + "," + consumerDataDefinition.getConsumerSalt().toLowerCase()
- + "," + consumerDataDefinition.getConsumerPassword().toLowerCase());
- expectedEcomConsumerAuditJavaObject.setStatus(errorInfo.getCode().toString());
- expectedEcomConsumerAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
- expectedEcomConsumerAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
- AuditValidationUtils.validateEcompConsumerAudit(expectedEcomConsumerAuditJavaObject, action);
- }
-
- public static void deleteEcompConsumerAuditFailure(String action, ConsumerDataDefinition consumerDataDefinition,
- User user, ActionStatus errorMessage, Object... variables) throws Exception {
- // validate audit
- ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorMessage.name());
- ExpectedEcomConsumerAudit expectedEcomConsumerAuditJavaObject = new ExpectedEcomConsumerAudit();
- // String auditAction = ADD_ECOMP_USER_CREDENTIALS_AUDIT_ACTION;
- expectedEcomConsumerAuditJavaObject.setAction(action);
- expectedEcomConsumerAuditJavaObject.setEcomUser(consumerDataDefinition.getConsumerName());
- expectedEcomConsumerAuditJavaObject.setStatus(errorInfo.getCode().toString());
- expectedEcomConsumerAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
- expectedEcomConsumerAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
- AuditValidationUtils.validateEcompConsumerAudit(expectedEcomConsumerAuditJavaObject, action);
- }
-
- ////////////////////// US571255
- public static void GetListOfUsersByRolesAuditFailure(String action, String roles, int status, User userModifier,
- ActionStatus errorMessage, Object... variables) throws Exception {
- ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorMessage.name());
- ExpectedGetUserListAudit expectedGetListOfUsersAuditJavaObject = new ExpectedGetUserListAudit(); // String
- // auditAction
- // =
- // ADD_ECOMP_USER_CREDENTIALS_AUDIT_ACTION;
- expectedGetListOfUsersAuditJavaObject.setAction(action);
- expectedGetListOfUsersAuditJavaObject.setStatus(String.valueOf(status));
- expectedGetListOfUsersAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
-
- expectedGetListOfUsersAuditJavaObject.setDetails(roles);
- if (errorMessage == ActionStatus.USER_INACTIVE || errorMessage == ActionStatus.MISSING_INFORMATION) {
- expectedGetListOfUsersAuditJavaObject.setModifier("(UNKNOWN)");
- } else {
- expectedGetListOfUsersAuditJavaObject
- .setModifier(userModifier.getFullName() + "(" + userModifier.getUserId() + ")");
- }
- AuditValidationUtils.validateAuditGetListOfUsersByRoles(expectedGetListOfUsersAuditJavaObject, action);
- }
-
- public static void GetListOfUsersByRolesAuditSuccess(String action, String roles, User user, int status)
- throws Exception {
- ExpectedGetUserListAudit expectedGetListOfUsersAuditJavaObject = new ExpectedGetUserListAudit();
- expectedGetListOfUsersAuditJavaObject.setAction(action);
- expectedGetListOfUsersAuditJavaObject.setStatus(String.valueOf(status));
- expectedGetListOfUsersAuditJavaObject.setDesc("OK");
- expectedGetListOfUsersAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
- expectedGetListOfUsersAuditJavaObject.setDetails(roles);
- validateAuditGetListOfUsersByRoles(expectedGetListOfUsersAuditJavaObject, action);
- }
-
- public static void validateAuditGetListOfUsersByRoles(ExpectedGetUserListAudit GetListOfUsersAuditJavaObject,
- String action) throws Exception {
-
- Map<String, Object> map2 = parseAuditResourceByAction(action, null);
- validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), GetListOfUsersAuditJavaObject.getStatus());
- validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), GetListOfUsersAuditJavaObject.getModifier());
- validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), GetListOfUsersAuditJavaObject.getDesc());
- validateField(map2, AuditJsonKeysEnum.DETAILS.getAuditJsonKeyName(), GetListOfUsersAuditJavaObject.getDetails());
- }
-
- public static void validateAuditImport(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action) throws Exception {
-
- Map<String, Object> map2 = parseAuditResourceByAction(action, null);
-
- resourceAuditJavaObject.setModifierUid(getModifierString(resourceAuditJavaObject.getModifierName(), resourceAuditJavaObject.getModifierUid()));
-
- validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
- validateField(map2, AuditJsonKeysEnum.PREV_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevVersion());
- validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
- validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), resourceAuditJavaObject.getModifierUid());
- validateField(map2, AuditJsonKeysEnum.PREV_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevState());
- validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrState());
- validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
- validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
-
- }
-
- public static void validateAuditDistribution(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action) throws Exception {
-
- Map<String, Object> map2 = parseAuditResourceByAction(action, null);
-
- resourceAuditJavaObject.setModifierUid(getModifierString(resourceAuditJavaObject.getModifierName(), resourceAuditJavaObject.getModifierUid()));
-
- validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
- validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
- validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
- validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), resourceAuditJavaObject.getModifierUid());
- validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrState());
- validateField(map2, AuditJsonKeysEnum.DPREV_STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getDprevStatus());
- validateField(map2, AuditJsonKeysEnum.DCURR_STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getDcurrStatus());
- validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
- validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
- validateField(map2, AuditJsonKeysEnum.COMMENT.getAuditJsonKeyName(), resourceAuditJavaObject.getComment());
- validateField(map2, AuditJsonKeysEnum.DID.getAuditJsonKeyName(), resourceAuditJavaObject.getDistributionId());
-
- }
-
- // Benny
- public static void validateAudit_Distribution(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action) throws Exception {
-
- List<Map<String, Object>> actionToList = getAuditListByAction(resourceAuditJavaObject.getAction(), 1);
- Map<String, Object> map2 = actionToList.get(0);
- validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
- validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
- validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
- validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), resourceAuditJavaObject.getMODIFIER());
- validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrState());
- validateField(map2, AuditJsonKeysEnum.DPREV_STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getDprevStatus());
- validateField(map2, AuditJsonKeysEnum.DCURR_STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getDcurrStatus());
- validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
- validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
- validateField(map2, AuditJsonKeysEnum.COMMENT.getAuditJsonKeyName(), resourceAuditJavaObject.getComment());
-
- }
-
- public void validateAuditNotification(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action) throws Exception {
-
- Map<String, Object> map2 = parseAuditResourceByAction(action, null);
-
- resourceAuditJavaObject.setModifierUid(getModifierString(resourceAuditJavaObject.getModifierName(), resourceAuditJavaObject.getModifierUid()));
-
- validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
- validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
- validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
- validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrState());
- validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
- validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
- validateField(map2, AuditJsonKeysEnum.DID.getAuditJsonKeyName(), resourceAuditJavaObject.getDistributionId());
- validateField(map2, AuditJsonKeysEnum.TOPIC_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getTopicName());
-
- }
-
- public static void validateAudit(ExpectedDistDownloadAudit expectedDistDownloadAudit, String action) throws Exception {
-
- Map<String, Object> map2 = parseAuditResourceByAction(action, null);
-
- validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedDistDownloadAudit.getStatus());
- validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), expectedDistDownloadAudit.getDesc());
- validateField(map2, AuditJsonKeysEnum.CONSUMER_ID.getAuditJsonKeyName(), expectedDistDownloadAudit.getConsumerId());
- validateField(map2, AuditJsonKeysEnum.RESOURCE_URL.getAuditJsonKeyName(), expectedDistDownloadAudit.getResourceUrl());
- }
-
- public static void validateAuditExternalSearchAPI(ExpectedExternalAudit expectedDistDownloadAudit, String action, Map<AuditingFieldsKey, String> body)
- throws Exception {
-
- Map<String, Object> map2 = parseAuditResourceByAction(action, body);
-
- validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedDistDownloadAudit.getSTATUS());
- validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), expectedDistDownloadAudit.getDESC());
- validateField(map2, AuditJsonKeysEnum.CONSUMER_ID.getAuditJsonKeyName(), expectedDistDownloadAudit.getCONSUMER_ID());
- validateField(map2, AuditJsonKeysEnum.RESOURCE_URL.getAuditJsonKeyName(), expectedDistDownloadAudit.getRESOURCE_URL());
- }
-
- public static void validateAuditExternalCreateResource(ExpectedResourceAuditJavaObject expectedExternalAudit, String action, Map<AuditingFieldsKey, String> body) throws Exception {
- Map<String, Object> map2 = parseAuditResourceByAction(action, body);
-
- validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), expectedExternalAudit.getResourceName());
- validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), expectedExternalAudit.getResourceType());
- validateField(map2, AuditJsonKeysEnum.CONSUMER_ID.getAuditJsonKeyName(), expectedExternalAudit.getCONSUMER_ID());
- validateField(map2, AuditJsonKeysEnum.RESOURCE_URL.getAuditJsonKeyName(), expectedExternalAudit.getRESOURCE_URL());
- validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), expectedExternalAudit.getMODIFIER());
-
- validateField(map2, AuditJsonKeysEnum.PREV_VERSION.getAuditJsonKeyName(), expectedExternalAudit.getPrevVersion());
- validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), expectedExternalAudit.getCurrVersion());
- validateField(map2, AuditJsonKeysEnum.PREV_STATE.getAuditJsonKeyName(), expectedExternalAudit.getPrevState());
- validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), expectedExternalAudit.getCurrState());
-
- validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedExternalAudit.getStatus());
- validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), expectedExternalAudit.getDesc());
- }
-
- public static void validateAuditExternalChangeAssetLifeCycle(ExpectedResourceAuditJavaObject expectedExternalAudit, String action, Map<AuditingFieldsKey, String> body) throws Exception {
- Map<String, Object> map2 = parseAuditResourceByAction(action, body);
-
- validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), expectedExternalAudit.getDesc());
- validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedExternalAudit.getStatus());
-
- validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), expectedExternalAudit.getResourceType());
- validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), expectedExternalAudit.getResourceName());
- validateField(map2, AuditJsonKeysEnum.CONSUMER_ID.getAuditJsonKeyName(), expectedExternalAudit.getCONSUMER_ID());
- validateField(map2, AuditJsonKeysEnum.RESOURCE_URL.getAuditJsonKeyName(), expectedExternalAudit.getRESOURCE_URL());
- validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), expectedExternalAudit.getMODIFIER());
-
- validateField(map2, AuditJsonKeysEnum.PREV_VERSION.getAuditJsonKeyName(), expectedExternalAudit.getPrevVersion());
- validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), expectedExternalAudit.getCurrVersion());
- validateField(map2, AuditJsonKeysEnum.PREV_STATE.getAuditJsonKeyName(), expectedExternalAudit.getPrevState());
- validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), expectedExternalAudit.getCurrState());
-
- }
-
- public void validateAuditDeploy(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action)
- throws Exception {
-
- Map<String, Object> map2 = parseAuditResourceByAction(action, null);
-
- resourceAuditJavaObject.setModifierUid(getModifierString(resourceAuditJavaObject.getModifierName(), resourceAuditJavaObject.getModifierUid()));
-
- validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
- validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
- validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
- validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), resourceAuditJavaObject.getModifierUid());
- validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
- validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
- validateField(map2, AuditJsonKeysEnum.DID.getAuditJsonKeyName(), resourceAuditJavaObject.getDistributionId());
-
- }
-
- public static void validateAuditProduct(ExpectedProductAudit productExpectedAudit, String action,
- AuditJsonKeysEnum... additionalFields) throws Exception {
-
- Map<String, Object> map2 = parseAuditResourceByAction(action, null);
-
- validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), productExpectedAudit.getRESOURCE_NAME());
- validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), productExpectedAudit.getRESOURCE_TYPE());
- validateField(map2, AuditJsonKeysEnum.PREV_VERSION.getAuditJsonKeyName(), productExpectedAudit.getPREV_VERSION());
- validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), productExpectedAudit.getCURR_VERSION());
- validateField(map2, AuditJsonKeysEnum.PREV_STATE.getAuditJsonKeyName(), productExpectedAudit.getPREV_STATE());
- validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), productExpectedAudit.getCURR_STATE());
- validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), productExpectedAudit.getMODIFIER());
- validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), productExpectedAudit.getSTATUS());
- validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), productExpectedAudit.getDESC());
- validateField(map2, AuditJsonKeysEnum.SERVICE_INSTANCE_ID.getAuditJsonKeyName(), productExpectedAudit.getSERVICE_INSTANCE_ID());
- if (additionalFields != null) {
- List<AuditJsonKeysEnum> fieldsList = Arrays.asList(additionalFields);
- if (fieldsList.contains(AuditJsonKeysEnum.COMMENT)) {
- validateField(map2, AuditJsonKeysEnum.COMMENT.getAuditJsonKeyName(), productExpectedAudit.getCOMMENT());
- }
- }
- }
-
- private static List<Map<String, Object>> getAuditListByAction(String action, int expectedNumOfAudit)
- throws Exception {
- List<Map<String, Object>> actionToList = parseAuditResourceByActionToList(action, null);
- assertEquals("recieved different audits number than expected", expectedNumOfAudit, actionToList.size());
- return actionToList;
- }
-
- public static void validateAuthenticationAudit(ExpectedAuthenticationAudit expectedAudit) throws Exception {
- List<Map<String, Object>> actionToList = getAuditListByAction(expectedAudit.getAction(), 1);
- assertEquals("expected number of ES action is 1", 1, actionToList.size());
-
- Map<String, Object> map = actionToList.get(0);
- validateField(map, AuditEnum.ACTION.getValue(), expectedAudit.getAction());
- validateField(map, AuditEnum.URL.getValue(), expectedAudit.getUrl());
- validateField(map, AuditEnum.USER.getValue(), expectedAudit.getUser());
- validateField(map, AuditEnum.AUTH_STATUS.getValue(), expectedAudit.getAuthStatus());
- validateField(map, AuditEnum.REALM.getValue(), expectedAudit.getRealm());
-
- }
-
- private static void validateField(Map<String, Object> actualAuditRecord, String jsonField, Object expectedValue) {
- if (expectedValue == null) {
- // || changed to &&
- if (actualAuditRecord.containsKey(jsonField)) {
- assertTrue("Audit field " + jsonField + ": expected null, actual " + actualAuditRecord.get(jsonField),
- actualAuditRecord.get(jsonField).toString().equals("null")
- || actualAuditRecord.get(jsonField).toString().equals(Constants.EMPTY_STRING));
- }
-
- } else {
- assertTrue("Audit field " + jsonField + " not found in actual", actualAuditRecord.containsKey(jsonField));
- Object foundValue = actualAuditRecord.get(jsonField);
- compareElements(expectedValue, foundValue);
- }
- }
-
- public static void compareElements(Object expectedValue, Object foundValue) {
- if (expectedValue instanceof String) {
- assertTrue("Actual value " + foundValue + " is not string", foundValue instanceof String);
- assertTrue("Expected " + "[" + expectedValue +"]" + " not equal to actual [" + foundValue + "]", foundValue.equals(expectedValue));
- }
- /*
- * else if( expectedValue instanceof Number){ assertTrue(foundValue
- * instanceof Number); assertTrue(foundValue == expectedValue); }
- */
- else if (expectedValue instanceof Boolean) {
- assertTrue(foundValue instanceof Boolean);
- assertTrue(foundValue == expectedValue);
- } else if (expectedValue instanceof Map) {
- assertTrue(foundValue instanceof Map);
- Map<String, Object> foundMap = (Map<String, Object>) foundValue;
- Map<String, Object> excpectedMap = (Map<String, Object>) expectedValue;
- assertTrue("size of maps is not equel", foundMap.size() == excpectedMap.size());
- Iterator<String> foundkeyItr = foundMap.keySet().iterator();
- while (foundkeyItr.hasNext()) {
- String foundKey = foundkeyItr.next();
- assertTrue(excpectedMap.containsKey(foundKey));
- compareElements(excpectedMap.get(foundKey), foundMap.get(foundKey));
- }
-
- } else if (expectedValue instanceof List) {
- assertTrue(foundValue instanceof List);
- List<Object> foundList = (List<Object>) foundValue;
- List<Object> excpectedList = (List<Object>) expectedValue;
- assertTrue("size of maps is not equel", foundList.size() == excpectedList.size());
- if( foundList.size() > 0 ){
- final Object elementInList = foundList.get(0);
- if( !(elementInList instanceof List || elementInList instanceof Map) ){
- List<Object> tempList = new ArrayList<>();
- tempList.addAll(foundList);
- for(Object expectedObj : excpectedList){
- if( tempList.contains(expectedObj)){
- tempList.remove(expectedObj);
- }
- else{
- assertTrue(false);
- }
- }
- assertTrue("Lists are not equel", tempList.isEmpty());
- }
- }
-
- } else {
- assertTrue(foundValue.equals(expectedValue));
- }
- }
-
- // public static Map<String, Object> parseAuditResourceByAction(String
- // action, String body) throws Exception {
- //
- // Map auditingMessage = null;
- // auditingMessage = retrieveAuditMessagesByPattern(action, null);
- //
- // return auditingMessage;
- //
- // }
-
- public static Map<String, Object> parseAuditResourceByAction(String action, Map<AuditingFieldsKey, String> body) throws Exception {
-
- Map auditingMessage = null;
- auditingMessage = retrieveAuditMessagesByPattern(action, body, false);
- return auditingMessage;
-
- }
-
- public static List<Map<String, Object>> parseAuditResourceByActionToList(String action,
- Map<AuditingFieldsKey, String> body) throws Exception {
-
- Map auditingMessage = null;
-
- if (body == null || body.isEmpty()) {
- auditingMessage = retrieveAuditMessagesByPattern(action, null, false);
- } else {
- auditingMessage = retrieveAuditMessagesByPattern(action, body, false);
- }
-
- return ResponseParser.getAuditFromMessage(auditingMessage);
- }
-
- public JSONObject buildElasticQueryStringObject(String defaultField, String queryValue) throws JSONException {
-
- JSONObject query_string = new JSONObject();
- JSONObject jSONObject = new JSONObject();
- jSONObject.put("default_field", defaultField);
- jSONObject.put("query", queryValue);
-
- query_string.put("query_string", jSONObject);
-
- return query_string;
- }
-
- public static JSONObject buildElasticQueryBody(List<JSONObject> listObjects) throws JSONException {
-
- JSONObject query = new JSONObject();
- JSONObject bool = new JSONObject();
- JSONObject must = new JSONObject();
- JSONArray mustA = new JSONArray();
-
- for (int i = 0; i < listObjects.size(); i++) {
- JSONObject match = new JSONObject();
- match.put("match", listObjects.get(i));
- mustA.put(match);
-
- }
-
- must.put("must", mustA);
- bool.put("bool", must);
- query.put("query", bool);
-
- return query;
- }
-
- public static String retrieveAuditMessagesUsingBody(String query_string) throws IOException {
-
- Config config = Utils.getConfig();
- HttpRequest getAuditingMessage = new HttpRequest();
- Map<String, String> headersMap = new HashMap<String, String>();
- String body = query_string;
-
- String url = String.format(Urls.GET_SEARCH_DATA_FROM_ES, config.getEsHost(), config.getEsPort(), "_search");
- RestResponse restResponse = getAuditingMessage.httpSendPost(url, body, headersMap);
-
- return restResponse.getResponse();
- }
-
- public static Map<String, String> retrieveAuditMessagesByPattern(String action, Map<AuditingFieldsKey, String> body, Boolean retryFlag)
- throws IOException {
-
- // get cassandra table name by action
- String esType = AuditingActionEnum.fromName(action).getAuditingEsType();
- Map<String, String> resultsMap = new HashMap<String, String>();
-
- List<Pair<AuditingFieldsKey, String>> myFields = new ArrayList<Pair<AuditingFieldsKey, String>>();
- Pair<AuditingFieldsKey, String> myPair = new Pair<AuditingFieldsKey, String>(
- AuditingFieldsKey.AUDIT_ACTION, action);
- myFields.add(0, myPair);
- if (body != null && !body.isEmpty()) {
- for (Map.Entry<AuditingFieldsKey, String> mapElement : body.entrySet()) {
- myFields.add(new Pair<AuditingFieldsKey, String>(mapElement.getKey(), mapElement.getValue()));
- }
- }
-
- List<Row> fetchFromTable = CassandraUtils.fetchFromTable(auditKeySpaceName, esType, myFields);
- if(retryFlag){
- if(fetchFromTable.size() == 0){
- return resultsMap;
- }
- }
-// assertTrue("expected on fetching from data base one record only, actual: " + fetchFromTable.size(), fetchFromTable.size() == 1);
-
-
-
-
- Row row =null;
-
- if (fetchFromTable.size() > 1){
- List<Row> fetchFromTable2 = fetchFromTable;
- fetchFromTable2.sort((p1, p2) -> p1.getTimestamp(1).compareTo(p2.getTimestamp(1)));
- row = fetchFromTable2.get(fetchFromTable2.size() - 1);
- }
- else {row = fetchFromTable.get(0);}
-
- ColumnDefinitions columnDefinitions = row.getColumnDefinitions();
-
- for (int i = 0; i < columnDefinitions.size(); i++) {
- resultsMap.put(columnDefinitions.getName(i), row.getObject(columnDefinitions.getName(i)) == null ? "null"
- : row.getObject(columnDefinitions.getName(i)).toString());
- }
-
- return resultsMap;
- }
-
- public static void categoryAuditSuccess(String action, CategoryDefinition categoryDefinition, User user, int status,
- String resourceType) throws Exception {
- categoryAuditSuccessInternal(action, categoryDefinition, null, null, user, status, resourceType);
- }
-
- public static void categoryAuditFailure(String action, CategoryDefinition categoryDataDefinition, User user,
- ActionStatus errorMessage, int status, String resourceType, Object... variables) throws Exception {
- categoryAuditFailureInternal(action, categoryDataDefinition, null, null, user, errorMessage, status,
- resourceType, variables);
- }
-
- public static void subCategoryAuditSuccess(String action, CategoryDefinition categoryDefinition,
- SubCategoryDefinition subCategoryDefinition, User user, int status, String resourceType) throws Exception {
- categoryAuditSuccessInternal(action, categoryDefinition, subCategoryDefinition, null, user, status,
- resourceType);
- }
-
- public static void groupingAuditSuccess(String action, CategoryDefinition categoryDefinition,
- SubCategoryDefinition subCategoryDefinition, GroupingDefinition groupingDefinition, User user, int status,
- String resourceType) throws Exception {
- categoryAuditSuccessInternal(action, categoryDefinition, subCategoryDefinition, groupingDefinition, user,
- status, resourceType);
- }
-
- public static void subCategoryAuditFailure(String action, CategoryDefinition categoryDataDefinition,
- SubCategoryDefinition subCategoryDefinition, User user, ActionStatus errorMessage, int status,
- String resourceType, Object... variables) throws Exception {
- categoryAuditFailureInternal(action, categoryDataDefinition, subCategoryDefinition, null, user, errorMessage,
- status, resourceType, variables);
- }
-
- // NEW Benny
- public static void groupingAuditFailure(String action, CategoryDefinition categoryDefinition,
- SubCategoryDefinition subCategoryDefinition, GroupingDefinition groupingDefinition, User user,
- ActionStatus errorMessage, int status, String resourceType, Object... variables) throws Exception {
- groupingAuditFailureInternal(action, categoryDefinition, subCategoryDefinition, groupingDefinition, user,
- errorMessage, status, resourceType, variables);
- }
-
- private static void groupingAuditFailureInternal(String action, CategoryDefinition categoryDataDefinition,
- SubCategoryDefinition subCategoryDefinition, GroupingDefinition groupingDefinition, User user,
- ActionStatus errorMessage, int status, String resourceType, Object... variables) throws Exception {
- // validate audit
- ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorMessage.name());
- ExpectedCategoryAudit expectedCatrgoryAuditJavaObject = new ExpectedCategoryAudit();
- expectedCatrgoryAuditJavaObject.setAction(action);
- expectedCatrgoryAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
- expectedCatrgoryAuditJavaObject.setCategoryName(categoryDataDefinition.getName());
- String subCategoryName = (subCategoryDefinition != null ? subCategoryDefinition.getName() : Constants.EMPTY_STRING);
- expectedCatrgoryAuditJavaObject.setSubCategoryName(subCategoryName);
- String groupingName = (groupingDefinition != null ? groupingDefinition.getName() : Constants.EMPTY_STRING);
- expectedCatrgoryAuditJavaObject.setGroupingName(groupingName);
- expectedCatrgoryAuditJavaObject.setResourceType(resourceType);
- expectedCatrgoryAuditJavaObject.setStatus(String.valueOf(status));
- expectedCatrgoryAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
- AuditValidationUtils.validateCategoryAudit(expectedCatrgoryAuditJavaObject, action);
- }
-
- ///
- private static void categoryAuditSuccessInternal(String action, CategoryDefinition categoryDefinition,
- SubCategoryDefinition subCategoryDefinition, GroupingDefinition groupingDefinition, User user, int status,
- String resourceType) throws Exception {
- // resourceType = Service/Resource/Product
- ExpectedCategoryAudit expectedCatrgoryAuditJavaObject = new ExpectedCategoryAudit();
- expectedCatrgoryAuditJavaObject.setAction(action);
- expectedCatrgoryAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
- expectedCatrgoryAuditJavaObject.setCategoryName(categoryDefinition.getName());
- String subCategoryName = (subCategoryDefinition != null ? subCategoryDefinition.getName()
- : Constants.EMPTY_STRING);
- expectedCatrgoryAuditJavaObject.setSubCategoryName(subCategoryName);
- String groupingName = (groupingDefinition != null ? groupingDefinition.getName() : Constants.EMPTY_STRING);
- expectedCatrgoryAuditJavaObject.setGroupingName(groupingName);
- expectedCatrgoryAuditJavaObject.setResourceType(resourceType);
- expectedCatrgoryAuditJavaObject.setStatus(String.valueOf(status));
- expectedCatrgoryAuditJavaObject.setDesc("OK");
- AuditValidationUtils.validateCategoryAudit(expectedCatrgoryAuditJavaObject, action);
- }
-
- ///////////////////////////
- ///// BENNNNNNNNY
- public enum UserAuditJsonKeysEnum {
- ACTION("ACTION"), MODIFIER("MODIFIER"), STATUS("STATUS"), DESC("DESCRIPTION"), USER_AFTER("USER_AFTER"), USER_BEFORE("USER_BEFORE");
- private String auditJsonKeyName;
-
- private UserAuditJsonKeysEnum(String auditJsonKeyName) {
- this.auditJsonKeyName = auditJsonKeyName;
- }
-
- public String getAuditJsonKeyName() {
- return auditJsonKeyName.toLowerCase();
- }
- }
-
- public static void validateAddUserAudit(ExpectedUserCRUDAudit expectedAddUserAuditJavaObject, String action) throws Exception {
-
- List<Map<String, Object>> actionToList = getAuditListByAction(expectedAddUserAuditJavaObject.getAction(), 1);
- Map<String, Object> map = actionToList.get(0);
- validateField(map, UserAuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map, UserAuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), expectedAddUserAuditJavaObject.getModifier());
- validateField(map, UserAuditJsonKeysEnum.USER_AFTER.getAuditJsonKeyName(), expectedAddUserAuditJavaObject.getUserAfter());
- validateField(map, UserAuditJsonKeysEnum.USER_BEFORE.getAuditJsonKeyName(), expectedAddUserAuditJavaObject.getUserBefore());
- validateField(map, UserAuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedAddUserAuditJavaObject.getStatus());
- validateField(map, UserAuditJsonKeysEnum.DESC.getAuditJsonKeyName(), expectedAddUserAuditJavaObject.getDesc());
-
- }
-
- private static void categoryAuditFailureInternal(String action, CategoryDefinition categoryDataDefinition,
- SubCategoryDefinition subCategoryDefinition, GroupingDefinition groupingDefinition, User user,
- ActionStatus errorMessage, int status, String resourceType, Object... variables) throws Exception {
- // validate audit
- ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorMessage.name());
- ExpectedCategoryAudit expectedCatrgoryAuditJavaObject = new ExpectedCategoryAudit();
- expectedCatrgoryAuditJavaObject.setAction(action);
- expectedCatrgoryAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
- expectedCatrgoryAuditJavaObject.setCategoryName(categoryDataDefinition.getName());
- String subCategoryName = (subCategoryDefinition != null ? subCategoryDefinition.getName() : Constants.EMPTY_STRING);
- expectedCatrgoryAuditJavaObject.setSubCategoryName(subCategoryName);
- String groupingName = (groupingDefinition != null ? groupingDefinition.getName() : Constants.EMPTY_STRING);
- expectedCatrgoryAuditJavaObject.setGroupingName(groupingName);
- expectedCatrgoryAuditJavaObject.setResourceType(resourceType);
- expectedCatrgoryAuditJavaObject.setStatus(String.valueOf(status));
- expectedCatrgoryAuditJavaObject.setDesc(errorInfo.getAuditDesc(variables));
- AuditValidationUtils.validateCategoryAudit(expectedCatrgoryAuditJavaObject, action);
- }
-
- public static void validateGetCategoryHirarchy(ExpectedCategoryAudit expectedCatrgoryAuditJavaObject, String action)
- throws Exception {
-
- List<Map<String, Object>> actionToList = getAuditListByAction(expectedCatrgoryAuditJavaObject.getAction(), 1);
- Map<String, Object> map = actionToList.get(0);
-
- expectedCatrgoryAuditJavaObject.setModifier(getModifierString(expectedCatrgoryAuditJavaObject.getModifierName(),
- expectedCatrgoryAuditJavaObject.getModifierUid()));
- validateField(map, CategoryAuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map, CategoryAuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getModifier());
- validateField(map, CategoryAuditJsonKeysEnum.DETAILS.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getDetails());
- validateField(map, CategoryAuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getStatus());
- validateField(map, CategoryAuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getDesc());
-
- }
-
- public static void validateCategoryAudit(ExpectedCategoryAudit expectedCatrgoryAuditJavaObject, String action)
- throws Exception {
-
- List<Map<String, Object>> actionToList = getAuditListByAction(expectedCatrgoryAuditJavaObject.getAction(), 1);
- Map<String, Object> map = actionToList.get(0);
- validateField(map, CategoryAuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map, CategoryAuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getModifier());
- validateField(map, CategoryAuditJsonKeysEnum.CATEGORY_NAME.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getCategoryName());
- validateField(map, CategoryAuditJsonKeysEnum.SUB_CATEGORY_NAME.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getSubCategoryName());
- validateField(map, CategoryAuditJsonKeysEnum.GROUPING_NAME.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getGroupingName());
- validateField(map, CategoryAuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getResourceType());
- validateField(map, CategoryAuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getStatus());
- validateField(map, CategoryAuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), expectedCatrgoryAuditJavaObject.getDesc());
- }
-
- public static void GetCategoryHierarchyAuditSuccess(String action, String componentType, User user, int status)
- throws Exception {
- ExpectedGetUserListAudit expectedGetListOfUsersAuditJavaObject = new ExpectedGetUserListAudit();
- expectedGetListOfUsersAuditJavaObject.setAction(action);
- expectedGetListOfUsersAuditJavaObject.setStatus(String.valueOf(status));
- expectedGetListOfUsersAuditJavaObject.setDesc("OK");
- expectedGetListOfUsersAuditJavaObject.setModifier(user.getFullName() + "(" + user.getUserId() + ")");
- expectedGetListOfUsersAuditJavaObject.setDetails(componentType.toLowerCase());
- validateAuditGetListOfUsersByRoles(expectedGetListOfUsersAuditJavaObject, action);
- }
-
- public static String buildArtifactDataAudit(ArtifactDefinition artifactDefinition) {
- StringBuilder sb = new StringBuilder();
- if (artifactDefinition.getTimeout() == null) {
- artifactDefinition.setTimeout(0);
- }
- if (artifactDefinition != null) {
- sb.append(artifactDefinition.getArtifactGroupType() == null ? null
- : artifactDefinition.getArtifactGroupType().getType()).append(",").append("'")
- .append(artifactDefinition.getArtifactLabel()).append("'").append(",")
- .append(artifactDefinition.getArtifactType()).append(",")
- .append(artifactDefinition.getArtifactName()).append(",").append(artifactDefinition.getTimeout())
- .append(",").append(artifactDefinition.getEsId());
- sb.append(",");
- if (artifactDefinition.getArtifactVersion() != null) {
- sb.append(artifactDefinition.getArtifactVersion());
- } else {
- sb.append(" ");
- }
- sb.append(",");
- if (artifactDefinition.getArtifactUUID() != null) {
- sb.append(artifactDefinition.getArtifactUUID());
- } else {
- sb.append(" ");
- }
- }
-
- return sb.toString();
- }
-
-
- public static ExpectedResourceAuditJavaObject expectedArtifactNotFoundAuditObject(String Action, String resourceUid,
- ComponentType resourceType, String artifactUid, User user, String currState, String currVersion)
- throws FileNotFoundException {
- String desc = null;
-
- ExpectedResourceAuditJavaObject expectedAudit = new ExpectedResourceAuditJavaObject();
- expectedAudit.setAction(Action);
- expectedAudit.setResourceName(resourceUid);
- expectedAudit.setResourceType(resourceType.getValue());
- expectedAudit.setPrevVersion("");
- expectedAudit.setCurrVersion(currVersion);
- expectedAudit.setModifierName(user.getFirstName() + " " + user.getLastName());
- expectedAudit.setModifierUid(user.getUserId());
- expectedAudit.setPrevState("");
- expectedAudit.setCurrState(currState);
- expectedAudit.setPrevArtifactUuid("");
- expectedAudit.setCurrArtifactUuid(artifactUid);
- expectedAudit.setArtifactData("");
- expectedAudit.setStatus("404");
-
- desc = buildAuditDescription(
- new ErrorValidationUtils().parseErrorConfigYaml(ActionStatus.ARTIFACT_NOT_FOUND.name()),
- Arrays.asList(""));
-
- expectedAudit.setDesc(desc);
- return expectedAudit;
- }
-
- public static JSONObject filterAuditByUuid(String action, String uuid) throws Exception {
- Map<String, String> actionMap = new HashMap<>();
- actionMap.put("ACTION", action);
- JSONObject actionJsonObject = new JSONObject(actionMap);
- Map<String, String> uuidMap = new HashMap<>();
- uuidMap.put("SERVICE_INSTANCE_ID", uuid);
- JSONObject uuidJsonObject = new JSONObject(uuidMap);
-
- List<JSONObject> filters = new ArrayList<>(Arrays.asList(actionJsonObject, uuidJsonObject));
- JSONObject body = buildElasticQueryBody(filters);
- return body;
- }
-
- public static void validateAudit(ExpectedResourceAuditJavaObject resourceAuditJavaObject, String action) throws Exception {
- List<Map<String, Object>> actionToList = getAuditListByAction(resourceAuditJavaObject.getAction(), 1);
- Map<String, Object> map2 = actionToList.get(0);
- validateField(map2, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
- validateField(map2, AuditJsonKeysEnum.RESOURCE_NAME.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceName());
- validateField(map2, AuditJsonKeysEnum.RESOURCE_TYPE.getAuditJsonKeyName(), resourceAuditJavaObject.getResourceType());
- validateField(map2, AuditJsonKeysEnum.PREV_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevVersion());
- validateField(map2, AuditJsonKeysEnum.CURR_VERSION.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrVersion());
- validateField(map2, AuditJsonKeysEnum.MODIFIER.getAuditJsonKeyName(), resourceAuditJavaObject.getMODIFIER());
- validateField(map2, AuditJsonKeysEnum.PREV_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getPrevState());
- validateField(map2, AuditJsonKeysEnum.CURR_STATE.getAuditJsonKeyName(), resourceAuditJavaObject.getCurrState());
- validateField(map2, AuditJsonKeysEnum.STATUS.getAuditJsonKeyName(), resourceAuditJavaObject.getStatus());
- validateField(map2, AuditJsonKeysEnum.DESCRIPTION.getAuditJsonKeyName(), resourceAuditJavaObject.getDesc());
- validateField(map2, AuditJsonKeysEnum.COMMENT.getAuditJsonKeyName(), resourceAuditJavaObject.getComment());
- }
-
- ////// service audit validation/////////////////////
-
- public static ExpectedResourceAuditJavaObject constructFieldsForAuditValidation(ServiceReqDetails serviceReqDetails,
- String serviceVersion, User sdncUserDetails) {
-
- ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
-
- expectedResourceAuditJavaObject.setAction("Create");
- expectedResourceAuditJavaObject.setModifierUid(sdncUserDetails.getUserId());
- String userFirstLastName = sdncUserDetails.getFirstName() + " " + sdncUserDetails.getLastName();
- expectedResourceAuditJavaObject.setModifierName(userFirstLastName);
- expectedResourceAuditJavaObject.setStatus("200");
- expectedResourceAuditJavaObject.setDesc("OK");
- expectedResourceAuditJavaObject.setResourceName(serviceReqDetails.getName());
- expectedResourceAuditJavaObject.setResourceType("Service");
- expectedResourceAuditJavaObject.setPrevVersion(String.valueOf(Float.parseFloat(serviceVersion) - 0.1f));
- expectedResourceAuditJavaObject.setCurrVersion(serviceVersion);
- expectedResourceAuditJavaObject.setPrevState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
- expectedResourceAuditJavaObject.setCurrState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
- expectedResourceAuditJavaObject.setComment(null);
-
- return expectedResourceAuditJavaObject;
-
- }
-
- public static ExpectedResourceAuditJavaObject constructFieldsForAuditValidation(ServiceReqDetails serviceReqDetails,
- String serviceVersion, User sdncUserDetails, ActionStatus errorStatus, List<String> variables)
- throws FileNotFoundException {
-
- ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = constructFieldsForAuditValidation(
- serviceReqDetails, serviceVersion, sdncUserDetails);
- ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorStatus.name());
-
- expectedResourceAuditJavaObject.setStatus(errorInfo.getCode().toString());
- String auditDesc = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
- expectedResourceAuditJavaObject.setDesc(auditDesc);
-
- return expectedResourceAuditJavaObject;
-
- }
-
-}
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/BaseValidationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/BaseValidationUtils.java
deleted file mode 100644
index b29fab4c57..0000000000
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/BaseValidationUtils.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.ci.tests.utils.validation;
-
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.exception.ResponseFormat;
-import org.testng.Assert;
-
-import java.io.FileNotFoundException;
-import java.util.Arrays;
-
-import static org.testng.AssertJUnit.assertEquals;
-
-public class BaseValidationUtils {
-
- public static final int STATUS_CODE_SUCCESS = 200;
- public static final int STATUS_CODE_CREATED = 201;
- public static final int STATUS_CODE_DELETE = 204;
- public static final int STATUS_CODE_NOT_FOUND = 404;
- public static final int STATUS_CODE_SUCCESS_NO_CONTENT = 204;
- public static final int STATUS_CODE_SUCCESS_DELETE = 204;
- public static final int STATUS_CODE_INVALID_CONTENT = 400;
- public static final int STATUS_CODE_MISSING_DATA = 400;
- public static final int STATUS_CODE_MISSING_INFORMATION = 403;
- public static final int STATUS_CODE_RESTRICTED_ACCESS = 403;
- public static final int STATUS_CODE_RESTRICTED_OPERATION = 409;
- public static final int STATUS_CODE_ALREADY_EXISTS = 409;
-
- // ------
- protected static Boolean checkErrorCode(RestResponse deleteResponse) {
- if (deleteResponse.getErrorCode() == STATUS_CODE_SUCCESS
- || deleteResponse.getErrorCode() == STATUS_CODE_DELETE) {
- return true;
- }
- return false;
- }
-
- // *** STATUS CODE VALIDATION UTIITIES ****
- public static void checkStatusCode(RestResponse response, String assertMessage, boolean AND, int... statuses) {
- int statusCode = response.getErrorCode();
- for (int status : statuses) {
- if (AND && statusCode != status) {
- Assert.fail(assertMessage + " status: " + statusCode);
- } else if (statusCode == status) {
- return;
- }
- }
- if (!AND) {
- Assert.fail(assertMessage + " status: " + statusCode);
- }
- }
-
- public static void checkDeleteResponse(RestResponse response) {
- checkStatusCode(response, "delete request failed", false, STATUS_CODE_DELETE, STATUS_CODE_NOT_FOUND,
- STATUS_CODE_SUCCESS); // STATUS_CODE_SUCCESS for deActivate user
- }
-
- public static void checkCreateResponse(RestResponse response) {
- checkStatusCode(response, "create request failed", false, STATUS_CODE_CREATED);
- }
-
- public static void checkSuccess(RestResponse response) {
- checkStatusCode(response, "request failed", false, STATUS_CODE_SUCCESS);
- }
-
- public static void checkErrorResponse(RestResponse errorResponse, ActionStatus actionStatus,
- String... expectedVariables) throws FileNotFoundException {
- // Expected error
- ErrorInfo expectedError = ErrorValidationUtils.parseErrorConfigYaml(actionStatus.name());
- String expectedMessage = expectedError.getMessage();
-
- // Actual error
- ResponseFormat responseFormat = ResponseParser.parseToObjectUsingMapper(errorResponse.getResponse(),
- ResponseFormat.class);
- String actualMessage = responseFormat.getText();
- String[] actualVariables = responseFormat.getVariables();
-
- assertEquals("Unexpected error message", expectedMessage, actualMessage);
- assertEquals("Unexpected error variables", Arrays.asList(expectedVariables), Arrays.asList(actualVariables));
- }
-
- public static void checkErrorMessageResponse(RestResponse errorResponse, ActionStatus actionStatus)
- throws FileNotFoundException {
- // Expected error
- ErrorInfo expectedError = ErrorValidationUtils.parseErrorConfigYaml(actionStatus.name());
- String expectedMessage = expectedError.getMessage();
-
- // Actual error
- ResponseFormat responseFormat = ResponseParser.parseToObjectUsingMapper(errorResponse.getResponse(),
- ResponseFormat.class);
- String actualMessage = responseFormat.getText();
-
- assertEquals("Unexpected error message", expectedMessage, actualMessage);
- }
-}
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/CategoryValidationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/CategoryValidationUtils.java
deleted file mode 100644
index 71a19eaa06..0000000000
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/CategoryValidationUtils.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.ci.tests.utils.validation;
-
-import org.json.JSONObject;
-import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.be.model.category.GroupingDefinition;
-import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
-
-import static org.testng.AssertJUnit.*;
-
-public class CategoryValidationUtils {
-
- public static void verifyCategoryExistInGetResponse(RestResponse getAllCategoryRest,
- CategoryDefinition categoryDefinition) {
-
- int categoriesNum = CategoryRestUtils.getMatchingCategoriesNum(getAllCategoryRest, categoryDefinition);
- assertEquals("category " + categoryDefinition.getName() + " not found during get or found more than once", 1,
- categoriesNum);
- }
-
- public static void verifyCategoryNotExistsInGetResponse(RestResponse getAllCategoryRest,
- CategoryDefinition categoryDefinition) {
-
- int categoriesNum = CategoryRestUtils.getMatchingCategoriesNum(getAllCategoryRest, categoryDefinition);
- assertEquals("category " + categoryDefinition.getName() + " should't be found during get", 0, categoriesNum);
- }
-
- public static void verifySubCategoryExistInGetResponse(RestResponse getAllCategoryRest, String parentCategoryId,
- SubCategoryDefinition expectedSubCategoryDefinition) {
-
- int subCategoriesNum = CategoryRestUtils.getMatchingSubCategoriesNum(getAllCategoryRest, parentCategoryId,
- expectedSubCategoryDefinition);
- assertEquals(
- "sub-category " + expectedSubCategoryDefinition.getName()
- + " not found during get or found more than once for parentId " + parentCategoryId,
- 1, subCategoriesNum);
- }
-
- public static void verifyGroupingExistInGetResponse(RestResponse getAllCategoryRest, String parentCategoryId,
- String subCategoryId, GroupingDefinition expectedGroupingDefinition) {
-
- int groupingNum = CategoryRestUtils.getMatchingGroupingNum(getAllCategoryRest, parentCategoryId, subCategoryId,
- expectedGroupingDefinition);
- assertEquals(
- "sub-category " + expectedGroupingDefinition.getName()
- + " not found during get or found more than once for parentId " + parentCategoryId,
- 1, groupingNum);
- }
-
- public static void verifyGroupingNotExistInGetResponse(RestResponse getAllCategoryRest, String parentCategoryId,
- String subCategoryId, GroupingDefinition expectedGroupingDefinition) {
-
- int groupingNum = CategoryRestUtils.getMatchingGroupingNum(getAllCategoryRest, parentCategoryId, subCategoryId,
- expectedGroupingDefinition);
- assertEquals(
- "sub-category " + expectedGroupingDefinition.getName()
- + " not found during get or found more than once for parentId " + parentCategoryId,
- 0, groupingNum);
- }
-
- public static void verifySubCategoryNotExistsInGetResponse(RestResponse getAllCategoryRest, String parentCategoryId,
- SubCategoryDefinition expectedSubCategoryDefinition) {
-
- int subCategoriesNum = CategoryRestUtils.getMatchingSubCategoriesNum(getAllCategoryRest, parentCategoryId,
- expectedSubCategoryDefinition);
- assertEquals("sub-category " + expectedSubCategoryDefinition.getName()
- + " should't be found during get for parentId " + parentCategoryId, 0, subCategoriesNum);
- }
-
- /// NEE Benny
- public static void validateCreateGroupResponse(RestResponse createSubCategoryRest,
- GroupingDefinition expectedGroupDefinition) throws Exception {
-
- String response = createSubCategoryRest.getResponse();
- JSONObject jobject = new JSONObject(response);
- assertTrue(jobject.get("name").equals(expectedGroupDefinition.getName()));
- assertTrue(jobject.get("normalizedName").equals(expectedGroupDefinition.getNormalizedName()));
- // assertNotNull(jobject.get("normalizedName"));
- assertNotNull(jobject.get("uniqueId"));
- expectedGroupDefinition.setUniqueId(jobject.get("uniqueId").toString());
-
- }
-
- public static void validateCreateSubCategoryResponse(RestResponse createSubCategoryRest,
- SubCategoryDefinition expectedSubCategoryDefinition) throws Exception {
-
- String response = createSubCategoryRest.getResponse();
- JSONObject jobject = new JSONObject(response);
- assertTrue(jobject.get("name").equals(expectedSubCategoryDefinition.getName()));
- assertNotNull(jobject.get("normalizedName"));
- assertNotNull(jobject.get("uniqueId"));
- }
-
- public static void validateCreateCategoryResponse(RestResponse createCategoryRest,
- CategoryDefinition expectedCategoryDefinition) throws Exception {
- String response = createCategoryRest.getResponse();
- JSONObject jobject = new JSONObject(response);
- assertTrue(jobject.get("name").equals(expectedCategoryDefinition.getName()));
- assertTrue(jobject.get("normalizedName").equals(expectedCategoryDefinition.getNormalizedName()));
- assertNotNull(jobject.get("uniqueId"));
- }
-
-}
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/CsarValidationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/CsarValidationUtils.java
deleted file mode 100644
index d85e093c17..0000000000
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/CsarValidationUtils.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.ci.tests.utils.validation;
-
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.ci.tests.datatypes.GroupHeatMetaDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.HeatMetaFirstLevelDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.TypeHeatMetaDefinition;
-import org.openecomp.sdc.ci.tests.utils.CsarParserUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.testng.AssertJUnit.assertTrue;
-
-public class CsarValidationUtils {
-
- public static void validateCsarVfArtifact(String csarUUID, Resource resource) throws Exception {
-
- List<TypeHeatMetaDefinition> listTypeHeatMetaDefinition = CsarParserUtils.getListTypeHeatMetaDefinition(csarUUID);
- assertTrue(
- "check group count, expected: " + getGroupCount(listTypeHeatMetaDefinition) + ", actual: "
- + resource.getGroups().size(),
- getGroupCount(listTypeHeatMetaDefinition) == resource.getGroups().size());
- assertTrue(
- "check artifact count, expected: " + getArtifactCount(listTypeHeatMetaDefinition, false) + ", actual: "
- + resource.getDeploymentArtifacts().size(),
- getArtifactCount(listTypeHeatMetaDefinition, false) == resource.getDeploymentArtifacts().size());
-
- }
-
- /*public static List<TypeHeatMetaDefinition> getListTypeHeatMetaDefinition(String csarUUID) throws Exception {
-
- String artifactHeatMetaLocation = "Artifacts/HEAT.meta";
- JSONParser parser = new JSONParser();
- String csarPayload = getCsarPayload(csarUUID, artifactHeatMetaLocation);
- if (csarPayload != null) {
- Object parse = parser.parse(csarPayload);
- JSONObject jsonObject = (JSONObject) parse;
- JSONObject jsonObjectImportStructure = (JSONObject) jsonObject.get("importStructure");
- List<TypeHeatMetaDefinition> listHeatMetaDefenition = new ArrayList<TypeHeatMetaDefinition>();
- listHeatMetaDefenition = getArtifactsByGroup(jsonObjectImportStructure, listHeatMetaDefenition);
- return listHeatMetaDefenition;
- }
- return null;
-
- }*/
-
- /*public static List<TypeHeatMetaDefinition> getListTypeHeatMetaDefinition(File csarUUID) throws Exception {
-
- String artifactHeatMetaLocation = "Artifacts/HEAT.meta";
- JSONParser parser = new JSONParser();
- String csarPayload = getCsarPayload(csarUUID, artifactHeatMetaLocation);
- if (csarPayload != null) {
- Object parse = parser.parse(csarPayload);
- JSONObject jsonObject = (JSONObject) parse;
- JSONObject jsonObjectImportStructure = (JSONObject) jsonObject.get("importStructure");
- List<TypeHeatMetaDefinition> listHeatMetaDefenition = new ArrayList<TypeHeatMetaDefinition>();
- listHeatMetaDefenition = getArtifactsByGroup(jsonObjectImportStructure, listHeatMetaDefenition);
- return listHeatMetaDefenition;
- }
- return null;
-
- }*/
-
- private static Integer getGroupCount(List<TypeHeatMetaDefinition> listHeatMetaDefenition) {
- int count = 0;
- for (TypeHeatMetaDefinition typeHeatMetaDefinition : listHeatMetaDefenition) {
- count = count + typeHeatMetaDefinition.getGroupHeatMetaDefinition().size();
- }
- return count;
- }
-
- private static Integer getArtifactCount(List<TypeHeatMetaDefinition> listHeatMetaDefenition, Boolean isEnvIncluded) {
- int count = 0;
- List<HeatMetaFirstLevelDefinition> uniqeArtifactList = new ArrayList<>();
-
- for (TypeHeatMetaDefinition typeHeatMetaDefinition : listHeatMetaDefenition) {
- for (GroupHeatMetaDefinition groupHeatMetaDefinition : typeHeatMetaDefinition
- .getGroupHeatMetaDefinition()) {
- if (isEnvIncluded) {
- count = count + groupHeatMetaDefinition.getArtifactList().size();
- } else {
- for (HeatMetaFirstLevelDefinition fileName : groupHeatMetaDefinition.getArtifactList()) {
- if (!fileName.getFileName().contains(".env") && !uniqeArtifactList.contains(fileName)) {
- uniqeArtifactList.add(fileName);
- count = count + 1;
- }
- }
- }
- }
- }
- return count;
- }
-
- /*protected static List<TypeHeatMetaDefinition> getArtifactsByGroup(JSONObject jsonObjectImportStructure, List<TypeHeatMetaDefinition> listHeatMetaDefenition) {
-
- @SuppressWarnings("unchecked")
- Set<Object> typeSet = jsonObjectImportStructure.keySet();
- for (Object type : typeSet) {
- TypeHeatMetaDefinition heatMetaDefenition = new TypeHeatMetaDefinition();
- log.debug(type.toString());
- log.debug("{}", jsonObjectImportStructure.get(type));
- JSONArray array = (JSONArray) jsonObjectImportStructure.get(type);
- heatMetaDefenition.setTypeName((String) type);
- List<GroupHeatMetaDefinition> groupHeatMetaDefinitions = new ArrayList<GroupHeatMetaDefinition>();
- heatMetaDefenition.setGroupHeatMetaDefinition(fetchArtifactByGroupFromJsonArray(array, groupHeatMetaDefinitions, true, false));
- listHeatMetaDefenition.add(heatMetaDefenition);
- }
- return listHeatMetaDefenition;
- }*/
-
-/* protected static List<GroupHeatMetaDefinition> fetchArtifactByGroupFromJsonArray(JSONArray array, List<GroupHeatMetaDefinition> listGroupHeatMetaDefinition, Boolean openNewGroup, Boolean isNested) {
-
- GroupHeatMetaDefinition groupHeatMetaDefinition;
-
- if (array != null) {
- for (int i = 0; i < array.size(); i++) {
- if (openNewGroup) {
- groupHeatMetaDefinition = new GroupHeatMetaDefinition();
- int groupNumber = listGroupHeatMetaDefinition.size() + 1;
- log.debug("groupName={}", groupNumber);
- groupHeatMetaDefinition.setGroup(groupNumber);
- listGroupHeatMetaDefinition.add(groupHeatMetaDefinition);
- PropertyHeatMetaDefinition propertyHeatMetaDefinition = new PropertyHeatMetaDefinition();
- propertyHeatMetaDefinition.setName("isBase");
- propertyHeatMetaDefinition.setValue(false);
- groupHeatMetaDefinition.setPropertyHeatMetaDefinition(propertyHeatMetaDefinition);
- }
- groupHeatMetaDefinition = listGroupHeatMetaDefinition.get(listGroupHeatMetaDefinition.size() - 1);
- JSONObject jsonObject = (JSONObject) array.get(i);
- fetchArtifactByGroupFromJsonObject(listGroupHeatMetaDefinition, groupHeatMetaDefinition, jsonObject, isNested);
- }
- }
- return listGroupHeatMetaDefinition;
- }*/
-
-
- /*public static void fetchArtifactByGroupFromJsonObject(List<GroupHeatMetaDefinition> listGroupHeatMetaDefinition, GroupHeatMetaDefinition groupHeatMetaDefinition, JSONObject jsonObject, Boolean isNested) {
- @SuppressWarnings("unchecked")
- Set<Object> groupsKey = jsonObject.keySet();
- for (Object groupKey : groupsKey) {
- String groupKeyStr = (String) groupKey;
- if (groupKeyStr.equals("isBase")) {
- PropertyHeatMetaDefinition propertyHeatMetaDefinition = new PropertyHeatMetaDefinition();
- propertyHeatMetaDefinition.setName(groupKeyStr);
- propertyHeatMetaDefinition.setValue((boolean) jsonObject.get(groupKeyStr));
- if (!groupHeatMetaDefinition.getPropertyHeatMetaDefinition().equals(propertyHeatMetaDefinition)) {
- groupHeatMetaDefinition.getPropertyHeatMetaDefinition().setValue((boolean) jsonObject.get(groupKeyStr));
- }
- }
- if (groupKeyStr.equals("fileName")) {
- String artifactName = (String) jsonObject.get(groupKeyStr);
- String artifactType = ArtifactTypeEnum.HEAT_ARTIFACT.getType();
- if(isNested){
- artifactType = ArtifactTypeEnum.HEAT_NESTED.getType();
- }
- if(jsonObject.get("type") != null && isNested == false){
- artifactType = (String) jsonObject.get("type");
- }
- HeatMetaFirstLevelDefinition heatMetaFirstLevelDefinition = new HeatMetaFirstLevelDefinition(artifactName, artifactType);
- List<HeatMetaFirstLevelDefinition> listArtifactNames = groupHeatMetaDefinition.getArtifactList();
- listArtifactNames.add(heatMetaFirstLevelDefinition);
- groupHeatMetaDefinition.setArtifactList(listArtifactNames);
- } else {
- if((groupKeyStr.equals("env"))){
- if (jsonObject.get(groupKeyStr) instanceof JSONObject){
- fetchArtifactByGroupFromJsonObject(listGroupHeatMetaDefinition, groupHeatMetaDefinition, (JSONObject) jsonObject.get(groupKeyStr), false);
- }else{
- assertTrue("Expected object is JSONObject, but actual: " + jsonObject.get(groupKeyStr).getClass(), jsonObject.get(groupKeyStr).getClass().equals("JSONObject"));
- }
- }
- if((groupKeyStr.equals("nested"))){
- if (jsonObject.get(groupKeyStr) instanceof JSONArray){
- fetchArtifactByGroupFromJsonArray((JSONArray) jsonObject.get(groupKeyStr), listGroupHeatMetaDefinition, false, true);
- }else{
- assertTrue("Expected object is JSONArray, but actual: " + jsonObject.get(groupKeyStr).getClass(), jsonObject.get(groupKeyStr).getClass().equals("JSONArray"));
- }
-
- }else if (!(groupKeyStr.equals("isBase") || groupKeyStr.equals("type") || groupKeyStr.equals("env"))) {
- if (jsonObject.get(groupKeyStr) instanceof JSONArray){
- fetchArtifactByGroupFromJsonArray((JSONArray) jsonObject.get(groupKeyStr), listGroupHeatMetaDefinition, false, false);
- }else{
- assertTrue("Expected object is JSONArray, but actual: " + jsonObject.get(groupKeyStr).getClass(), jsonObject.get(groupKeyStr).getClass().equals("JSONArray"));
- }
- }
- }
- }
- }*/
-
- /*public static List<TypeHeatMetaDefinition> getListTypeHeatMetaDefinition(String csarUUID) throws Exception {
-
- String artifactHeatMetaLocation = "Artifacts/HEAT.meta";
- JSONParser parser = new JSONParser();
- String csarPayload = getCsarPayload(csarUUID, artifactHeatMetaLocation);
- if (csarPayload != null) {
- Object parse = parser.parse(csarPayload);
- JSONObject jsonObject = (JSONObject) parse;
- JSONObject jsonObjectImportStructure = (JSONObject) jsonObject.get("importStructure");
- List<TypeHeatMetaDefinition> listHeatMetaDefenition = new ArrayList<TypeHeatMetaDefinition>();
- listHeatMetaDefenition = getArtifactsByGroup(jsonObjectImportStructure, listHeatMetaDefenition);
- return listHeatMetaDefenition;
- }
- return null;
-
- }
-
- protected static List<TypeHeatMetaDefinition> getArtifactsByGroup(JSONObject jsonObjectImportStructure,
- List<TypeHeatMetaDefinition> listHeatMetaDefenition) {
-
- @SuppressWarnings("unchecked")
- Set<Object> typeSet = jsonObjectImportStructure.keySet();
- for (Object type : typeSet) {
- TypeHeatMetaDefinition heatMetaDefenition = new TypeHeatMetaDefinition();
- log.debug(type.toString());
- log.debug("{}", jsonObjectImportStructure.get(type));
- JSONArray array = (JSONArray) jsonObjectImportStructure.get(type);
- heatMetaDefenition.setTypeName((String) type);
- List<GroupHeatMetaDefinition> groupHeatMetaDefinitions = new ArrayList<GroupHeatMetaDefinition>();
- heatMetaDefenition.setGroupHeatMetaDefinition(fetchArtifactByGroup(array, groupHeatMetaDefinitions, true));
- listHeatMetaDefenition.add(heatMetaDefenition);
- }
- return listHeatMetaDefenition;
- }
-
- protected static List<GroupHeatMetaDefinition> fetchArtifactByGroup(JSONArray array,
- List<GroupHeatMetaDefinition> listGroupHeatMetaDefinition, Boolean openNewGroup) {
-
- GroupHeatMetaDefinition groupHeatMetaDefinition;
-
- if (array != null) {
- for (int i = 0; i < array.size(); i++) {
- if (openNewGroup) {
- groupHeatMetaDefinition = new GroupHeatMetaDefinition();
- int groupNumber = listGroupHeatMetaDefinition.size() + 1;
- log.debug("groupName={}", groupNumber);
- groupHeatMetaDefinition.setGroup(groupNumber);
- listGroupHeatMetaDefinition.add(groupHeatMetaDefinition);
- PropertyHeatMetaDefinition propertyHeatMetaDefinition = new PropertyHeatMetaDefinition();
- propertyHeatMetaDefinition.setName("isBase");
- propertyHeatMetaDefinition.setValue(false);
- groupHeatMetaDefinition.setPropertyHeatMetaDefinition(propertyHeatMetaDefinition);
- }
- groupHeatMetaDefinition = listGroupHeatMetaDefinition.get(listGroupHeatMetaDefinition.size() - 1);
- JSONObject jsonObject = (JSONObject) array.get(i);
- @SuppressWarnings("unchecked")
- Set<Object> groupsKey = jsonObject.keySet();
- for (Object groupKey : groupsKey) {
- String groupKeyStr = (String) groupKey;
- if (groupKeyStr.equals("isBase")) {
- PropertyHeatMetaDefinition propertyHeatMetaDefinition = new PropertyHeatMetaDefinition();
- propertyHeatMetaDefinition.setName(groupKeyStr);
- propertyHeatMetaDefinition.setValue((boolean) jsonObject.get(groupKeyStr));
- if (!groupHeatMetaDefinition.getPropertyHeatMetaDefinition()
- .equals(propertyHeatMetaDefinition)) {
- groupHeatMetaDefinition.getPropertyHeatMetaDefinition()
- .setValue((boolean) jsonObject.get(groupKeyStr));
- }
- }
- if (groupKeyStr.equals("fileName") || groupKeyStr.equals("env")) {
- String artifactName = (String) jsonObject.get(groupKeyStr);
- List<String> listArtifactNames = groupHeatMetaDefinition.getArtifactList();
- listArtifactNames.add(artifactName);
- groupHeatMetaDefinition.setArtifactList(listArtifactNames);
- } else {
- if (!groupKeyStr.equals("isBase")) {
- fetchArtifactByGroup((JSONArray) jsonObject.get(groupKeyStr), listGroupHeatMetaDefinition,
- false);
- }
- }
- }
- }
- }
- return listGroupHeatMetaDefinition;
- }
-
- private static Integer getArtifactCount(List<TypeHeatMetaDefinition> listHeatMetaDefenition,
- Boolean isEnvIncluded) {
- int count = 0;
- List<String> uniqeArtifactList = new ArrayList<>();
-
- for (TypeHeatMetaDefinition typeHeatMetaDefinition : listHeatMetaDefenition) {
- for (GroupHeatMetaDefinition groupHeatMetaDefinition : typeHeatMetaDefinition
- .getGroupHeatMetaDefinition()) {
- if (isEnvIncluded) {
- count = count + groupHeatMetaDefinition.getArtifactList().size();
- } else {
- for (String fileName : groupHeatMetaDefinition.getArtifactList()) {
- if (!fileName.contains(".env") && !uniqeArtifactList.contains(fileName)) {
- uniqeArtifactList.add(fileName);
- count = count + 1;
- }
- }
- }
- }
- }
- return count;
- }
-
- private static Integer getGroupCount(List<TypeHeatMetaDefinition> listHeatMetaDefenition) {
- int count = 0;
- for (TypeHeatMetaDefinition typeHeatMetaDefinition : listHeatMetaDefenition) {
- count = count + typeHeatMetaDefinition.getGroupHeatMetaDefinition().size();
- }
- return count;
- }
-
- private static String groupNameBuilder(Resource resource) {
- String separator = "::";
- String module = "module-";
- String groupName = resource.getSystemName() + separator + module;
- return groupName;
- }
-
- public static void validateCsarVfArtifact(String csarUUID, Resource resource) throws Exception {
-
- List<TypeHeatMetaDefinition> listTypeHeatMetaDefinition = getListTypeHeatMetaDefinition(csarUUID);
- assertTrue(
- "check group count, expected: " + getGroupCount(listTypeHeatMetaDefinition) + ", actual: "
- + resource.getGroups().size(),
- getGroupCount(listTypeHeatMetaDefinition) == resource.getGroups().size());
- assertTrue(
- "check artifact count, expected: " + getArtifactCount(listTypeHeatMetaDefinition, false) + ", actual: "
- + resource.getDeploymentArtifacts().size(),
- getArtifactCount(listTypeHeatMetaDefinition, false) == resource.getDeploymentArtifacts().size());
-
- }
-
- public static void validateToscaDefinitonObjectVsResource(ToscaDefinition toscaDefinition, Resource resource)
- throws Exception {
-
- assertTrue(
- "check resource instance count, expected: " + getResourceInstanceCount(toscaDefinition) + ", actual: "
- + resource.getComponentInstances().size(),
- getResourceInstanceCount(toscaDefinition) == resource.getComponentInstances().size());
- assertTrue(
- "check resource instance relation count, expected: " + getResourceInstanceRelationCount(toscaDefinition)
- + ", actual: " + resource.getComponentInstancesRelations().size(),
- getResourceInstanceRelationCount(toscaDefinition) == resource.getComponentInstancesRelations().size());
-
- }
-
- public static Integer getResourceInstanceCount(ToscaDefinition toscaDefinition) {
-
- return toscaDefinition.getTopology_template().getNode_templates().size();
- }
-
- public static Integer getResourceInstanceRelationCount(ToscaDefinition toscaDefinition) {
- int count = 0;
-// List<ToscaNodeTemplatesTopologyTemplateDefinition> toscaNodeTemplatesTopologyTemplateDefinition = toscaDefinition
-// .getTopology_template().getToscaNodeTemplatesTopologyTemplateDefinition();
- Map<String,ToscaNodeTemplatesTopologyTemplateDefinition> toscaNodeTemplatesTopologyTemplateDefinition = toscaDefinition.getTopology_template().getNode_templates();
- for (int i = 0; i < toscaNodeTemplatesTopologyTemplateDefinition.size(); i++) {
-// List<ToscaRequirementsNodeTemplatesDefinition> requirements = toscaNodeTemplatesTopologyTemplateDefinition.get(i).getRequirements();
-
- for(Entry entry: toscaDefinition.getTopology_template().getNode_templates().entrySet() ){
- if (entry.getValue().equals("requirements")){
-
- }
- }
-
- if (requirements != null) {
- for (ToscaRequirementsNodeTemplatesDefinition requirement : requirements) {
- if (requirement.getNode() != null) {
- count = count + 1;
- }
- }
- }
- }
- return count;
- }
-
- // not finished yet
- private static void validateCsarVfgroup(String csarUUID, Resource resource) {
-
- List<GroupDefinition> groups = resource.getGroups();
- for (GroupDefinition groupDefinition : groups) {
- List<String> artifacts = groupDefinition.getArtifacts();
- assertTrue("group description is null", groupDefinition.getDescription() != null);
- assertTrue("InvariantUUID is null", groupDefinition.getInvariantUUID() != null);
- // groupDefinition.getMembers();
- assertTrue(
- "name format mismatch, expected: " + groupNameBuilder(resource) + "[0-9], actual: "
- + groupDefinition.getName(),
- groupDefinition.getName().contains(groupNameBuilder(resource)));
- // groupDefinition.getProperties();
- // groupDefinition.getPropertyValueCounter();
- assertTrue(groupDefinition.getType().equals(getGroupType()));
- }
-
- String expectedCsarUUID = csarUUID;
- // String expectedToscaResourceName = "org.openecomp.resource.vf." +
- // WordUtils.capitalize(resourceDetails.getName().toLowerCase());
- //
- // assertTrue("csarUUID : " + buildAssertMessage(expectedCsarUUID,
- // resource.getCsarUUID()),
- // expectedCsarUUID.equals(resource.getCsarUUID()));
- // assertTrue("toscaResourceName : " +
- // buildAssertMessage(expectedToscaResourceName,
- // resource.getToscaResourceName()),
- // expectedToscaResourceName.equals(resource.getToscaResourceName()));
- //
- // RestResponse getResourceResponse =
- // ResourceRestUtils.getResource(resource.getUniqueId());
- // Resource getResource =
- // ResponseParser.parseToObjectUsingMapper(getResourceResponse.getResponse(),
- // Resource.class);
- // assertTrue("csarUUID : " + buildAssertMessage(expectedCsarUUID,
- // getResource.getCsarUUID()),
- // expectedCsarUUID.equals(getResource.getCsarUUID()));
- // assertTrue("toscaResourceName : " +
- // buildAssertMessage(expectedToscaResourceName,
- // getResource.getToscaResourceName()),
- // expectedToscaResourceName.equals(getResource.getToscaResourceName()));
-
- }
-
- private static String getGroupType() {
- return "org.openecomp.groups.VfModule";
- }
-*/
-
-
-
-
-}
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/DistributionValidationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/DistributionValidationUtils.java
deleted file mode 100644
index b6b809a4a3..0000000000
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/DistributionValidationUtils.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.ci.tests.utils.validation;
-
-import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.ci.tests.utils.DistributionUtils;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import static org.testng.AssertJUnit.assertNotNull;
-
-public class DistributionValidationUtils {
-
- public static Map<String, String> verifyDistributedArtifactDownloadUsingDB(String distributionID, Map<String, String> expectedArtifactsMapOfDistributedService, List<String> distributionStatusEnumList) throws Exception {
-
- String action = "DStatus";
- int timer = 0;
- int timeWaitPerArtifcat = 3;
- if(expectedArtifactsMapOfDistributedService.size() != 0){
- timer = (expectedArtifactsMapOfDistributedService.size()/10*15 + expectedArtifactsMapOfDistributedService.size() * timeWaitPerArtifcat * distributionStatusEnumList.size() + 30) * 1000 ;
- }
- for (String distributionStatusList : distributionStatusEnumList){
- for (Entry<String, String> url : expectedArtifactsMapOfDistributedService.entrySet()){
- Map <AuditingFieldsKey, String> body = new HashMap<>();
- body.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID, distributionID);
- body.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_RESOURCE_URL, url.getValue());
- body.put(AuditingFieldsKey.AUDIT_STATUS, distributionStatusList);
- Map<String, String> actualAuditRecord = new HashMap<String, String>();
- actualAuditRecord = AuditValidationUtils.retrieveAuditMessagesByPattern(action, body, true);
- while (timer != 0) {
- if(actualAuditRecord.size() == 0 ){
- Thread.sleep(1000);
- actualAuditRecord = AuditValidationUtils.retrieveAuditMessagesByPattern(action, body, true);
- timer-=1000;
- if(timer == 0 && actualAuditRecord.size() == 0){
- assertNotNull("audit record did not found in DB for artifact url: " + url.getValue(), null);
- }
- }else{
- timer = timer - timeWaitPerArtifcat * 1000;
- break;
- }
-
- }
- }
- }
- return null;
- }
-
- public static void validateDistributedArtifactsByAudit(Service service, List<String> distributionStatusList) throws Exception, IOException, ParseException {
- String distributionID;
- AtomicOperationUtils.distributeService(service, true);
- distributionID = DistributionUtils.getLatestServiceDistributionObject(service).getDistributionID();
- if(distributionID != null){
- Map<String, String> expectedArtifactsMapOfDistributedService = DistributionUtils.getArtifactsMapOfDistributedService(service);
- DistributionValidationUtils.verifyDistributedArtifactDownloadUsingDB(distributionID, expectedArtifactsMapOfDistributedService, distributionStatusList);
- }
- else{
- assertNotNull("distributionID is null", distributionID);
- }
- }
-}
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ErrorValidationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ErrorValidationUtils.java
deleted file mode 100644
index 4c5533945b..0000000000
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ErrorValidationUtils.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.ci.tests.utils.validation;
-
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONObject;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ExceptionEnumType;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.yaml.snakeyaml.Yaml;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-
-import static org.testng.AssertJUnit.assertEquals;
-
-public class ErrorValidationUtils {
- static Logger logger = LoggerFactory.getLogger(ErrorValidationUtils.class.getName());
-
- public static void checkBodyResponseOnError(String errorType, List<String> variables, String actualResponse)
- throws FileNotFoundException, JSONException {
-
- ErrorInfo errorInfo = parseErrorConfigYaml(errorType);
- JSONObject expectedResponseBody = null;
- if (errorInfo.getMessageId() != null) {
- if (errorInfo.getMessageId().contains("SVC")) {
- expectedResponseBody = restExceptionFormatBuilder(errorInfo.getMessageId(), errorInfo.getMessage(),
- variables, ExceptionEnumType.SERVICE_EXCEPTION.getValue());
- } else {
- expectedResponseBody = restExceptionFormatBuilder(errorInfo.getMessageId(), errorInfo.getMessage(),
- variables, ExceptionEnumType.POLICY_EXCPTION.getValue());
- }
- }
- actualResponse = actualResponse.replaceAll("\\n", "");
- logger.debug("actualResponse - {}", actualResponse);
- logger.debug("expectedResponseBody - {}", expectedResponseBody);
- assertEquals(expectedResponseBody, new JSONObject(actualResponse));
- }
-
- public static String checkUIResponseOnError(String errorType)
- throws FileNotFoundException, JSONException {
-
- ErrorInfo errorInfo = parseErrorConfigYaml(errorType);
- String messageId = errorInfo.getMessageId();
-
- return messageId;
- }
-
- public static JSONObject restExceptionFormatBuilder(String messageId, String text, List<String> variables,
- String type) {
-
- JSONObject simpleElements = new JSONObject();
- JSONObject exceptionType = new JSONObject();
- JSONObject requestError = new JSONObject();
-
- try {
- simpleElements.put("messageId", messageId);
- simpleElements.put("text", text);
- simpleElements.put("variables", variables);
- exceptionType.put(type, simpleElements);
- requestError.put("requestError", exceptionType);
-
- } catch (JSONException e) {
- e.printStackTrace();
- }
-
- return requestError;
-
- }
-
- public static ErrorInfo parseErrorConfigYaml(String error) throws FileNotFoundException {
- Yaml yaml = new Yaml();
- ErrorInfo errInfo = null;
- Config config = Utils.getConfig();
- String errorConfigurationFile = config.getErrorConfigurationFile();
- File file = new File(errorConfigurationFile);
- // File file = new
- // File("../catalog-be/src/main/resources/config/error-configuration.yaml");
- InputStream inputStream = new FileInputStream(file);
- Map<?, ?> map = (Map<?, ?>) yaml.load(inputStream);
- // System.out.println(map.get("errors"));
- @SuppressWarnings("unchecked")
- Map<String, ErrorInfo> errorMap = (Map<String, ErrorInfo>) map.get("errors");
- @SuppressWarnings("unchecked")
- Map<String, Object> errorInfo = (Map<String, Object>) errorMap.get(error);
-
- String message = (String) errorInfo.get("message");
- String messageId = (String) errorInfo.get("messageId");
- int code = (Integer) errorInfo.get("code");
- errInfo = new ErrorInfo(code, message, messageId);
-
- return errInfo;
- }
-
-}
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ProductValidationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ProductValidationUtils.java
deleted file mode 100644
index f2ef0826f2..0000000000
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ProductValidationUtils.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.ci.tests.utils.validation;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
-import org.openecomp.sdc.be.model.Product;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.be.model.category.GroupingDefinition;
-import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest.ComponentOperationEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.testng.AssertJUnit.*;
-
-public class ProductValidationUtils {
-
- static Logger logger = LogManager.getLogger(ProductValidationUtils.class);
-
- public static void compareExpectedAndActualProducts(Product expectedProduct, Product actualProduct) {
- compareExpectedAndActualProducts(expectedProduct, actualProduct, null);
- }
-
- public static void compareExpectedAndActualProducts(Product expectedProduct, Product actualProduct,
- ComponentOperationEnum operation) {
-
- assertEquals(expectedProduct.getName(), actualProduct.getName());
- assertEquals(expectedProduct.getFullName(), actualProduct.getFullName());
- assertEquals(expectedProduct.getDescription(), actualProduct.getDescription());
-
- List<String> expectedContacts = expectedProduct.getContacts();
- List<String> actualContacts = actualProduct.getContacts();
- assertTrue(
- "Expected contacts:" + Arrays.toString(expectedContacts.toArray()) + ", actual contacts:"
- + Arrays.toString(actualContacts.toArray()),
- expectedContacts.size() == actualContacts.size() && expectedContacts.containsAll(actualContacts)
- && actualContacts.containsAll(expectedContacts));
-
- List<String> expectedTags = expectedProduct.getTags();
- List<String> actualTags = actualProduct.getTags();
- assertTrue(
- "Expected tags:" + Arrays.toString(expectedTags.toArray()) + ", actual tags:"
- + Arrays.toString(actualTags.toArray()),
- expectedTags.size() == actualTags.size() && expectedTags.containsAll(actualTags)
- && actualTags.containsAll(expectedTags));
-
- assertEquals(expectedProduct.getLifecycleState(), actualProduct.getLifecycleState());
- assertEquals(expectedProduct.getVersion(), actualProduct.getVersion());
- assertEquals(expectedProduct.isHighestVersion(), actualProduct.isHighestVersion());
- assertEquals(expectedProduct.getNormalizedName(), actualProduct.getNormalizedName());
-
- compareCategories(expectedProduct, actualProduct);
- assertEquals(expectedProduct.getLastUpdaterUserId(), actualProduct.getLastUpdaterUserId());
- if (operation != null) {
- assertEquals(expectedProduct.getCreatorUserId(), actualProduct.getCreatorUserId());
- }
-
- Long lastUpdateDate = actualProduct.getLastUpdateDate();
- Long creationDate = actualProduct.getCreationDate();
- Map<String, String> allVersions = actualProduct.getAllVersions();
-
- if (operation != null) {
- if (operation == ComponentOperationEnum.UPDATE_COMPONENT
- || operation == ComponentOperationEnum.CHANGE_STATE_CHECKOUT
- || operation == ComponentOperationEnum.CHANGE_STATE_CHECKIN
- || operation == ComponentOperationEnum.CHANGE_STATE_UNDO_CHECKOUT) {
- assertTrue("Last update date:" + lastUpdateDate + ", creation date: " + creationDate,
- lastUpdateDate > 0 && creationDate > 0 && lastUpdateDate > creationDate);
- } else {
- assertTrue("Last update date:" + lastUpdateDate + ", creation date: " + creationDate,
- lastUpdateDate > 0 && lastUpdateDate.equals(creationDate));
- }
- }
-
- // Check UUIDs
- // If just created, no way to test the UUIDs themselves
- // If updated, we expect the UUIDs of actual to match the expected
- String uniqueId = actualProduct.getUniqueId();
- if (operation == ComponentOperationEnum.CREATE_COMPONENT) {
- UUID.fromString(uniqueId);
- UUID.fromString(actualProduct.getUUID());
- UUID.fromString(actualProduct.getInvariantUUID());
- assertTrue(allVersions.size() == 1);
- assertTrue(allVersions.get("0.1").equals(uniqueId));
- } else {
- if (operation == ComponentOperationEnum.CHANGE_STATE_CHECKOUT) {
- assertFalse(expectedProduct.getUniqueId().equals(uniqueId));
- // Assigning the updated uniqueId to expected so that it can be
- // passed to further logic
- expectedProduct.setUniqueId(uniqueId);
- } else if (operation != null) {
- assertTrue(expectedProduct.getUniqueId().equals(uniqueId));
- }
- assertEquals(expectedProduct.getUUID(), actualProduct.getUUID());
- assertEquals(expectedProduct.getInvariantUUID(), actualProduct.getInvariantUUID());
- }
- }
-
- private static void compareCategories(Product expectedProduct, Product actualProduct) {
- List<CategoryDefinition> expectedCategories = expectedProduct.getCategories();
- List<CategoryDefinition> actualCategories = actualProduct.getCategories();
- if (expectedCategories != null && actualCategories != null) {
- int expSize = expectedCategories.size();
- int actSize = actualCategories.size();
-
- assertTrue("Expected size:" + expSize + ", actual size:" + actSize, expSize == actSize);
-
- for (CategoryDefinition actualDefinition : actualCategories) {
- int lastIndexOfCat = expectedCategories.lastIndexOf(actualDefinition);
- assertTrue("Actual category " + actualDefinition + " not found in expected.", lastIndexOfCat != -1);
- CategoryDefinition expectedDefinition = expectedCategories.get(lastIndexOfCat);
- List<SubCategoryDefinition> actualSubcategories = actualDefinition.getSubcategories();
- List<SubCategoryDefinition> expectedSubcategories = expectedDefinition.getSubcategories();
- for (SubCategoryDefinition actualSub : actualSubcategories) {
- lastIndexOfCat = expectedSubcategories.lastIndexOf(actualSub);
- assertTrue("Actual subcategory " + actualSub + " not found in expected.", lastIndexOfCat != -1);
- SubCategoryDefinition expectedSub = expectedSubcategories.get(lastIndexOfCat);
- List<GroupingDefinition> actualGroupings = actualSub.getGroupings();
- List<GroupingDefinition> expectedGroupings = expectedSub.getGroupings();
- for (GroupingDefinition actualGrouping : actualGroupings) {
- lastIndexOfCat = expectedGroupings.lastIndexOf(actualGrouping);
- assertTrue("Actual grouping " + actualSub + " not found in expected.", lastIndexOfCat != -1);
- }
- }
- }
-
- for (CategoryDefinition expectedDefinition : expectedCategories) {
- int lastIndexOfCat = actualCategories.lastIndexOf(expectedDefinition);
- assertTrue("Expected category " + expectedDefinition + " not found in actual.", lastIndexOfCat != -1);
- CategoryDefinition actualDefinition = actualCategories.get(lastIndexOfCat);
- List<SubCategoryDefinition> actualSubcategories = actualDefinition.getSubcategories();
- List<SubCategoryDefinition> expectedSubcategories = expectedDefinition.getSubcategories();
- for (SubCategoryDefinition expectedSub : expectedSubcategories) {
- lastIndexOfCat = actualSubcategories.lastIndexOf(expectedSub);
- assertTrue("Expected subcategory " + expectedSub + " not found in actual.", lastIndexOfCat != -1);
- SubCategoryDefinition actualSub = actualSubcategories.get(lastIndexOfCat);
- List<GroupingDefinition> actualGroupings = actualSub.getGroupings();
- List<GroupingDefinition> expectedGroupings = expectedSub.getGroupings();
- for (GroupingDefinition expectedGrouping : expectedGroupings) {
- lastIndexOfCat = actualGroupings.lastIndexOf(expectedGrouping);
- assertTrue("Expected grouping " + expectedGrouping + " not found in actual.",
- lastIndexOfCat != -1);
- }
- }
- }
- }
- }
-
- public static void verifyProductsNotExistInUserFollowedPage(User user, Product... nonExpectedProducts)
- throws Exception {
- String component = "products";
- Boolean isExist;
- Product nonExpectedProduct;
- RestResponse getFollowedPage = ProductRestUtils.getFollowed(user.getUserId());
- JSONArray followedProductes = getListArrayFromRestResponse(getFollowedPage, component);
- if (followedProductes != null) { // if any product exist in followed
- // page
- for (int i = 0; i < nonExpectedProducts.length; i++) {
- nonExpectedProduct = nonExpectedProducts[i];
- isExist = false;
- for (int k = 0; k < followedProductes.size(); k++) {
- JSONObject jobject = (JSONObject) followedProductes.get(k);
- if (jobject.get("uuid").toString().equals(nonExpectedProduct.getUUID())) {
- isExist = true;
- k = followedProductes.size();
- }
- }
- assertFalse(isExist);
- }
- }
-
- }
-
- public static void checkUserFollowedPage(User user, Product... expectedProducts) throws Exception {
- String component = "products";
- Boolean isExist;
- Product expectedProduct;
- RestResponse getFollowedPage = ProductRestUtils.getFollowed(user.getUserId());
- JSONArray followedProductes = getListArrayFromRestResponse(getFollowedPage, component);
- assertTrue("check if any followedProductes received ", followedProductes != null);
- assertTrue("check if any expectedProducts and followedProductes are the same size",
- expectedProducts.length == followedProductes.size());
- for (int i = 0; i < expectedProducts.length; i++) {
- expectedProduct = expectedProducts[i];
- isExist = false;
- for (int k = 0; k < followedProductes.size(); k++) {
- JSONObject jobject = (JSONObject) followedProductes.get(k);
- // if(jobject.get("uuid").toString().equals(expectedProduct.getUUID()))
- if (jobject.get("uniqueId").toString().equals(expectedProduct.getUniqueId())) {
-
- String productString = jobject.toJSONString();
- Product actualProduct = ResponseParser.parseToObjectUsingMapper(productString, Product.class);
- ProductValidationUtils.compareExpectedAndActualProducts(expectedProduct, actualProduct, null);
- isExist = true;
- k = followedProductes.size();
- }
- }
- assertTrue(isExist);
- }
- }
-
- private static JSONArray getListArrayFromRestResponse(RestResponse restResponse, String lst) {
- String json = restResponse.getResponse();
- JSONObject jsonResp = (JSONObject) JSONValue.parse(json);
- JSONArray resources = (JSONArray) jsonResp.get(lst);
- return resources;
- }
-
-}
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ResourceValidationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ResourceValidationUtils.java
deleted file mode 100644
index de6d32beed..0000000000
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ResourceValidationUtils.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.ci.tests.utils.validation;
-
-import com.google.gson.Gson;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.InterfaceDefinition;
-import org.openecomp.sdc.be.model.Operation;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceRespJavaObject;
-import org.openecomp.sdc.ci.tests.datatypes.enums.RespJsonKeysEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-
-import java.util.*;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
-
-public class ResourceValidationUtils {
-
- public static void validateResourceReqVsResp(ResourceReqDetails resourceDetails,
- ResourceRespJavaObject resourceRespJavaObject) {
-
- String expected;
-
- expected = resourceDetails.getDescription();
- assertEquals("resource description - ", expected, resourceRespJavaObject.getDescription());
-
- expected = resourceDetails.getVendorName();
- assertEquals("resource vendorName - ", expected, resourceRespJavaObject.getVendorName());
-
- expected = resourceDetails.getVendorRelease();
- assertEquals("resource vendorReleaseName - ", expected, resourceRespJavaObject.getVendorRelease());
-
- expected = resourceDetails.getContactId();
- assertEquals("resource contactId - ", expected, resourceRespJavaObject.getContactId());
-
- }
-
- public static void validateResourceReqVsResp(ResourceReqDetails resourceDetails, Resource resourceRespJavaObject) {
-
- String expected;
-
- expected = resourceDetails.getDescription();
- assertEquals("resource description - ", expected, resourceRespJavaObject.getDescription());
-
- expected = resourceDetails.getVendorName();
- assertEquals("resource vendorName - ", expected, resourceRespJavaObject.getVendorName());
-
- expected = resourceDetails.getVendorRelease();
- assertEquals("resource vendorReleaseName - ", expected, resourceRespJavaObject.getVendorRelease());
-
- expected = resourceDetails.getContactId();
- assertEquals("resource contactId - ", expected, resourceRespJavaObject.getContactId());
-
- // Validating deduplication of tags
- List<String> expectedTags = resourceDetails.getTags();
- if (expectedTags != null) {
- Set<String> hs = new LinkedHashSet<>(expectedTags);
- expectedTags.clear();
- expectedTags.addAll(hs);
- List<String> receivedTags = resourceRespJavaObject.getTags();
- assertEquals("resource tags - ", expectedTags, receivedTags);
- }
-
- }
-
- public static void validateModelObjects(Resource expected, Resource actual) throws Exception {
-
- compareElements(expected.getUniqueId(), actual.getUniqueId());
- compareElements(expected.getName(), actual.getName());
- compareElements(expected.getVersion(), actual.getVersion());
- compareElements(expected.getCreatorUserId(), actual.getCreatorUserId());
- compareElements(expected.getCreatorFullName(), actual.getCreatorFullName());
- compareElements(expected.getLastUpdaterUserId(), actual.getLastUpdaterUserId());
- compareElements(expected.getLastUpdaterFullName(), actual.getLastUpdaterFullName());
- compareElements(expected.getCreatorFullName(), actual.getCreatorFullName());
- compareElements(expected.getCreationDate(), actual.getCreationDate());
- compareElements(expected.getLastUpdateDate(), actual.getLastUpdateDate());
- compareElements(expected.getDescription(), actual.getDescription());
- compareElements(expected.getIcon(), actual.getIcon());
- compareElements(expected.getLastUpdateDate(), actual.getLastUpdateDate());
- // TODO compare tags
- compareElements(expected.getCategories(), actual.getCategories());
- compareElements(expected.getLifecycleState(), actual.getLifecycleState());
- compareElements(expected.getVendorName(), actual.getVendorName());
- compareElements(expected.getVendorRelease(), actual.getVendorRelease());
- compareElements(expected.getContactId(), actual.getContactId());
- compareElements(expected.getUUID(), actual.getUUID());
- compareElements(expected.getVersion(), actual.getVersion());
-
- }
-
- public static void validateResp(RestResponse restResponse, ResourceRespJavaObject resourceRespJavaObject)
- throws Exception {
-
- Gson gson = new Gson();
- String response = restResponse.getResponse();
-
- validateResp(response, resourceRespJavaObject, gson);
-
- }
-
- public static void validateResp(String response, ResourceRespJavaObject resourceRespJavaObject, Gson gson) {
-
- Map<String, Object> map = new HashMap<String, Object>();
- map = (Map<String, Object>) gson.fromJson(response, map.getClass());
-
- // De-duplicating the tags list for comparison
- List<String> tags = resourceRespJavaObject.getTags();
- if (tags != null) {
- Set<String> hs = new LinkedHashSet<>(tags);
- tags = new ArrayList<String>(hs);
- resourceRespJavaObject.setTags(tags);
- tags = new ArrayList<String>(hs);
- resourceRespJavaObject.setTags(tags);
- }
-
- validateField(map, RespJsonKeysEnum.RESOURCE_NAME.getRespJsonKeyName(), resourceRespJavaObject.getName());
- validateField(map, RespJsonKeysEnum.RESOURCE_DESC.getRespJsonKeyName(),
- resourceRespJavaObject.getDescription());
- // validateField(map, RespJsonKeysEnum.CATEGORIES.getRespJsonKeyName(),
- // resourceRespJavaObject.getCategories());
- validateField(map, RespJsonKeysEnum.VENDOR_NAME.getRespJsonKeyName(), resourceRespJavaObject.getVendorName());
- validateField(map, RespJsonKeysEnum.VENDOR_RELEASE.getRespJsonKeyName(),
- resourceRespJavaObject.getVendorRelease());
- validateField(map, RespJsonKeysEnum.CONTACT_ID.getRespJsonKeyName(), resourceRespJavaObject.getContactId());
- validateField(map, RespJsonKeysEnum.ICON.getRespJsonKeyName(), resourceRespJavaObject.getIcon());
- validateField(map, RespJsonKeysEnum.IS_ABSTRACT.getRespJsonKeyName(),
- Boolean.valueOf(resourceRespJavaObject.getAbstractt()));
- validateField(map, RespJsonKeysEnum.HIGHEST_VERSION.getRespJsonKeyName(),
- Boolean.valueOf(resourceRespJavaObject.getIsHighestVersion()));
- validateField(map, RespJsonKeysEnum.UNIQUE_ID.getRespJsonKeyName(), resourceRespJavaObject.getUniqueId());
- validateField(map, RespJsonKeysEnum.RESOURCE_VERSION.getRespJsonKeyName(), resourceRespJavaObject.getVersion());
- validateField(map, RespJsonKeysEnum.LIFE_CYCLE_STATE.getRespJsonKeyName(),
- resourceRespJavaObject.getLifecycleState());
- validateField(map, RespJsonKeysEnum.TAGS.getRespJsonKeyName(), tags);
- validateField(map, RespJsonKeysEnum.CREATOR_ATT_UID.getRespJsonKeyName(),
- resourceRespJavaObject.getCreatorUserId());
- validateField(map, RespJsonKeysEnum.CREATOR_FULL_NAME.getRespJsonKeyName(),
- resourceRespJavaObject.getCreatorFullName());
- validateField(map, RespJsonKeysEnum.LAST_UPDATER_ATT_UID.getRespJsonKeyName(),
- resourceRespJavaObject.getLastUpdaterUserId());
- validateField(map, RespJsonKeysEnum.LAST_UPDATER_FULL_NAME.getRespJsonKeyName(),
- resourceRespJavaObject.getLastUpdaterFullName());
- validateField(map, RespJsonKeysEnum.COST.getRespJsonKeyName(), resourceRespJavaObject.getCost());
- validateField(map, RespJsonKeysEnum.LICENSE_TYPE.getRespJsonKeyName(), resourceRespJavaObject.getLicenseType());
- validateField(map, RespJsonKeysEnum.RESOURCE_TYPE.getRespJsonKeyName(),
- resourceRespJavaObject.getResourceType().toString());
- if (resourceRespJavaObject.getResourceType().equals("VF")) {
- validateField(map, RespJsonKeysEnum.DERIVED_FROM.getRespJsonKeyName(), null);
- } else {
- validateField(map, RespJsonKeysEnum.DERIVED_FROM.getRespJsonKeyName(),
- resourceRespJavaObject.getDerivedFrom());
- }
-
- validateCategories(resourceRespJavaObject, map);
-
- String uuid = ResponseParser.getValueFromJsonResponse(response, RespJsonKeysEnum.UUID.getRespJsonKeyName());
- assertTrue("UUID is empty", uuid != null && !uuid.isEmpty());
- }
-
- private static void validateCategories(ResourceRespJavaObject resourceRespJavaObject, Map<String, Object> map) {
- assertTrue(RespJsonKeysEnum.CATEGORIES.getRespJsonKeyName() + " is missing",
- map.containsKey(RespJsonKeysEnum.CATEGORIES.getRespJsonKeyName()));
- Object foundValue = map.get(RespJsonKeysEnum.CATEGORIES.getRespJsonKeyName());
- List<Map<String, Object>> foundList = (List<Map<String, Object>>) foundValue;
- List<CategoryDefinition> excpectedList = resourceRespJavaObject.getCategories();
-
- assertTrue(foundList.size() == excpectedList.size());
- for (int i = 0; i < foundList.size(); i++) {
- CategoryDefinition expCat = excpectedList.get(i);
- Map<String, Object> foun = foundList.get(i);
- assertTrue("expected " + expCat.getName() + " not equal to actual " + foundValue,
- foun.get("name").equals(expCat.getName()));
- }
- }
-
- public static void validateField(Map<String, Object> map, String jsonField, Object expectedValue) {
- if (expectedValue == null) {
- assertTrue(jsonField + " is expected to be null", !map.containsKey(jsonField));
- } else {
- assertTrue(jsonField + " is missing", map.containsKey(jsonField));
- Object foundValue = map.get(jsonField);
- compareElements(expectedValue, foundValue);
- }
- }
-
- public static void compareElements(Object expectedValue, Object foundValue) {
- if (expectedValue instanceof String) {
- assertTrue(foundValue instanceof String);
- assertTrue("expected " + expectedValue + " not equal to actual " + foundValue,
- foundValue.equals(expectedValue));
- }
- /*
- * else if( expectedValue instanceof Number){ assertTrue(foundValue
- * instanceof Number); assertTrue(foundValue == expectedValue); }
- */
- else if (expectedValue instanceof Boolean) {
- assertTrue(foundValue instanceof Boolean);
- assertTrue(foundValue == expectedValue);
- } else if (expectedValue instanceof Map) {
- assertTrue(foundValue instanceof Map);
- Map<String, Object> foundMap = (Map<String, Object>) foundValue;
- Map<String, Object> excpectedMap = (Map<String, Object>) expectedValue;
- assertTrue(foundMap.size() == excpectedMap.size());
- Iterator<String> foundkeyItr = foundMap.keySet().iterator();
- while (foundkeyItr.hasNext()) {
- String foundKey = foundkeyItr.next();
- assertTrue(excpectedMap.containsKey(foundKey));
- compareElements(excpectedMap.get(foundKey), foundMap.get(foundKey));
- }
-
- } else if (expectedValue instanceof List) {
- assertTrue(foundValue instanceof List);
- List<Object> foundList = (List<Object>) foundValue;
- List<Object> excpectedList = (List<Object>) expectedValue;
- assertTrue(foundList.size() == excpectedList.size());
- for (int i = 0; i < foundList.size(); i++) {
- compareElements(excpectedList.get(i), foundList.get(i));
- }
-
- } else {
- assertTrue(foundValue.equals(expectedValue));
- }
- }
-
- public static boolean validateUuidAfterChangingStatus(String oldUuid, String newUuid) {
- return oldUuid.equals(newUuid);
-
- }
-
- public static void validateRespArt(RestResponse restResponse, ResourceRespJavaObject resourceRespJavaObject,
- String interfaze) throws Exception {
-
- Gson gson = new Gson();
- String response = restResponse.getResponse();
-
- Map<String, Object> map = new HashMap<String, Object>();
- map = (Map<String, Object>) gson.fromJson(response, map.getClass());
-
- Resource resource = gson.fromJson(response, Resource.class);
-
- Map<String, ArtifactDefinition> artifacts = resource.getArtifacts();
- Map<String, InterfaceDefinition> interfaces = null;
-
- if (interfaze != null) {
- interfaces = resource.getInterfaces();
- Map<String, Operation> operation = interfaces.get(interfaze).getOperationsMap();
- // operation.get("configure").getUniqueId();
- }
-
- validateField(map, RespJsonKeysEnum.RESOURCE_NAME.getRespJsonKeyName(), resourceRespJavaObject.getName());
- validateField(map, RespJsonKeysEnum.RESOURCE_DESC.getRespJsonKeyName(),
- resourceRespJavaObject.getDescription());
- // validateField(map, RespJsonKeysEnum.CATEGORIES.getRespJsonKeyName(),
- // resourceRespJavaObject.getCategories());
- validateField(map, RespJsonKeysEnum.DERIVED_FROM.getRespJsonKeyName(), resourceRespJavaObject.getDerivedFrom());
- validateField(map, RespJsonKeysEnum.VENDOR_NAME.getRespJsonKeyName(), resourceRespJavaObject.getVendorName());
- validateField(map, RespJsonKeysEnum.VENDOR_RELEASE.getRespJsonKeyName(),
- resourceRespJavaObject.getVendorRelease());
- validateField(map, RespJsonKeysEnum.CONTACT_ID.getRespJsonKeyName(), resourceRespJavaObject.getContactId());
- validateField(map, RespJsonKeysEnum.ICON.getRespJsonKeyName(), resourceRespJavaObject.getIcon());
- validateField(map, RespJsonKeysEnum.IS_ABSTRACT.getRespJsonKeyName(),
- Boolean.valueOf(resourceRespJavaObject.getAbstractt()));
- validateField(map, RespJsonKeysEnum.HIGHEST_VERSION.getRespJsonKeyName(),
- Boolean.valueOf(resourceRespJavaObject.getIsHighestVersion()));
- validateField(map, RespJsonKeysEnum.UNIQUE_ID.getRespJsonKeyName(), resourceRespJavaObject.getUniqueId());
- validateField(map, RespJsonKeysEnum.RESOURCE_VERSION.getRespJsonKeyName(), resourceRespJavaObject.getVersion());
- validateField(map, RespJsonKeysEnum.LIFE_CYCLE_STATE.getRespJsonKeyName(),
- resourceRespJavaObject.getLifecycleState());
- validateField(map, RespJsonKeysEnum.TAGS.getRespJsonKeyName(), resourceRespJavaObject.getTags());
- validateField(map, RespJsonKeysEnum.CREATOR_ATT_UID.getRespJsonKeyName(),
- resourceRespJavaObject.getCreatorUserId());
- validateField(map, RespJsonKeysEnum.CREATOR_FULL_NAME.getRespJsonKeyName(),
- resourceRespJavaObject.getCreatorFullName());
- validateField(map, RespJsonKeysEnum.LAST_UPDATER_ATT_UID.getRespJsonKeyName(),
- resourceRespJavaObject.getLastUpdaterUserId());
- validateField(map, RespJsonKeysEnum.LAST_UPDATER_FULL_NAME.getRespJsonKeyName(),
- resourceRespJavaObject.getLastUpdaterFullName());
-
- // validate number of artifacts
- if (resourceRespJavaObject.getArtifacts() != null) {
-
- // assertEquals("check number of artifacts",
- // resourceRespJavaObject.getArtifacts().size(), artifacts.size());
- int iterNum = -1;
- ArrayList<String> myArtifacats = new ArrayList<String>();
- Iterator it = artifacts.entrySet().iterator();
- while (it.hasNext()) {
- iterNum++;
- Map.Entry pair = (Map.Entry) it.next();
- // System.out.println(pair.getKey() + " = " + pair.getValue());
- ArtifactDefinition myArtifact = artifacts.get(pair.getKey());
- myArtifacats.add(myArtifact.getEsId());
- it.remove(); // avoids a ConcurrentModificationException
- }
- // assertTrue("check service contains
- // artifacts",myArtifacats.containsAll(resourceRespJavaObject.getArtifacts()));
- }
-
- // validate number of interfaces:
-
- if (interfaze != null) {
- assertEquals("check number of interfaces", resourceRespJavaObject.getInterfaces().size(),
- interfaces.size());
- }
-
- }
-
- public static boolean validateResourceIsAbstartct(List<Resource> resourceList, Boolean bool) {
- if (resourceList != null && resourceList.size() > 0) {
- for (Resource resource : resourceList) {
- if (resource.isAbstract().equals(bool))
- continue;
- else
- return false;
- }
- } else
- return false;
- return true;
- }
-
- public static void validateResourceVersion(Resource resource, String expectedVersion) {
- if (resource != null && !resource.equals("")) {
- assertTrue("expected resource version is: " + expectedVersion + ", but actual is: " + resource.getVersion(),
- resource.getVersion().equals(expectedVersion));
- }
- }
-}
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ServiceValidationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ServiceValidationUtils.java
deleted file mode 100644
index 6c9b839150..0000000000
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/ServiceValidationUtils.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.ci.tests.utils.validation;
-
-import org.openecomp.sdc.be.model.DistributionStatusEnum;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertFalse;
-
-public class ServiceValidationUtils {
-
- public static void validateServiceResponseMetaData(ServiceReqDetails serviceDetails, Service service, User user,
- LifecycleStateEnum lifecycleState) {
- validateServiceResponseMetaData(serviceDetails, service, user, user, lifecycleState);
- }
-
- public static void validateServiceResponseMetaData(ServiceReqDetails expectedService, Service service,
- User creatorUser, User updaterUser, LifecycleStateEnum lifeCycleState) {
- List<String> expectedTags = expectedService.getTags();
- expectedTags.add(expectedService.getName());
- List<String> receivedTags = service.getTags();
- if (expectedTags != null) {
- Set<String> hs = new LinkedHashSet<>(expectedTags);
- expectedTags.clear();
- expectedTags.addAll(hs);
- }
-
- assertEquals("Check service name on response after create service", expectedService.getName(),
- service.getName());
- // check size of list
- assertEquals("Check only 1 category returned on response after create service", 1,
- expectedService.getCategories().size());
- assertEquals("Check service name on response after create service", expectedService.getName(),
- service.getName());
- assertEquals("Check categories on response after create service",
- expectedService.getCategories().get(0).getName(), service.getCategories().get(0).getName());
- assertEquals("Check tag list on response after create service", expectedTags, receivedTags);
- assertEquals("Check description on response after create service", expectedService.getDescription(),
- service.getDescription());
- // assertEquals("Check vendor name on response after create service",
- // expectedService.getVendorName(), service.getVendorName());
- // assertEquals("Check vendor release on response after create service",
- // expectedService.getVendorRelease(), service.getVendorRelease());
- assertEquals("Check attContant name on response after create service",
- expectedService.getContactId().toLowerCase(), service.getContactId());
- assertEquals("Check icon name on response after create service", expectedService.getIcon(), service.getIcon());
- assertEquals("Check LastUpdaterUserId after create service", updaterUser.getUserId(),
- service.getLastUpdaterUserId());
- assertEquals("Check LastUpdaterName after create service",
- updaterUser.getFirstName() + " " + updaterUser.getLastName(), service.getLastUpdaterFullName());
- assertEquals("Check CreatorUserId after create service", creatorUser.getUserId(), service.getCreatorUserId());
- assertEquals("Check CreatorName after create service",
- creatorUser.getFirstName() + " " + creatorUser.getLastName(), service.getCreatorFullName());
- assertEquals("Check version after create service", expectedService.getVersion(), service.getVersion());
- // assertEquals("Check UniqueId after create service", SERVICE_PREFIX +
- // serviceDetails.getServiceName().toLowerCase()+"." +
- // serviceBaseVersion, service.getUniqueId());
- assertFalse("Check uuid after create service", service.getUUID().isEmpty());
-
- // assertTrue("check creation date after create service",
- // service.getCreationDate() != null);
- // assertTrue("check update date after create service",
- // service.getLastUpdateDate() != null);
-
- if (lifeCycleState != null)
- assertEquals("Check LifecycleState after create service", lifeCycleState, service.getLifecycleState());
- else
- assertEquals("Check LifecycleState after create service", LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT,
- service.getLifecycleState());
- }
-
- public static ExpectedResourceAuditJavaObject constructFieldsForAuditValidation(ServiceReqDetails serviceReqDetails,
- String serviceVersion, User sdncUserDetails) {
-
- ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
-
- expectedResourceAuditJavaObject.setAction("Create");
- expectedResourceAuditJavaObject.setModifierUid(sdncUserDetails.getUserId());
- String userFirstLastName = sdncUserDetails.getFirstName() + " " + sdncUserDetails.getLastName();
- expectedResourceAuditJavaObject.setModifierName(userFirstLastName);
- expectedResourceAuditJavaObject.setStatus("200");
- expectedResourceAuditJavaObject.setDesc("OK");
- expectedResourceAuditJavaObject.setResourceName(serviceReqDetails.getName());
- expectedResourceAuditJavaObject.setResourceType("Service");
- expectedResourceAuditJavaObject.setPrevVersion(String.valueOf(Float.parseFloat(serviceVersion) - 0.1f));
- expectedResourceAuditJavaObject.setCurrVersion(serviceVersion);
- expectedResourceAuditJavaObject.setPrevState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
- expectedResourceAuditJavaObject.setCurrState((LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT).toString());
- expectedResourceAuditJavaObject.setComment(null);
-
- return expectedResourceAuditJavaObject;
-
- }
-
- public static void validateDistrubtionStatusValue(RestResponse response,
- DistributionStatusEnum expectedDistributionValue) throws Exception {
- String actualDistributionValue = ResponseParser.getValueFromJsonResponse(response.getResponse(),
- "distributionStatus");
- assertEquals(expectedDistributionValue.name(), actualDistributionValue);
- }
-
-}
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/UserValidationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/UserValidationUtils.java
deleted file mode 100644
index 58fd4f05d3..0000000000
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/UserValidationUtils.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.ci.tests.utils.validation;
-
-import com.google.gson.*;
-import org.apache.commons.lang.StringUtils;
-import org.openecomp.sdc.be.dao.utils.UserStatusEnum;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.users.AddUserAuditMessageInfo;
-import org.openecomp.sdc.ci.tests.users.UserAuditJavaObject;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-
-import java.util.List;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
-
-public class UserValidationUtils {
- public static void compareExpectedAndActualUsers(User expected, User actual) {
-
- String actualFirstName = actual.getFirstName();
- String expectedFirstName = expected.getFirstName();
- assertEquals("check user first name - ", expectedFirstName, actualFirstName);
-
- String actualLastName = actual.getLastName();
- String expectedLastName = expected.getLastName();
- assertEquals("check user last name - ", expectedLastName, actualLastName);
-
- String actualUserId = actual.getUserId();
- String expectedUserId = expected.getUserId();
- assertEquals("check user userId - ", expectedUserId, actualUserId);
-
- String actualEmail = actual.getEmail();
- String expectedEmail = expected.getEmail();
- assertEquals("check user email - ", expectedEmail, actualEmail);
-
- Long actualLastLoginTime = actual.getLastLoginTime();
- Long expectedLastLoginTime = expected.getLastLoginTime();
- assertEquals("check user last login time - ", expectedLastLoginTime, actualLastLoginTime);
-
- String actualRole = actual.getRole();
- if (expected.getRole() == null) {
- String expectedRole = UserRoleEnum.DESIGNER.name();
- assertEquals("check user role - ", expectedRole, actualRole);
- } else {
- String expectedRole = expected.getRole();
- assertEquals("check user role - ", expectedRole, actualRole);
- }
-
- UserStatusEnum actualStatus = expected.getStatus();
- UserStatusEnum expectedStatus = expected.getStatus();
- assertEquals("check user status - ", expectedStatus, actualStatus);
- }
-
- public static void validateDeleteUserAuditMessage(User sdncUserDetails, User sdncModifierDetails,
- String responseCode, String responseMessage, AddUserAuditMessageInfo addUserAuditMessageInfo) {
- String action = "DeleteUser";
- validateUserAuditMessage(sdncUserDetails, sdncModifierDetails, responseCode, responseMessage,
- addUserAuditMessageInfo, action);
-
- }
-
- private static void validateUserAuditMessage(User sdncUserDetails, User sdncModifierDetails, String responseCode,
- String responseMessage, AddUserAuditMessageInfo addUserAuditMessageInfo, String expectedAction) {
-
- assertEquals("check audit action - ", expectedAction, addUserAuditMessageInfo.getACTION());
-
- // String expectedModifierFirstLastName =
- // sdncModifierDetails.getFirstName() + " " +
- // sdncModifierDetails.getLastName();
- // assertEquals("check audit modifier name - ",
- // expectedModifierFirstLastName,
- // addUserAuditMessageInfo.getMODIFIER_NAME());
- String fullName = sdncModifierDetails.getFullName();
- if (sdncModifierDetails.getFullName().equals(" ")) {
- fullName = "";
- }
- String expectedModifierId = fullName + "(" + sdncModifierDetails.getUserId() + ")";
- assertEquals("check audit modifier uid - ", expectedModifierId, addUserAuditMessageInfo.getMODIFIER());
-
- String expectedUserFirstLastName = sdncUserDetails.getFirstName() + " " + sdncUserDetails.getLastName();
- if (expectedUserFirstLastName.equals("null null")) {
- expectedUserFirstLastName = "";
- }
-
- String email = (sdncUserDetails.getEmail() == null) ? "" : sdncUserDetails.getEmail();
- String role = (sdncUserDetails.getRole() == null) ? "DESIGNER" : sdncUserDetails.getRole();
-
- String formatedUser = String.format("%s,%s,%s,%s", sdncUserDetails.getUserId(), expectedUserFirstLastName,
- email, role);
-
- //
- // String expectedUserFirstLastName = sdncUserDetails.getFirstName() + "
- // " + sdncUserDetails.getLastName();
- // if (expectedUserFirstLastName.equals("null null")) {
- // expectedUserFirstLastName = "";
- // }
- //
- // String expectedUserFirstLastName = "";
- // expectedUserFirstLastName += sdncUserDetails.getFirstName() == null ?
- // "" : sdncUserDetails.getFirstName();
- // String lastName = sdncUserDetails.getLastName() == null ? "" :
- // sdncUserDetails.getLastName();
- // if (expectedUserFirstLastName.isEmpty()) {
- // expectedUserFirstLastName = lastName;
- // } else {
- // expectedUserFirstLastName += " " + lastName;
- // }
-
- assertEquals("check audit user name - ", formatedUser, addUserAuditMessageInfo.getUSER());
-
- // String expectedUserUid = sdncUserDetails.getUserId();
- // assertEquals("check audit user uid - ", expectedUserUid,
- // addUserAuditMessageInfo.getUSER_UID());
- //
- // String expectedUserEmail = sdncUserDetails.getEmail() == null ? "" :
- // sdncUserDetails.getEmail();
- // //TODO: esofer check with Andrey. Audit return "" but in user we have
- // null
- // assertEquals("check audit user email - ", expectedUserEmail,
- // addUserAuditMessageInfo.getUSER_EMAIL());
- //
- // String expectedUserRole = sdncUserDetails.getRole();
- // if (expectedUserRole ==null){
- // expectedUserRole = "DESIGNER";
- // assertEquals("check audit user role - ", expectedUserRole,
- // addUserAuditMessageInfo.getUSER_ROLE());
- // }else{
- // assertEquals("check audit user role - ", expectedUserRole,
- // addUserAuditMessageInfo.getUSER_ROLE());
- // }
-
- String expectedUserResponseCode = responseCode;
- assertEquals("check audit user response code - ", expectedUserResponseCode,
- addUserAuditMessageInfo.getSTATUS());
-
- String expectedUserResponseMessage = responseMessage;
- assertEquals("check audit user response message - ", expectedUserResponseMessage,
- addUserAuditMessageInfo.getDESC());
-
- }
-
- public static void validateDataAgainstAuditDB_access(User sdncUserDetails, UserAuditJavaObject auditJavaObject,
- RestResponse restResponse, ErrorInfo errorInfo, List<String> variables) {
-
- validateAuditDataAgainstAuditDbInAccess(sdncUserDetails, auditJavaObject, restResponse, errorInfo, variables);
-
- }
-
- public static void validateAuditDataAgainstAuditDbInAccess(User sdncUserDetails,
- UserAuditJavaObject auditJavaObject, RestResponse restResponse, ErrorInfo errorInfo,
- List<String> variables) {
-
- String expected;
-
- expected = "Access";
- assertEquals("ACTION- ", expected, auditJavaObject.getACTION());
-
- if (sdncUserDetails.getFirstName() != StringUtils.EMPTY && sdncUserDetails.getLastName() != StringUtils.EMPTY) {
- expected = sdncUserDetails.getFirstName() + " " + sdncUserDetails.getLastName();
- } else {
- expected = StringUtils.EMPTY;
- }
- String formatedUser = String.format("%s(%s)", expected, sdncUserDetails.getUserId());
- assertTrue(
- "check audit user: expected start with - " + formatedUser + " ,actual - " + auditJavaObject.getUSER(),
- auditJavaObject.getUSER().startsWith(formatedUser));
-
- expected = restResponse.getErrorCode().toString();
- assertEquals("check audit user status code - ", expected, auditJavaObject.getSTATUS());
-
- if (restResponse.getErrorCode() == 200 || restResponse.getErrorCode() == 201) {
- expected = errorInfo.getMessage();
- } else {
- expected = AuditValidationUtils.buildAuditDescription(errorInfo, variables);
- }
-
- assertEquals("check audit user desc - ", expected, auditJavaObject.getDESC());
-
- // expected = sdncUserDetails.getUserId();
- // assertEquals(expected, auditJavaObject.getUSER());
-
- }
-
- public static void validateUserDetailsOnResponse(User sdncUserDetails, String userDetailsOnResponse) {
-
- String actualFirstName = Utils.getJsonObjectValueByKey(userDetailsOnResponse, "firstName");
- String expectedFirstName = sdncUserDetails.getFirstName();
- assertEquals("check user first name - ", expectedFirstName, actualFirstName);
-
- String actualLastName = Utils.getJsonObjectValueByKey(userDetailsOnResponse, "lastName");
- String expectedLastName = sdncUserDetails.getLastName();
- assertEquals("check user last name - ", expectedLastName, actualLastName);
-
- String actualUserId = Utils.getJsonObjectValueByKey(userDetailsOnResponse, "userId");
- String expectedUserId = sdncUserDetails.getUserId();
- assertEquals("check user userId - ", expectedUserId, actualUserId);
-
- String actualEmail = Utils.getJsonObjectValueByKey(userDetailsOnResponse, "email");
- String expectedEmail = sdncUserDetails.getEmail();
- assertEquals("check user email - ", expectedEmail, actualEmail);
-
- String actualRole = Utils.getJsonObjectValueByKey(userDetailsOnResponse, "role");
- if (sdncUserDetails.getRole() == null) {
- String expectedRole = UserRoleEnum.DESIGNER.name();
- assertEquals("check user role - ", expectedRole, actualRole);
- } else {
- String expectedRole = sdncUserDetails.getRole();
- assertEquals("check user role - ", expectedRole, actualRole);
- }
-
- String actualStatus = Utils.getJsonObjectValueByKey(userDetailsOnResponse, "status");
- String expectedStatus = sdncUserDetails.getStatus().name();
- assertEquals("check user status - ", expectedStatus, actualStatus);
-
- }
-
- public static AddUserAuditMessageInfo getAddUserAuditMessage(String action) throws Exception {
-
- Gson gson = new Gson();
- String index = "auditingevents*";
- String type = "useradminevent";
- String pattern = "/_search?q=ACTION:\"" + action + "\"";
- String auditingMessage = DbUtils.retrieveAuditMessagesByPattern(pattern);
- // String auditingMessage = retrieveAuditMessageByIndexType(index, type,
- // pattern);
- JsonElement jElement = new JsonParser().parse(auditingMessage);
- JsonObject jObject = jElement.getAsJsonObject();
- JsonObject hitsObject = (JsonObject) jObject.get("hits");
- JsonArray hitsArray = (JsonArray) hitsObject.get("hits");
- // for (int i = 0; i < hitsArray.size();){
- if (hitsArray != null) {
- JsonObject jHitObject = (JsonObject) hitsArray.get(0);
- JsonObject jSourceObject = (JsonObject) jHitObject.get("_source");
- AddUserAuditMessageInfo addUserAuditMessageInfo = new AddUserAuditMessageInfo();
- addUserAuditMessageInfo = gson.fromJson(jSourceObject, AddUserAuditMessageInfo.class);
- return addUserAuditMessageInfo;
- }
- return null;
-
- }
-
- public static void validateAddUserAuditMessage(User sdncUserDetails, User sdncModifierDetails, String responseCode,
- String responseMessage, AddUserAuditMessageInfo addUserAuditMessageInfo) {
-
- String action = "AddUser";
- validateUserAuditMessage(sdncUserDetails, sdncModifierDetails, responseCode, responseMessage,
- addUserAuditMessageInfo, action);
-
- }
-
-}