From ec15710c693074865c04d546fe994d7861791089 Mon Sep 17 00:00:00 2001 From: Hesam Rahimi Date: Tue, 20 Jul 2021 21:55:09 +0000 Subject: Updating ccsdk sli adaptor for aai to use v24 of the aai-schema. Issue-ID: CCSDK-3377 Signed-off-by: Hesam Rahimi Change-Id: Ib35ad8b90660c9c62ffdf1911fff0da023772071 --- .../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 'adaptors/aai-service/provider/src/test/java/org/onap') diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java index 079c76cbd..774803231 100755 --- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java +++ b/adaptors/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.v21.*; +import org.onap.aai.inventory.v24.*; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java index 5ac503ff5..c368f1b86 100755 --- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java +++ b/adaptors/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.v21.GenericVnf; +import org.onap.aai.inventory.v24.GenericVnf; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.AnnotationUtils; diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java index 3ce8a6dc5..dc4a63780 100755 --- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java +++ b/adaptors/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.v21.LInterface; +import org.onap.aai.inventory.v24.LInterface; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java index 5a594298f..a90227cba 100755 --- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java +++ b/adaptors/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.v21.GenericVnf; +import org.onap.aai.inventory.v24.GenericVnf; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java index 7975372be..c6c300613 100644 --- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java +++ b/adaptors/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.v21.RelationshipList; -import org.onap.aai.inventory.v21.Vlans; +import org.onap.aai.inventory.v24.RelationshipList; +import org.onap.aai.inventory.v24.Vlans; public class SubInterfaceTest { diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java index 7a81f72cb..869c54937 100644 --- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java +++ b/adaptors/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.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; +import org.onap.aai.inventory.v24.CloudRegion; +import org.onap.aai.inventory.v24.GenericVnf; +import org.onap.aai.inventory.v24.L3Network; +import org.onap.aai.inventory.v24.LogicalLink; +import org.onap.aai.inventory.v24.PInterface; +import org.onap.aai.inventory.v24.Pnf; +import org.onap.aai.inventory.v24.ServiceInstance; +import org.onap.aai.inventory.v24.Tenant; +import org.onap.aai.inventory.v24.Vnf; +import org.onap.aai.inventory.v24.Vserver; public class InstanceFilterTest { diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java index 14c17a563..af47bcfa4 100644 --- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java +++ b/adaptors/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.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; +import org.onap.aai.inventory.v24.CloudRegion; +import org.onap.aai.inventory.v24.Complex; +import org.onap.aai.inventory.v24.Configuration; +import org.onap.aai.inventory.v24.GenericVnf; +import org.onap.aai.inventory.v24.L3InterfaceIpv4AddressList; +import org.onap.aai.inventory.v24.L3InterfaceIpv6AddressList; +import org.onap.aai.inventory.v24.L3Network; +import org.onap.aai.inventory.v24.LInterface; +//import org.onap.aai.inventory.v24.OwningEntity; +import org.onap.aai.inventory.v24.Pserver; +import org.onap.aai.inventory.v24.ServiceInstance; +import org.onap.aai.inventory.v24.Vnfc; +import org.onap.aai.inventory.v24.Vserver; public class ResultTest { -- cgit 1.2.3-korg