From db3f905491c6a8f844212a4227281e758d73d333 Mon Sep 17 00:00:00 2001 From: "Cheung, Pat (kc1472)" Date: Fri, 14 Jan 2022 14:32:42 -0500 Subject: AAI schema update Update AAI adaptor to v25 Issue-ID: CCSDK-3561 Signed-off-by: Cheung, Pat (kc1472) Change-Id: Ibf63c8fdb7018c707f760ad89af66aacf061b5c1 --- .../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 +++++++++++----------- .../aai/update/BulkUpdateRequestDataTest.java | 2 +- 8 files changed, 30 insertions(+), 30 deletions(-) (limited to 'adaptors/aai-service/provider/src/test/java') 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 774803231..6b4ee9d32 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.v24.*; +import org.onap.aai.inventory.v25.*; 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 c368f1b86..9864240e9 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.v24.GenericVnf; +import org.onap.aai.inventory.v25.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 dc4a63780..e988dabf9 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.v24.LInterface; +import org.onap.aai.inventory.v25.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 0011a296f..66d34a8b8 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.v24.GenericVnf; +import org.onap.aai.inventory.v25.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 c6c300613..ad5b8a15d 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.v24.RelationshipList; -import org.onap.aai.inventory.v24.Vlans; +import org.onap.aai.inventory.v25.RelationshipList; +import org.onap.aai.inventory.v25.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 869c54937..30e99e893 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.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; +import org.onap.aai.inventory.v25.CloudRegion; +import org.onap.aai.inventory.v25.GenericVnf; +import org.onap.aai.inventory.v25.L3Network; +import org.onap.aai.inventory.v25.LogicalLink; +import org.onap.aai.inventory.v25.PInterface; +import org.onap.aai.inventory.v25.Pnf; +import org.onap.aai.inventory.v25.ServiceInstance; +import org.onap.aai.inventory.v25.Tenant; +import org.onap.aai.inventory.v25.Vnf; +import org.onap.aai.inventory.v25.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 af47bcfa4..6ff013b0b 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.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; +import org.onap.aai.inventory.v25.CloudRegion; +import org.onap.aai.inventory.v25.Complex; +import org.onap.aai.inventory.v25.Configuration; +import org.onap.aai.inventory.v25.GenericVnf; +import org.onap.aai.inventory.v25.L3InterfaceIpv4AddressList; +import org.onap.aai.inventory.v25.L3InterfaceIpv6AddressList; +import org.onap.aai.inventory.v25.L3Network; +import org.onap.aai.inventory.v25.LInterface; +//import org.onap.aai.inventory.v25.OwningEntity; +import org.onap.aai.inventory.v25.Pserver; +import org.onap.aai.inventory.v25.ServiceInstance; +import org.onap.aai.inventory.v25.Vnfc; +import org.onap.aai.inventory.v25.Vserver; public class ResultTest { diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/update/BulkUpdateRequestDataTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/update/BulkUpdateRequestDataTest.java index f26df4cf2..62268b1f7 100644 --- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/update/BulkUpdateRequestDataTest.java +++ b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/update/BulkUpdateRequestDataTest.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; -import org.onap.aai.inventory.v24.Subnet; +import org.onap.aai.inventory.v25.Subnet; public class BulkUpdateRequestDataTest { @Test -- cgit 1.2.3-korg