X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=sdnc-a1-controller%2Fnorthbound%2Fnonrt-ric-api%2Fprovider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fsdnc%2Fnorthbound%2FNonrtRicApiProviderTest.java;h=94b2f923b85a39a909b52af529c50b8b76089782;hb=97d18aedfa83bfeb9f914a1b748aa224f04fb8b5;hp=3dc1efd1bb862baeb6406d4890469d86437eae2f;hpb=f3461cb776023b950d62edd25eca148b6d354c9c;p=nonrtric.git 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 3dc1efd1..94b2f923 100644 --- 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 @@ -22,10 +22,9 @@ package org.onap.sdnc.northbound; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; -import com.google.common.util.concurrent.ListenableFuture; -import java.util.ArrayList; -import java.util.List; + import java.util.concurrent.ExecutionException; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -34,21 +33,22 @@ import org.mockito.Mock; import org.mockito.internal.util.reflection.Whitebox; import org.mockito.runners.MockitoJUnitRunner; import org.onap.sdnc.northbound.provider.NonrtRicApiProvider; -import org.onap.sdnc.northbound.restadapter.NearRicUrlProvider; import org.onap.sdnc.northbound.restadapter.RestAdapter; 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.rev200122.GetPolicyIdentitiesInputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetPolicyIdentitiesOutput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetPolicyTypeIdentitiesInputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetPolicyTypeIdentitiesOutput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetPolicyTypeInputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetPolicyTypeOutput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutPolicyInputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutPolicyOutput; -import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.DeleteA1PolicyInputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.DeleteA1PolicyOutput; +import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyInputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyOutput; +import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyStatusInputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutput; +import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyTypeInputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutput; +import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutA1PolicyInputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutA1PolicyOutput; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @@ -73,81 +73,78 @@ public class NonrtRicApiProviderTest extends AbstractConcurrentDataBrokerTest { protected RpcProviderRegistry mockRpcProviderRegistry; @Mock private RestAdapter restAdapter; - private NearRicUrlProvider nearRicUrlProvider; - private static String nearRtRicUrl = "http://ric1:8085"; - private static String policyTypeId = "STD_QoSNudging_0.1.0"; - private static String policyId = "3d2157af-6a8f-4a7c-810f-38c2f824bf12"; - + private static Uri nearRtRicUrl = new Uri("http://ric1:8085"); @Before public void setUp() throws Exception { - nearRicUrlProvider = new NearRicUrlProvider(); dataBroker = getDataBroker(); - nonrtRicApiProvider = new NonrtRicApiProvider(dataBroker, mockNotificationPublishService, - mockRpcProviderRegistry); + nonrtRicApiProvider = new NonrtRicApiProvider(dataBroker, mockNotificationPublishService, mockRpcProviderRegistry); } @Test - public void testGetPolicyTypeIdentities() throws InterruptedException, ExecutionException { - GetPolicyTypeIdentitiesInputBuilder inputBuilder = new GetPolicyTypeIdentitiesInputBuilder(); + public void testGetA1Policy() throws InterruptedException, ExecutionException { + GetA1PolicyInputBuilder inputBuilder = new GetA1PolicyInputBuilder(); inputBuilder.setNearRtRicUrl(nearRtRicUrl); Whitebox.setInternalState(nonrtRicApiProvider, "restAdapter", restAdapter); - String uri = nearRicUrlProvider.policyTypesUrl(inputBuilder.build().getNearRtRicUrl()); - List policyTypeIdentities = new ArrayList<>(); - policyTypeIdentities.add(policyTypeId); - ResponseEntity getPolicyTypeIdentitiesResponse = new ResponseEntity<>(policyTypeIdentities, HttpStatus.OK); - when(restAdapter.get(eq(uri), eq(List.class))).thenReturn(getPolicyTypeIdentitiesResponse); - ListenableFuture> result = - nonrtRicApiProvider.getPolicyTypeIdentities(inputBuilder.build()); - Assert.assertEquals(policyTypeIdentities, result.get().getResult().getPolicyTypeIdList()); + String returnedBody = "returned body"; + ResponseEntity getResponse = new ResponseEntity<>(returnedBody, HttpStatus.OK); + when(restAdapter.get(eq(nearRtRicUrl.getValue()), eq(String.class))).thenReturn(getResponse); + GetA1PolicyOutput result = nonrtRicApiProvider.getA1Policy(inputBuilder.build()).get().getResult(); + Assert.assertEquals(returnedBody, result.getBody()); + Assert.assertTrue(HttpStatus.OK.value() == result.getHttpStatus()); } @Test - public void testGetPolicyIdentities() throws InterruptedException, ExecutionException { - GetPolicyIdentitiesInputBuilder inputBuilder = new GetPolicyIdentitiesInputBuilder(); + public void testGetA1PolicyType() throws InterruptedException, ExecutionException { + GetA1PolicyTypeInputBuilder inputBuilder = new GetA1PolicyTypeInputBuilder(); inputBuilder.setNearRtRicUrl(nearRtRicUrl); Whitebox.setInternalState(nonrtRicApiProvider, "restAdapter", restAdapter); - String uri = nearRicUrlProvider.policiesUrl(inputBuilder.build().getNearRtRicUrl()); - List policyIdentities = new ArrayList<>(); - policyIdentities.add(policyId); - ResponseEntity getPolicyIdentitiesResponse = new ResponseEntity<>(policyIdentities, HttpStatus.OK); - when(restAdapter.get(eq(uri), eq(List.class))).thenReturn(getPolicyIdentitiesResponse); - ListenableFuture> result = - nonrtRicApiProvider.getPolicyIdentities(inputBuilder.build()); - Assert.assertEquals(policyIdentities, result.get().getResult().getPolicyIdList()); + String returnedBody = "returned body"; + ResponseEntity getResponse = new ResponseEntity<>(returnedBody, HttpStatus.OK); + when(restAdapter.get(eq(nearRtRicUrl.getValue()), eq(String.class))).thenReturn(getResponse); + GetA1PolicyTypeOutput result = nonrtRicApiProvider.getA1PolicyType(inputBuilder.build()).get().getResult(); + Assert.assertEquals(returnedBody, result.getBody()); + Assert.assertTrue(HttpStatus.OK.value() == result.getHttpStatus()); } @Test - public void testGetPolicyType() throws InterruptedException, ExecutionException { - GetPolicyTypeInputBuilder inputBuilder = new GetPolicyTypeInputBuilder(); + public void testGetA1PolicyStatus() throws InterruptedException, ExecutionException { + GetA1PolicyStatusInputBuilder inputBuilder = new GetA1PolicyStatusInputBuilder(); inputBuilder.setNearRtRicUrl(nearRtRicUrl); - inputBuilder.setPolicyTypeId(policyTypeId); Whitebox.setInternalState(nonrtRicApiProvider, "restAdapter", restAdapter); - String uri = nearRicUrlProvider.getPolicyTypeUrl(inputBuilder.build().getNearRtRicUrl(), - String.valueOf(inputBuilder.build().getPolicyTypeId())); - String testPolicyType = "{}"; - ResponseEntity getPolicyTypeResponse = new ResponseEntity<>(testPolicyType, HttpStatus.OK); - when(restAdapter.get(eq(uri), eq(String.class))).thenReturn(getPolicyTypeResponse); - ListenableFuture> result = - nonrtRicApiProvider.getPolicyType(inputBuilder.build()); - Assert.assertEquals(testPolicyType, result.get().getResult().getPolicyType()); + String returnedBody = "returned body"; + ResponseEntity getResponse = new ResponseEntity<>(returnedBody, HttpStatus.OK); + when(restAdapter.get(eq(nearRtRicUrl.getValue()), eq(String.class))).thenReturn(getResponse); + GetA1PolicyStatusOutput result = nonrtRicApiProvider.getA1PolicyStatus(inputBuilder.build()).get().getResult(); + Assert.assertEquals(returnedBody, result.getBody()); + Assert.assertTrue(HttpStatus.OK.value() == result.getHttpStatus()); } @Test - public void testPutPolicy() throws InterruptedException, ExecutionException { - PutPolicyInputBuilder inputBuilder = new PutPolicyInputBuilder(); + public void testPutA1Policy() throws InterruptedException, ExecutionException { + PutA1PolicyInputBuilder inputBuilder = new PutA1PolicyInputBuilder(); String testPolicy = "{}"; inputBuilder.setNearRtRicUrl(nearRtRicUrl); - inputBuilder.setPolicyId(policyId); - inputBuilder.setPolicyTypeId(policyTypeId); - inputBuilder.setPolicy(testPolicy); + inputBuilder.setBody(testPolicy); + Whitebox.setInternalState(nonrtRicApiProvider, "restAdapter", restAdapter); + String returnedBody = "returned body"; + ResponseEntity putResponse = new ResponseEntity<>(returnedBody, HttpStatus.CREATED); + when(restAdapter.put(eq(nearRtRicUrl.getValue()), eq(testPolicy), eq(String.class))).thenReturn(putResponse); + PutA1PolicyOutput result = nonrtRicApiProvider.putA1Policy(inputBuilder.build()).get().getResult(); + Assert.assertEquals(returnedBody, result.getBody()); + Assert.assertTrue(HttpStatus.CREATED.value() == result.getHttpStatus()); + } + + @Test + public void testDeleteA1() throws InterruptedException, ExecutionException { + DeleteA1PolicyInputBuilder inputBuilder = new DeleteA1PolicyInputBuilder(); + inputBuilder.setNearRtRicUrl(nearRtRicUrl); Whitebox.setInternalState(nonrtRicApiProvider, "restAdapter", restAdapter); - String uri = nearRicUrlProvider.putPolicyUrl(inputBuilder.build().getNearRtRicUrl(), - inputBuilder.getPolicyId(), inputBuilder.getPolicyTypeId()); - ResponseEntity putPolicyResponse = new ResponseEntity<>(testPolicy, HttpStatus.CREATED); - when(restAdapter.put(eq(uri), eq(testPolicy), eq(String.class))).thenReturn(putPolicyResponse); - ListenableFuture> result = - nonrtRicApiProvider.putPolicy(inputBuilder.build()); - Assert.assertEquals(testPolicy, result.get().getResult().getReturnedPolicy()); + + ResponseEntity getResponse = new ResponseEntity<>(HttpStatus.NO_CONTENT); + when(restAdapter.delete(nearRtRicUrl.getValue())).thenReturn(getResponse); + DeleteA1PolicyOutput result = nonrtRicApiProvider.deleteA1Policy(inputBuilder.build()).get().getResult(); + Assert.assertTrue(HttpStatus.NO_CONTENT.value() == result.getHttpStatus()); } + }