remove unused columns infra active requests

Removed unused columns in db across codebase

Issue-ID: SO-2516
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Ieedb61ed371bc3626ef94df0bf88b7a9cf139c82

4 files changed, 4 insertions, 29 deletions

diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java
index 663be24318..3ac5c28c34 100644
--- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java
+++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java
@@ -53,11 +53,9 @@ public class ArchiveInfraRequestsSchedulerTest extends RequestsAdapterBase {
 
         InfraActiveRequests iar1 = new InfraActiveRequests();
         iar1.setRequestId(requestId1);
-        iar1.setAction("action1");
 
         InfraActiveRequests iar2 = new InfraActiveRequests();
         iar2.setRequestId(requestId2);
-        iar2.setAction("action2");
 
         List<InfraActiveRequests> requests = new ArrayList<>();
         requests.add(iar1);
diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java
index 896138f955..0698023184 100644
--- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java
+++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java
@@ -83,7 +83,6 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA
         assertEquals(infraActiveRequests.getNetworkName(), infraActiveRequestsResponse.getNetworkName());
         assertEquals(infraActiveRequests.getConfigurationId(), infraActiveRequestsResponse.getConfigurationId());
         assertEquals(infraActiveRequests.getConfigurationName(), infraActiveRequestsResponse.getConfigurationName());
-        assertEquals(infraActiveRequests.getAaiServiceId(), infraActiveRequestsResponse.getAaiServiceId());
         assertEquals(infraActiveRequests.getTenantId(), infraActiveRequestsResponse.getTenantId());
         assertEquals(infraActiveRequests.getRequestScope(), infraActiveRequestsResponse.getRequestScope());
         assertEquals(infraActiveRequests.getRequestorId(), infraActiveRequestsResponse.getRequestorId());
@@ -91,7 +90,6 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA
         assertEquals(infraActiveRequests.getOperationalEnvId(), infraActiveRequestsResponse.getOperationalEnvId());
         assertEquals(infraActiveRequests.getOperationalEnvName(), infraActiveRequestsResponse.getOperationalEnvName());
         assertEquals(infraActiveRequests.getRequestStatus(), infraActiveRequestsResponse.getRequestStatus());
-        assertEquals(infraActiveRequests.getAction(), infraActiveRequestsResponse.getAction());
         assertEquals(infraActiveRequests.getRequestUrl(), infraActiveRequestsResponse.getRequestUrl());
     }
 
@@ -120,7 +118,6 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA
         infraActiveRequests.setSource("sourceTest");
         infraActiveRequests.setOperationalEnvName(UUID.randomUUID().toString());
         infraActiveRequests.setRequestStatus("IN_PROGRESS");
-        infraActiveRequests.setAction("create");
         infraActiveRequests
                 .setRequestUrl("http://localhost:8080/onap/so/infra/serviceInstantiation/v7/serviceInstances");
 
diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java
index fa2acbc0ca..92d3114ebe 100644
--- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java
+++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java
@@ -94,7 +94,6 @@ public class MSORequestDBImplTest extends RequestsAdapterBase {
     private InfraActiveRequests buildTestRequest() {
         InfraActiveRequests testRequest = new InfraActiveRequests();
         testRequest.setRequestId("00032ab7-3fb3-42e5-965d-8ea592502017");
-        testRequest.setClientRequestId("00032ab7-3fb3-42e5-965d-8ea592502016");
         testRequest.setRequestStatus("COMPLETE");
         testRequest.setStatusMessage("Vf Module has been deleted successfully.");
         testRequest.setProgress((long) 100);
@@ -103,7 +102,6 @@ public class MSORequestDBImplTest extends RequestsAdapterBase {
         testRequest.setServiceInstanceId("e3b5744d-2ad1-4cdd-8390-c999a38829bc");
         testRequest.setRequestAction("deleteInstance");
         testRequest.setRequestScope("vfModule");
-        testRequest.setAction("deleteInstance");
         testRequest.setAicCloudRegion("mtn6");
         testRequest.setLastModifiedBy("BPMN");
         testRequest.setVfModuleId("c7d527b1-7a91-49fd-b97d-1c8c0f4a7992");
@@ -153,26 +151,10 @@ public class MSORequestDBImplTest extends RequestsAdapterBase {
     }
 
     @Test
-    public void getByClientRequestId() throws MsoRequestsDbException {
-        InfraActiveRequests testRequest = setupTestEntities();
-        // Given
-        String clientRequestId = "00032ab7-3fb3-42e5-965d-8ea592502016";
-
-        // When
-        InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(clientRequestId);
-        if (infraRequest == null)
-            fail("Null infraRequest");
-
-        // Then
-        assertEquals(clientRequestId, infraRequest.getClientRequestId());
-    }
-
-
-    @Test
     public void updateInfraRequest() throws MsoRequestsDbException {
         InfraActiveRequests testRequest = setupTestEntities();
         // Given
-        String clientRequestId = "00032ab7-3fb3-42e5-965d-8ea592502016";
+        String requestId = "00032ab7-3fb3-42e5-965d-8ea592502017";
 
 
         // When
@@ -214,7 +196,7 @@ public class MSORequestDBImplTest extends RequestsAdapterBase {
         dbAdapter.updateInfraRequest(testRequest.getRequestId(), lastModifiedBy, statusMessage, responseBody,
                 requestStatus, progress, vnfOutputs, serviceInstanceId, networkId, vnfId, vfModuleId, volumeGroupId,
                 serviceInstanceName, configurationId, configurationName, vfModuleName);
-        InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(clientRequestId);
+        InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(requestId);
         // Then
         assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime")
                 .ignoring("startTime").ignoring("modifyTime"));
@@ -241,12 +223,12 @@ public class MSORequestDBImplTest extends RequestsAdapterBase {
     public void updateInfraRequestNulls() throws MsoRequestsDbException {
         InfraActiveRequests testRequest = setupTestEntities();
         // Given
-        String clientRequestId = "00032ab7-3fb3-42e5-965d-8ea592502016";
+        String requestId = "00032ab7-3fb3-42e5-965d-8ea592502017";
 
         // When
         dbAdapter.updateInfraRequest(testRequest.getRequestId(), testRequest.getLastModifiedBy(), null, null, null,
                 null, null, null, null, null, null, null, null, null, null, null);
-        InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(clientRequestId);
+        InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(requestId);
         // Then
         assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime")
                 .ignoring("startTime").ignoring("modifyTime"));
diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestsDbClientTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestsDbClientTest.java
index 67887378ef..11b6cf4872 100644
--- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestsDbClientTest.java
+++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestsDbClientTest.java
@@ -83,7 +83,6 @@ public class RequestsDbClientTest extends RequestsAdapterBase {
         infraActiveRequests.setSource("sourceTest");
         infraActiveRequests.setOperationalEnvName(UUID.randomUUID().toString());
         infraActiveRequests.setRequestStatus("IN_PROGRESS");
-        infraActiveRequests.setAction("create");
         infraActiveRequests.setRequestAction("someaction");
         infraActiveRequests.setStartTime(new Timestamp(System.currentTimeMillis()));
         infraActiveRequests
@@ -120,7 +119,6 @@ public class RequestsDbClientTest extends RequestsAdapterBase {
         infraActiveRequests2.setSource("sourceTest");
         infraActiveRequests2.setOperationalEnvName(UUID.randomUUID().toString());
         infraActiveRequests2.setRequestStatus("IN_PROGRESS");
-        infraActiveRequests2.setAction("create");
         infraActiveRequests2.setRequestAction("someaction");
         infraActiveRequests2.setStartTime(new Timestamp(System.currentTimeMillis()));
         infraActiveRequests