From ffd3dd43f55c91c99decf53d20d48aab4345580d Mon Sep 17 00:00:00 2001 From: Hesam Rahimi Date: Tue, 20 Oct 2020 11:56:47 -0400 Subject: Updating AAI service adaptor to use version 21 (v21) of the schema model. Issue-ID: CCSDK-2393 Change-Id: I53369c73fd25c7f433fd99456e28fbe0fecbc59a Signed-off-by: Hesam Rahimi --- .../ccsdk/sli/adaptors/aai/AAIServiceTest.java | 2 +- .../adaptors/aai/AutoGeneratedRegressionTest.java | 2 +- .../ccsdk/sli/adaptors/aai/GenericRequestTest.java | 2 +- .../ccsdk/sli/adaptors/aai/GenericVnfTest.java | 2 +- .../sli/adaptors/aai/data/SubInterfaceTest.java | 4 ++-- .../sli/adaptors/aai/query/InstanceFilterTest.java | 20 ++++++++--------- .../ccsdk/sli/adaptors/aai/query/ResultTest.java | 26 +++++++++++----------- 7 files changed, 29 insertions(+), 29 deletions(-) (limited to 'aai-service/provider/src/test/java/org/onap') diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java index 9cc661ff7..079c76cbd 100755 --- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java +++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java @@ -51,7 +51,7 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import org.onap.aai.inventory.v19.*; +import org.onap.aai.inventory.v21.*; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java index bdeb9ddef..5ac503ff5 100755 --- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java +++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java @@ -62,7 +62,7 @@ import org.junit.runners.MethodSorters; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; -import org.onap.aai.inventory.v19.GenericVnf; +import org.onap.aai.inventory.v21.GenericVnf; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.AnnotationUtils; diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java index 8030201a2..3ce8a6dc5 100755 --- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java +++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java @@ -38,7 +38,7 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; -import org.onap.aai.inventory.v19.LInterface; +import org.onap.aai.inventory.v21.LInterface; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java index f0a33fd0a..5a594298f 100755 --- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java +++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java @@ -49,7 +49,7 @@ import org.onap.ccsdk.sli.adaptors.aai.AAIRequest; import org.onap.ccsdk.sli.adaptors.aai.AAIService; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; -import org.onap.aai.inventory.v19.GenericVnf; +import org.onap.aai.inventory.v21.GenericVnf; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java index 3ab823f57..7975372be 100644 --- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java +++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java @@ -10,8 +10,8 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.aai.inventory.v19.RelationshipList; -import org.onap.aai.inventory.v19.Vlans; +import org.onap.aai.inventory.v21.RelationshipList; +import org.onap.aai.inventory.v21.Vlans; public class SubInterfaceTest { diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java index 421c28803..7a81f72cb 100644 --- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java +++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java @@ -9,16 +9,16 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.aai.inventory.v19.CloudRegion; -import org.onap.aai.inventory.v19.GenericVnf; -import org.onap.aai.inventory.v19.L3Network; -import org.onap.aai.inventory.v19.LogicalLink; -import org.onap.aai.inventory.v19.PInterface; -import org.onap.aai.inventory.v19.Pnf; -import org.onap.aai.inventory.v19.ServiceInstance; -import org.onap.aai.inventory.v19.Tenant; -import org.onap.aai.inventory.v19.Vnf; -import org.onap.aai.inventory.v19.Vserver; +import org.onap.aai.inventory.v21.CloudRegion; +import org.onap.aai.inventory.v21.GenericVnf; +import org.onap.aai.inventory.v21.L3Network; +import org.onap.aai.inventory.v21.LogicalLink; +import org.onap.aai.inventory.v21.PInterface; +import org.onap.aai.inventory.v21.Pnf; +import org.onap.aai.inventory.v21.ServiceInstance; +import org.onap.aai.inventory.v21.Tenant; +import org.onap.aai.inventory.v21.Vnf; +import org.onap.aai.inventory.v21.Vserver; public class InstanceFilterTest { diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java index c6365ae1e..14c17a563 100644 --- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java +++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java @@ -10,19 +10,19 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.aai.inventory.v19.CloudRegion; -import org.onap.aai.inventory.v19.Complex; -import org.onap.aai.inventory.v19.Configuration; -import org.onap.aai.inventory.v19.GenericVnf; -import org.onap.aai.inventory.v19.L3InterfaceIpv4AddressList; -import org.onap.aai.inventory.v19.L3InterfaceIpv6AddressList; -import org.onap.aai.inventory.v19.L3Network; -import org.onap.aai.inventory.v19.LInterface; -//import org.onap.aai.inventory.v19.OwningEntity; -import org.onap.aai.inventory.v19.Pserver; -import org.onap.aai.inventory.v19.ServiceInstance; -import org.onap.aai.inventory.v19.Vnfc; -import org.onap.aai.inventory.v19.Vserver; +import org.onap.aai.inventory.v21.CloudRegion; +import org.onap.aai.inventory.v21.Complex; +import org.onap.aai.inventory.v21.Configuration; +import org.onap.aai.inventory.v21.GenericVnf; +import org.onap.aai.inventory.v21.L3InterfaceIpv4AddressList; +import org.onap.aai.inventory.v21.L3InterfaceIpv6AddressList; +import org.onap.aai.inventory.v21.L3Network; +import org.onap.aai.inventory.v21.LInterface; +//import org.onap.aai.inventory.v21.OwningEntity; +import org.onap.aai.inventory.v21.Pserver; +import org.onap.aai.inventory.v21.ServiceInstance; +import org.onap.aai.inventory.v21.Vnfc; +import org.onap.aai.inventory.v21.Vserver; public class ResultTest { -- cgit 1.2.3-korg