<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
--- /dev/null
+package org.onap.so.adapters.cnf.client;
+
+import org.onap.so.adapters.cnf.MulticloudConfiguration;
+import org.springframework.stereotype.Component;
+
+@Component
+class MulticloudApiUrl {
+
+ private final MulticloudConfiguration multicloudConfiguration;
+
+ MulticloudApiUrl(MulticloudConfiguration multicloudConfiguration1) {
+ this.multicloudConfiguration = multicloudConfiguration1;
+ }
+
+ String apiUrl(String instanceId) {
+ return multicloudConfiguration.getMulticloudUrl() + "/v1/instance/" + instanceId;
+ }
+
+}
\ No newline at end of file
private static final Logger log = LoggerFactory.getLogger(MulticloudClient.class);
private final RestTemplate restTemplate;
- private final MulticloudConfiguration multicloudConfiguration;
+ private final MulticloudApiUrl multicloudApiUrl;
private final ObjectMapper objectMapper;
- public MulticloudClient(RestTemplate restTemplate, MulticloudConfiguration multicloudConfiguration) {
+ public MulticloudClient(RestTemplate restTemplate, MulticloudApiUrl multicloudApiUrl) {
this.restTemplate = restTemplate;
- this.multicloudConfiguration = multicloudConfiguration;
+ this.multicloudApiUrl = multicloudApiUrl;
this.objectMapper = new ObjectMapper();
}
public String upgradeInstance(String instanceId, MulticloudInstanceRequest upgradeRequest) throws BadResponseException {
- MulticloudApiUrl multicloudApiUrl = new MulticloudApiUrl(multicloudConfiguration);
- multicloudApiUrl.setInstanceId(instanceId);
- String endpoint = multicloudApiUrl.apiUrl() + "/upgrade";
+ String endpoint = multicloudApiUrl.apiUrl(instanceId) + "/upgrade";
ResponseEntity<String> result = restTemplate.exchange(endpoint, POST, getHttpEntity(upgradeRequest), String.class);
checkResponseStatusCode(result);
log.info("upgradeInstance response status: {}", result.getStatusCode());
}
public K8sRbInstanceStatus getInstanceStatus(String instanceId) throws BadResponseException {
- MulticloudApiUrl multicloudApiUrl = new MulticloudApiUrl(multicloudConfiguration);
- multicloudApiUrl.setInstanceId(instanceId);
- String endpoint = multicloudApiUrl.apiUrl() + "/status";
+ String endpoint = multicloudApiUrl.apiUrl(instanceId) + "/status";
ResponseEntity<String> result = restTemplate.exchange(endpoint, GET, getHttpEntity(), String.class);
checkResponseStatusCode(result);
log.info("getInstanceStatus response status: {}", result.getStatusCode());
}
public K8sRbInstanceHealthCheckSimple startInstanceHealthCheck(String instanceId) throws BadResponseException {
- MulticloudApiUrl multicloudApiUrl = new MulticloudApiUrl(multicloudConfiguration);
- multicloudApiUrl.setInstanceId(instanceId);
- String endpoint = multicloudApiUrl.apiUrl() + "/healthcheck";
+ String endpoint = multicloudApiUrl.apiUrl(instanceId) + "/healthcheck";
ResponseEntity<String> result = restTemplate.exchange(endpoint, POST, getHttpEntity(), String.class);
checkResponseStatusCode(result);
log.info("startInstanceHealthCheck response status: {}", result.getStatusCode());
}
public K8sRbInstanceHealthCheck getInstanceHealthCheck(String instanceId, String healthCheckInstance) throws BadResponseException {
- MulticloudApiUrl multicloudApiUrl = new MulticloudApiUrl(multicloudConfiguration);
- multicloudApiUrl.setInstanceId(instanceId);
- String endpoint = multicloudApiUrl.apiUrl() + "/healthcheck/" + healthCheckInstance;
+ String endpoint = multicloudApiUrl.apiUrl(instanceId) + "/healthcheck/" + healthCheckInstance;
ResponseEntity<String> result = restTemplate.exchange(endpoint, GET, getHttpEntity(), String.class);
checkResponseStatusCode(result);
log.info("getInstanceHealthCheck response status: {}", result.getStatusCode());
}
public void deleteInstanceHealthCheck(String instanceId, String healthCheckInstance) throws BadResponseException {
- MulticloudApiUrl multicloudApiUrl = new MulticloudApiUrl(multicloudConfiguration);
- multicloudApiUrl.setInstanceId(instanceId);
- String endpoint = multicloudApiUrl.apiUrl() + "/healthcheck/" + healthCheckInstance;
+ String endpoint = multicloudApiUrl.apiUrl(instanceId) + "/healthcheck/" + healthCheckInstance;
ResponseEntity<String> result = restTemplate.exchange(endpoint, DELETE, getHttpEntity(), String.class);
checkResponseStatusCode(result);
log.info("deleteInstanceHealthCheck response status: {}", result.getStatusCode());
throw new BadResponseException("Multicloud response status error", String.valueOf(statusCode.value()));
}
}
-
- private class MulticloudApiUrl {
-
- private String instanceId;
- private final MulticloudConfiguration multicloudConfiguration;
-
- MulticloudApiUrl(MulticloudConfiguration multicloudConfiguration1) {
- this.multicloudConfiguration = multicloudConfiguration1;
- }
-
- String apiUrl() {
- String instanceUri = multicloudConfiguration.getMulticloudUrl() + "/v1/instance/";
- return instanceId.equals("") ? instanceUri : instanceUri + instanceId;
- }
-
- void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
- }
}
package org.onap.so.adapters.cnf.exceptions;
-import static org.onap.so.adapters.cnf.util.CnfAdapterUtil.marshal;
import org.onap.so.adapters.cnf.model.ErrorResponse;
import org.springframework.http.ResponseEntity;
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.cnf.model.instantiation;
+package org.onap.so.adapters.cnf.model.aai;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import org.onap.so.adapters.cnf.model.Tag;
import org.onap.so.adapters.cnf.model.aai.AaiCallbackResponse;
import org.onap.so.adapters.cnf.model.healthcheck.HealthCheckResponse;
-import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
+import org.onap.so.adapters.cnf.model.aai.AaiRequest;
import org.onap.so.adapters.cnf.model.statuscheck.StatusCheckResponse;
import org.onap.so.adapters.cnf.model.upgrade.InstanceUpgradeRequest;
import org.onap.so.adapters.cnf.service.CnfAdapterService;
package org.onap.so.adapters.cnf.service.aai;
import com.google.common.hash.Hashing;
-import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
+import org.onap.so.adapters.cnf.model.aai.AaiRequest;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceGvk;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceResourceStatus;
import org.onap.so.adapters.cnf.model.statuscheck.K8sStatusMetadata;
package org.onap.so.adapters.cnf.service.aai;
import org.apache.http.client.utils.URIBuilder;
-import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
+import org.onap.so.adapters.cnf.model.aai.AaiRequest;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceGvk;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceResourceStatus;
import org.onap.so.adapters.cnf.model.statuscheck.K8sStatus;
import org.onap.so.adapters.cnf.AaiConfiguration;
import org.onap.so.adapters.cnf.client.MulticloudClient;
-import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
+import org.onap.so.adapters.cnf.model.aai.AaiRequest;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceResourceStatus;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceStatus;
import org.onap.so.adapters.cnf.util.IAaiRepository;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
-import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import org.onap.aaiclient.client.aai.AAIResourcesClient;
import org.onap.aaiclient.client.aai.AAITransactionalClient;
import org.onap.aaiclient.client.aai.AAIVersion;
import org.onap.aaiclient.client.generated.fluentbuilders.AAIFluentTypeBuilder.Types;
import org.onap.aaiclient.client.generated.fluentbuilders.K8sResource;
import org.onap.aaiclient.client.graphinventory.exceptions.BulkProcessFailed;
-import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
+import org.onap.so.adapters.cnf.model.aai.AaiRequest;
import org.onap.so.adapters.cnf.service.aai.KubernetesResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.NotFoundException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
public class AaiRepository implements IAaiRepository {
private final static Logger logger = LoggerFactory.getLogger(IAaiRepository.class);
- private final static Gson gson = new GsonBuilder().disableHtmlEscaping().create();
private final AAIResourcesClient aaiClient;
private final ObjectMapper objectMapper;
}
}
if (updateK8sResource) {
- String payload = null;
+ String payload;
try {
payload = objectMapper.writeValueAsString(resource);
} catch (JsonProcessingException e) {
private static final int TRANSACTION_LIMIT = 30;
- public AAITransactionHelper(AAIResourcesClient aaiClient) {
+ AAITransactionHelper(AAIResourcesClient aaiClient) {
this.aaiClient = aaiClient;
- transactions = new ArrayList<AAITransactionalClient>();
+ transactions = new ArrayList<>();
transactionCount = TRANSACTION_LIMIT;
}
return transactions.get(transactions.size() - 1);
}
- public void execute(boolean dryRun) {
+ void execute(boolean dryRun) {
if (transactions.size() > 0) {
transactions.forEach(transaction -> {
try {
private static final Logger LOGGER = LoggerFactory.getLogger(CnfAdapterUtil.class);
- public static final int BAD_REQUEST = 400;
-
- private static final String UNMARSHAL_FAIL_MSG = "Failed to unmarshal json";
+ private static final int BAD_REQUEST = 400;
private static final String MARSHAL_FAIL_MSG = "Failed to marshal object";
private static final ObjectMapper MAPPER = new ObjectMapper();
- public static class StatusDesc {
-
- public static final String ALLOCATE_NSS_SUCCESS = "Allocating nss is " + "successful";
-
- public static final String CREATE_NSS_SUCCESS = "Creating nss is " + "successful";
-
- public static final String DEALLOCATE_NSS_SUCCESS = "Deallocate nss " + "is successful";
-
- public static final String ACTIVATE_NSS_SUCCESS = "Activate nss " + "is successful";
-
- public static final String DEACTIVATE_NSS_SUCCESS = "Deactivate nss " + "is successful";
-
- public static final String QUERY_JOB_STATUS_FAILED = "Query job " + "status failed";
-
- public static final String QUERY_JOB_STATUS_SUCCESS = "Query job " + "status is successful";
-
- private StatusDesc() {
-
- }
- }
-
- private CnfAdapterUtil() {
-
- }
-
- public static void assertObjectNotNull(Object object) throws ApplicationException {
- if (null == object) {
- LOGGER.error("Object is null.");
- throw new ApplicationException(BAD_REQUEST, "An object is null.");
- }
- }
-
- public static <T> T unMarshal(String jsonstr, Class<T> type) throws ApplicationException {
- try {
- return MAPPER.readValue(jsonstr, type);
- } catch (IOException e) {
- LOGGER.error(THREE, RA_NS_EXC.toString(), ErrorCode.BusinessProcessError.getValue(), UNMARSHAL_FAIL_MSG, e);
- throw new ApplicationException(BAD_REQUEST, UNMARSHAL_FAIL_MSG);
- }
- }
+ private CnfAdapterUtil() { }
public static String marshal(Object srcObj) throws ApplicationException {
try {
package org.onap.so.adapters.cnf.util;
-import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
+import org.onap.so.adapters.cnf.model.aai.AaiRequest;
import org.onap.so.adapters.cnf.service.aai.KubernetesResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
--- /dev/null
+package org.onap.so.adapters.cnf;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class AaiConfigurationTest {
+
+ private AaiConfiguration tested = new AaiConfiguration();
+
+ @Test
+ public void shouldReturnDefaultFalse() {
+ boolean actual = tested.isEnabled();
+ assertFalse(actual);
+ }
+}
\ No newline at end of file
--- /dev/null
+package org.onap.so.adapters.cnf.client;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.onap.so.adapters.cnf.MulticloudConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+@RunWith(SpringRunner.class)
+public class MulticloudApiUrlTest {
+
+ private static final String BASE_URL = "http://test-multicloud.com:8080";
+
+ @InjectMocks
+ private MulticloudApiUrl tested;
+
+ @Mock
+ private MulticloudConfiguration multicloudConfiguration;
+
+ @Test
+ public void shouldPresentInstanceIdInPath() {
+ // given
+ String instanceId = "instanceId";
+ // when
+ when(multicloudConfiguration.getMulticloudUrl()).thenReturn(BASE_URL);
+
+ // then
+ String actual = tested.apiUrl(instanceId);
+
+ assertEquals(BASE_URL + "/v1/instance/instanceId", actual);
+ }
+
+}
\ No newline at end of file
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+ * Modifications Copyright (C) 2021 Samsung Technologies Co.
+ * Modifications Copyright (C) 2021 Orange.
+ * ================================================================================
+ * 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.onap.so.adapters.cnf.client;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.so.adapters.cnf.model.MulticloudInstanceRequest;
+import org.onap.so.adapters.cnf.model.healthcheck.K8sRbInstanceHealthCheck;
+import org.onap.so.adapters.cnf.model.healthcheck.K8sRbInstanceHealthCheckSimple;
+import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceStatus;
+import org.onap.so.client.exception.BadResponseException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.client.RestTemplate;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.springframework.http.HttpMethod.DELETE;
+import static org.springframework.http.HttpMethod.GET;
+import static org.springframework.http.HttpMethod.POST;
+
+@RunWith(SpringRunner.class)
+public class MulticloudClientTest {
+
+ private static final String instanceId = "INSTANCE_ID";
+ private static final String endpoint = "API_URL";
+
+ @InjectMocks
+ private MulticloudClient tested;
+
+ @Mock
+ private RestTemplate restTemplate;
+ @Mock
+ private MulticloudApiUrl multicloudApiUrl;
+ @Captor
+ private ArgumentCaptor<String> instanceIdCaptor;
+
+
+ @Test
+ public void shouldUpgradeInstance() throws BadResponseException {
+ // given
+ MulticloudInstanceRequest upgradeRequest = mock(MulticloudInstanceRequest.class);
+ ResponseEntity result = mock(ResponseEntity.class);
+ String body = "body";
+
+ // when
+ when(multicloudApiUrl.apiUrl(instanceId)).thenReturn(endpoint);
+ when(restTemplate.exchange(eq(getUrl("/upgrade")), eq(POST), any(), eq(String.class))).thenReturn(result);
+ when(result.getStatusCode()).thenReturn(HttpStatus.OK);
+ when(result.getBody()).thenReturn(body);
+
+ // then
+ String actual = tested.upgradeInstance(instanceId, upgradeRequest);
+
+ assertEquals(body, actual);
+ verify(multicloudApiUrl).apiUrl(instanceIdCaptor.capture());
+ assertInstanceIdCaperedValue(instanceIdCaptor.getValue());
+ }
+
+ @Test
+ public void shouldGetInstanceStatus() throws BadResponseException {
+ // given
+ ResponseEntity result = mock(ResponseEntity.class);
+ String body = "{\"ready\":true}";
+
+ // when
+ when(multicloudApiUrl.apiUrl(instanceId)).thenReturn(endpoint);
+ when(restTemplate.exchange(eq(getUrl("/status")), eq(GET), any(), eq(String.class))).thenReturn(result);
+ when(result.getStatusCode()).thenReturn(HttpStatus.OK);
+ when(result.getBody()).thenReturn(body);
+
+ // then
+ K8sRbInstanceStatus actual = tested.getInstanceStatus(instanceId);
+
+ assertEquals(true, actual.isReady());
+ verify(multicloudApiUrl).apiUrl(instanceIdCaptor.capture());
+ assertInstanceIdCaperedValue(instanceIdCaptor.getValue());
+ }
+
+ @Test
+ public void shouldStartInstanceHealthCheck() throws BadResponseException {
+ // given
+ ResponseEntity result = mock(ResponseEntity.class);
+ String body = "{\"status\":\"SUCCEED\"}";
+
+ // when
+ when(multicloudApiUrl.apiUrl(instanceId)).thenReturn(endpoint);
+ when(restTemplate.exchange(eq(getUrl("/healthcheck")), eq(POST), any(), eq(String.class))).thenReturn(result);
+ when(result.getStatusCode()).thenReturn(HttpStatus.OK);
+ when(result.getBody()).thenReturn(body);
+
+ // then
+ K8sRbInstanceHealthCheckSimple actual = tested.startInstanceHealthCheck(instanceId);
+
+ assertEquals("SUCCEED", actual.getStatus());
+ verify(multicloudApiUrl).apiUrl(instanceIdCaptor.capture());
+ assertInstanceIdCaperedValue(instanceIdCaptor.getValue());
+ }
+
+ @Test
+ public void shouldGetInstanceHealthCheck() throws BadResponseException {
+ // given
+ ResponseEntity result = mock(ResponseEntity.class);
+ String healthCheckInstance = "healthCheckInstance";
+ String body = "{\"status\":\"SUCCEED\"}";
+
+ // when
+ when(multicloudApiUrl.apiUrl(instanceId)).thenReturn(endpoint);
+ when(restTemplate.exchange(eq(getUrl("/healthcheck/"+healthCheckInstance)), eq(GET), any(), eq(String.class))).thenReturn(result);
+ when(result.getStatusCode()).thenReturn(HttpStatus.OK);
+ when(result.getBody()).thenReturn(body);
+
+ // then
+ K8sRbInstanceHealthCheck actual = tested.getInstanceHealthCheck(instanceId, healthCheckInstance);
+
+ assertEquals("SUCCEED", actual.getStatus());
+ verify(multicloudApiUrl).apiUrl(instanceIdCaptor.capture());
+ assertInstanceIdCaperedValue(instanceIdCaptor.getValue());
+ }
+
+ @Test
+ public void shouldDeleteInstanceHealthCheck() throws BadResponseException {
+ // given
+ ResponseEntity result = mock(ResponseEntity.class);
+ String healthCheckInstance = "healthCheckInstance";
+ String body = "body";
+
+ // when
+ when(multicloudApiUrl.apiUrl(instanceId)).thenReturn(endpoint);
+ when(restTemplate.exchange(eq(getUrl("/healthcheck/"+healthCheckInstance)), eq(DELETE), any(), eq(String.class))).thenReturn(result);
+ when(result.getStatusCode()).thenReturn(HttpStatus.OK);
+ when(result.getBody()).thenReturn(body);
+
+ // then
+ tested.deleteInstanceHealthCheck(instanceId, healthCheckInstance);
+
+ verify(multicloudApiUrl).apiUrl(instanceIdCaptor.capture());
+ assertInstanceIdCaperedValue(instanceIdCaptor.getValue());
+ }
+
+ private void assertInstanceIdCaperedValue(String instanceIdCapturedValue) {
+ assertEquals(instanceId, instanceIdCapturedValue);
+ }
+
+ private String getUrl(String path) {
+ return endpoint + path;
+ }
+}
\ No newline at end of file
import org.onap.so.adapters.cnf.model.ResourceBundleEntity;
import org.onap.so.adapters.cnf.model.Tag;
import org.onap.so.adapters.cnf.model.aai.AaiCallbackResponse;
+import org.onap.so.adapters.cnf.model.aai.AaiRequest;
import org.onap.so.adapters.cnf.model.healthcheck.HealthCheckResponse;
-import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
import org.onap.so.adapters.cnf.model.statuscheck.StatusCheckResponse;
import org.onap.so.adapters.cnf.model.upgrade.InstanceUpgradeRequest;
import org.onap.so.adapters.cnf.service.CnfAdapterService;
import org.mockito.Mockito;
import org.onap.so.adapters.cnf.MulticloudConfiguration;
import org.onap.so.adapters.cnf.client.SoCallbackClient;
-import org.onap.so.adapters.cnf.model.BpmnInstanceRequest;
import org.onap.so.adapters.cnf.model.CheckInstanceRequest;
-import org.onap.so.adapters.cnf.model.ConfigTemplateEntity;
-import org.onap.so.adapters.cnf.model.ConfigurationEntity;
-import org.onap.so.adapters.cnf.model.ConfigurationRollbackEntity;
-import org.onap.so.adapters.cnf.model.ConnectivityInfo;
-import org.onap.so.adapters.cnf.model.InstanceMiniResponse;
import org.onap.so.adapters.cnf.model.InstanceMiniResponseList;
-import org.onap.so.adapters.cnf.model.InstanceResponse;
import org.onap.so.adapters.cnf.model.InstanceStatusResponse;
-import org.onap.so.adapters.cnf.model.MulticloudInstanceRequest;
-import org.onap.so.adapters.cnf.model.ProfileEntity;
-import org.onap.so.adapters.cnf.model.Resource;
-import org.onap.so.adapters.cnf.model.ResourceBundleEntity;
-import org.onap.so.adapters.cnf.model.Tag;
import org.onap.so.adapters.cnf.model.aai.AaiCallbackResponse;
+import org.onap.so.adapters.cnf.model.aai.AaiRequest;
import org.onap.so.adapters.cnf.model.healthcheck.HealthCheckResponse;
-import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
import org.onap.so.adapters.cnf.model.statuscheck.StatusCheckResponse;
import org.onap.so.adapters.cnf.model.upgrade.InstanceUpgradeRequest;
import org.onap.so.adapters.cnf.service.CnfAdapterService;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.web.context.request.async.DeferredResult;
-import org.springframework.web.multipart.MultipartFile;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import static org.assertj.core.api.Java6Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
+import org.onap.so.adapters.cnf.model.aai.AaiRequest;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceGvk;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceResourceStatus;
import org.onap.so.adapters.cnf.model.statuscheck.K8sStatus;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
+import org.onap.so.adapters.cnf.model.aai.AaiRequest;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceGvk;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceResourceStatus;
import org.onap.so.adapters.cnf.model.statuscheck.K8sStatus;
import org.mockito.Mock;
import org.onap.so.adapters.cnf.AaiConfiguration;
import org.onap.so.adapters.cnf.client.MulticloudClient;
-import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
+import org.onap.so.adapters.cnf.model.aai.AaiRequest;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceResourceStatus;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceStatus;
import org.onap.so.client.exception.BadResponseException;
package org.onap.so.adapters.cnf.service.healthcheck;
import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import org.junit.Test;
import org.junit.Rule;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import org.onap.so.adapters.cnf.client.MulticloudClient;
import org.onap.so.adapters.cnf.model.CheckInstanceRequest;
import org.onap.so.adapters.cnf.model.InstanceRequest;
import org.onap.so.adapters.cnf.model.healthcheck.HealthCheckResponse;
import org.onap.so.adapters.cnf.model.healthcheck.K8sRbInstanceHealthCheck;
import org.onap.so.adapters.cnf.model.healthcheck.K8sRbInstanceHealthCheckSimple;
-import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.UUID;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-@SpringBootTest
@RunWith(SpringRunner.class)
public class HealthCheckServiceTest {
private final int portNumber = 8443;
import org.mockito.Captor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
import org.onap.so.adapters.cnf.client.MulticloudClient;
import org.onap.so.adapters.cnf.model.MulticloudInstanceRequest;
import org.onap.so.adapters.cnf.model.upgrade.InstanceUpgradeRequest;
import org.onap.so.client.exception.BadResponseException;
-import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.Map;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@SpringBootTest
@RunWith(SpringRunner.class)
public class InstanceUpgradeServiceTest {
Code Review / so / adapters / so-cnf-adapter.git / commitdiff