Code Review / nonrtric.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Add Http Response Code in A1 Controller Api
[nonrtric.git] / sdnc-a1-controller / northbound / nonrt-ric-api / provider / src / test / java / org / onap / sdnc / northbound / NonrtRicApiProviderTest.java
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/onap/sdnc/northbound/NonrtRicApiProviderTest.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/onap/sdnc/northbound/NonrtRicApiProviderTest.java
index e67304c..e9b86be 100644 (file)
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/onap/sdnc/northbound/NonrtRicApiProviderTest.java
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/onap/sdnc/northbound/NonrtRicApiProviderTest.java
@@ -23,8 +23,8 @@ package org.onap.sdnc.northbound;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;
-import com.google.common.base.Optional;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.gson.Gson;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -42,10 +42,18 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBrokerTest;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.CreatePolicyInstanceInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.CreatePolicyInstanceOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.CreatePolicyTypeInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.CreatePolicyTypeOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.DeletePolicyInstanceInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.DeletePolicyInstanceOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.DeletePolicyTypeInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.DeletePolicyTypeOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.GetHealthCheckInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.GetHealthCheckOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.GetNearRTRICsInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.GetNearRTRICsOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.GetPolicyInstanceInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.GetPolicyInstanceOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev191002.GetPolicyInstancesInputBuilder;
@@ -59,6 +67,8 @@ import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev19100
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 
 /**
  * This class Tests all the methods in NonrtRicApiProvider
@@ -93,6 +103,46 @@ public class NonrtRicApiProviderTest extends AbstractConcurrentDataBrokerTest {
         mockRpcProviderRegistry);
   }
 
+  @Test
+  public void testCreatePolicyInstance() throws InterruptedException, ExecutionException {
+    CreatePolicyInstanceInputBuilder inputBuilder = new CreatePolicyInstanceInputBuilder();
+    inputBuilder.setNearRtRicId(nearRtRicId);
+    inputBuilder.setPolicyTypeId(policyTypeId);
+    inputBuilder.setPolicyInstanceId(policyTypeInstanceId);
+    Whitebox.setInternalState(nonrtRicApiProvider, "restAdapter", restAdapter);
+    String uri = nearRicUrlProvider.getPolicyInstanceId(inputBuilder.build().getNearRtRicId(),
+            String.valueOf(inputBuilder.build().getPolicyTypeId()), inputBuilder.getPolicyInstanceId());
+    ResponseEntity<Object> createPolicyInstanceResponse = new ResponseEntity<>(HttpStatus.CREATED);
+    when(restAdapter.put(eq(uri), anyObject())).thenReturn(createPolicyInstanceResponse);
+    ListenableFuture<RpcResult<CreatePolicyInstanceOutput>> result =
+        nonrtRicApiProvider.createPolicyInstance(inputBuilder.build());
+    Assert.assertEquals(String.valueOf(HttpStatus.CREATED.value()), result.get().getResult().getCode());
+  }
+
+  @Test
+  public void testDeletePolicyInstance() throws InterruptedException, ExecutionException {
+    DeletePolicyInstanceInputBuilder inputBuilder = new DeletePolicyInstanceInputBuilder();
+    inputBuilder.setNearRtRicId(nearRtRicId);
+    inputBuilder.setPolicyTypeId(policyTypeId);
+    inputBuilder.setPolicyInstanceId(policyTypeInstanceId);
+    Whitebox.setInternalState(nonrtRicApiProvider, "restAdapter", restAdapter);
+    String uri = nearRicUrlProvider.getPolicyInstanceId(inputBuilder.build().getNearRtRicId(),
+            String.valueOf(inputBuilder.build().getPolicyTypeId()), inputBuilder.getPolicyInstanceId());
+    ResponseEntity<Object> deletePolicyInstanceResponse = new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    when(restAdapter.delete(eq(uri))).thenReturn(deletePolicyInstanceResponse);
+    ListenableFuture<RpcResult<DeletePolicyInstanceOutput>> result =
+        nonrtRicApiProvider.deletePolicyInstance(inputBuilder.build());
+    Assert.assertEquals(String.valueOf(HttpStatus.NO_CONTENT.value()), result.get().getResult().getCode());
+  }
+
+  @Test
+  public void testGetNearRTRICs() throws InterruptedException, ExecutionException {
+    GetNearRTRICsInputBuilder inputBuilder = new GetNearRTRICsInputBuilder();
+    ListenableFuture<RpcResult<GetNearRTRICsOutput>> result =
+        nonrtRicApiProvider.getNearRTRICs(inputBuilder.build());
+    Assert.assertEquals(String.valueOf(HttpStatus.OK.value()), result.get().getResult().getCode());
+  }
+
   @Test
   public void testCreatePolicyType() throws InterruptedException, ExecutionException {
     CreatePolicyTypeInputBuilder inputBuilder = new CreatePolicyTypeInputBuilder();
@@ -101,11 +151,26 @@ public class NonrtRicApiProviderTest extends AbstractConcurrentDataBrokerTest {
     Whitebox.setInternalState(nonrtRicApiProvider, "restAdapter", restAdapter);
     String uri = nearRicUrlProvider.getPolicyTypeId(inputBuilder.build().getNearRtRicId(),
                 String.valueOf(inputBuilder.build().getPolicyTypeId()));
-    Optional<Object> createPolicyTyperesponse = null;
-    when(restAdapter.put(eq(uri), anyObject())).thenReturn(createPolicyTyperesponse);
+    ResponseEntity<Object> createPolicyTypeResponse = new ResponseEntity<>(HttpStatus.CREATED);
+    when(restAdapter.put(eq(uri), anyObject())).thenReturn(createPolicyTypeResponse);
     ListenableFuture<RpcResult<CreatePolicyTypeOutput>> result =
         nonrtRicApiProvider.createPolicyType(inputBuilder.build());
-    Assert.assertEquals("Success", result.get().getResult().getStatus());
+    Assert.assertEquals(String.valueOf(HttpStatus.CREATED.value()), result.get().getResult().getCode());
+  }
+
+  @Test
+  public void testDeletePolicyType() throws InterruptedException, ExecutionException {
+    DeletePolicyTypeInputBuilder inputBuilder = new DeletePolicyTypeInputBuilder();
+    inputBuilder.setNearRtRicId(nearRtRicId);
+    inputBuilder.setPolicyTypeId(policyTypeId);
+    Whitebox.setInternalState(nonrtRicApiProvider, "restAdapter", restAdapter);
+    String uri = nearRicUrlProvider.getPolicyTypeId(inputBuilder.build().getNearRtRicId(),
+                String.valueOf(inputBuilder.build().getPolicyTypeId()));
+    ResponseEntity<Object> deletePolicyTypeResponse = new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    when(restAdapter.delete(eq(uri))).thenReturn(deletePolicyTypeResponse);
+    ListenableFuture<RpcResult<DeletePolicyTypeOutput>> result =
+        nonrtRicApiProvider.deletePolicyType(inputBuilder.build());
+    Assert.assertEquals(String.valueOf(HttpStatus.NO_CONTENT.value()), result.get().getResult().getCode());
   }
 
   @Test
@@ -118,10 +183,12 @@ public class NonrtRicApiProviderTest extends AbstractConcurrentDataBrokerTest {
             String.valueOf(inputBuilder.build().getPolicyTypeId()));
     String policyType =
             "{\"name\":\"Policy type 1\",\"description\":\"PT 1\",\"policy_type_id\":1,\"create_schema\":{}}";
-    when(restAdapter.get(eq(uri), anyObject())).thenReturn(Optional.of(policyType));
+    ResponseEntity<Object> getPolicyTypeResponse = new ResponseEntity<>(policyType, HttpStatus.OK);
+    when(restAdapter.get(eq(uri), eq(String.class))).thenReturn(getPolicyTypeResponse);
     ListenableFuture<RpcResult<GetPolicyTypeOutput>> result =
         nonrtRicApiProvider.getPolicyType(inputBuilder.build());
     Assert.assertEquals("Policy type 1", result.get().getResult().getName());
+    Assert.assertEquals(String.valueOf(HttpStatus.OK.value()), result.get().getResult().getCode());
   }
 
   @Test
@@ -134,10 +201,12 @@ public class NonrtRicApiProviderTest extends AbstractConcurrentDataBrokerTest {
     policyTypesInteger.add(20001);
     List<Long> policyTypesLong = new ArrayList<>();
     policyTypesLong.add(20001L);
-    when(restAdapter.get(eq(uri), eq(List.class))).thenReturn(Optional.of(policyTypesInteger));
+    ResponseEntity<Object> getPolicyTypesResponse = new ResponseEntity<>(policyTypesInteger, HttpStatus.OK);
+    when(restAdapter.get(eq(uri), eq(List.class))).thenReturn(getPolicyTypesResponse);
     ListenableFuture<RpcResult<GetPolicyTypesOutput>> result =
         nonrtRicApiProvider.getPolicyTypes(inputBuilder.build());
     Assert.assertEquals(policyTypesLong, result.get().getResult().getPolicyTypeIdList());
+    Assert.assertEquals(String.valueOf(HttpStatus.OK.value()), result.get().getResult().getCode());
   }
 
   @Test
@@ -151,11 +220,12 @@ public class NonrtRicApiProviderTest extends AbstractConcurrentDataBrokerTest {
         String.valueOf(inputBuilder.build().getPolicyTypeId()), inputBuilder.getPolicyInstanceId());
     String policyInstance =
             "{\"scope\":{\"ue_id\":\"2\"},\"statement\":{\"priority_level\":\"1\"},\"policy_id\":\"pi12\"}";
-    when(restAdapter.get(eq(uri), eq(String.class)))
-        .thenReturn(Optional.of(policyInstance));
+    ResponseEntity<Object> getPolicyInstanceResponse = new ResponseEntity<>(policyInstance, HttpStatus.OK);
+    when(restAdapter.get(eq(uri), eq(String.class))).thenReturn(getPolicyInstanceResponse);
     ListenableFuture<RpcResult<GetPolicyInstanceOutput>> result =
         nonrtRicApiProvider.getPolicyInstance(inputBuilder.build());
     Assert.assertEquals(policyInstance, result.get().getResult().getPolicyInstance());
+    Assert.assertEquals(String.valueOf(HttpStatus.OK.value()), result.get().getResult().getCode());
   }
 
   @Test
@@ -168,10 +238,12 @@ public class NonrtRicApiProviderTest extends AbstractConcurrentDataBrokerTest {
             String.valueOf(inputBuilder.build().getPolicyTypeId()));
     List<String> policyInstances = new ArrayList<>();
     policyInstances.add("3d2157af-6a8f-4a7c-810f-38c2f824bf12");
-    when(restAdapter.get(eq(uri), eq(List.class))).thenReturn(Optional.of(policyInstances));
+    ResponseEntity<Object> getPolicyInstancesResponse = new ResponseEntity<>(policyInstances, HttpStatus.OK);
+    when(restAdapter.get(eq(uri), eq(List.class))).thenReturn(getPolicyInstancesResponse);
     ListenableFuture<RpcResult<GetPolicyInstancesOutput>> result =
         nonrtRicApiProvider.getPolicyInstances(inputBuilder.build());
     Assert.assertEquals(policyInstances, result.get().getResult().getPolicyInstanceIdList());
+    Assert.assertEquals(String.valueOf(HttpStatus.OK.value()), result.get().getResult().getCode());
   }
 
   @Test
@@ -183,23 +255,27 @@ public class NonrtRicApiProviderTest extends AbstractConcurrentDataBrokerTest {
     Whitebox.setInternalState(nonrtRicApiProvider, "restAdapter", restAdapter);
     String uri = nearRicUrlProvider.getPolicyInstanceIdStatus(inputBuilder.build().getNearRtRicId(),
         String.valueOf(inputBuilder.build().getPolicyTypeId()), inputBuilder.getPolicyInstanceId());
-    String policyInstanceStatus = "{\"status\":\"enforced\"}";
-    when(restAdapter.get(eq(uri), eq(String.class))).thenReturn(Optional.of(policyInstanceStatus));
+    String policyInstanceStatus = "[{\"handler_id\":\"NearRTRIC-1\",\"status\":\"enforced\"}]";
+    ResponseEntity<Object> getStatusResponse =
+            new ResponseEntity<>(new Gson().fromJson(policyInstanceStatus, List.class), HttpStatus.OK);
+    when(restAdapter.get(eq(uri), eq(List.class))).thenReturn(getStatusResponse);
     ListenableFuture<RpcResult<GetStatusOutput>> result =
         nonrtRicApiProvider.getStatus(inputBuilder.build());
     Assert.assertEquals("enforced", result.get().getResult().getStatus());
+    Assert.assertEquals(String.valueOf(HttpStatus.OK.value()), result.get().getResult().getCode());
   }
 
   @Test
-  public void testHealthCheck() throws InterruptedException, ExecutionException {
+  public void testGetHealthCheck() throws InterruptedException, ExecutionException {
     GetHealthCheckInputBuilder inputBuilder = new GetHealthCheckInputBuilder();
     inputBuilder.setNearRtRicId(nearRtRicId);
     Whitebox.setInternalState(nonrtRicApiProvider, "restAdapter", restAdapter);
     String uri = nearRicUrlProvider.getHealthCheck(inputBuilder.build().getNearRtRicId());
-    String healthCheckStatus = "";
-    when(restAdapter.get(eq(uri), eq(String.class))).thenReturn(null);
+    ResponseEntity<Object> getHealthCheckResponse = new ResponseEntity<>(HttpStatus.OK);
+    when(restAdapter.get(eq(uri), eq(Object.class))).thenReturn(getHealthCheckResponse);
     ListenableFuture<RpcResult<GetHealthCheckOutput>> result =
         nonrtRicApiProvider.getHealthCheck(inputBuilder.build());
     Assert.assertEquals(true, result.get().getResult().isHealthStatus());
+    Assert.assertEquals(String.valueOf(HttpStatus.OK.value()), result.get().getResult().getCode());
   }
 }
Parent repository for the O-RAN SC Non Real-Time RIC (NONRTRIC) project.