* ONAP - SO
* ================================================================================
* Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (c) 2022, Samsung Electronics. 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.
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import org.onap.so.db.request.beans.OperationalEnvDistributionStatus;
import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus;
import org.onap.so.db.request.beans.RequestProcessingData;
+import org.onap.so.serviceinstancebeans.ModelType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.server.LocalServerPort;
infraActiveRequests.setNetworkName("networkInstanceNameTest");
infraActiveRequests.setConfigurationId(UUID.randomUUID().toString());
infraActiveRequests.setConfigurationName("configurationInstanceNameTest");
- infraActiveRequests.setAicCloudRegion("1");
+ infraActiveRequests.setCloudRegion("1");
infraActiveRequests.setTenantId(UUID.randomUUID().toString());
infraActiveRequests.setRequestScope("operationalEnvironment");
infraActiveRequests.setRequestorId(UUID.randomUUID().toString());
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
infraActiveRequests2.setNetworkName("networkInstanceNameTest");
infraActiveRequests2.setConfigurationId(UUID.randomUUID().toString());
infraActiveRequests2.setConfigurationName("configurationInstanceNameTest");
- infraActiveRequests2.setAicCloudRegion("1");
+ infraActiveRequests2.setCloudRegion("1");
infraActiveRequests2.setTenantId(UUID.randomUUID().toString());
infraActiveRequests2.setRequestScope("operationalEnvironment");
infraActiveRequests2.setRequestorId(UUID.randomUUID().toString());
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
verifyInfraActiveRequests(infraActiveRequestsResponse.get(0));
}
+
+ @Test
+ public void getInProgressVolumeGroupsAndVfModulesTest() {
+ InfraActiveRequests request = new InfraActiveRequests();
+ request.setRequestId(UUID.randomUUID().toString());
+ request.setVfModuleId(UUID.randomUUID().toString());
+ request.setRequestStatus("IN_PROGRESS");
+ request.setRequestScope(ModelType.vfModule.toString());
+ Instant startInstant = Instant.now().minus(3, ChronoUnit.MINUTES);
+ request.setStartTime(Timestamp.from(startInstant));
+ request.setRequestAction("create");
+ requestsDbClient.save(request);
+
+ List<InfraActiveRequests> infraActiveRequests = requestsDbClient.getInProgressVolumeGroupsAndVfModules();
+ assertThat(request, sameBeanAs(infraActiveRequests.get(0)).ignoring("modifyTime"));
+ }
+
+ @Test
+ public void getRequestProcessingDataBySoRequestIdAndNameAndTag() {
+ List<RequestProcessingData> requestProcessingData =
+ requestsDbClient.getRequestProcessingDataBySoRequestIdAndNameAndTagOrderByCreateTimeDesc(
+ "00032ab7-na18-42e5-965d-8ea592502018", "requestAction", "pincFabricConfigRequest");
+ assertNotNull(requestProcessingData);
+ assertEquals(1, requestProcessingData.size());
+ assertEquals("assign", requestProcessingData.get(0).getValue());
+ }
}
+