summaryrefslogtreecommitdiffstats
path: root/aai-service/provider/src/test/java
diff options
context:
space:
mode:
authorGaurav Agrawal <gaurav.agrawal@huawei.com>2020-03-12 14:43:38 +0530
committerGaurav Agrawal <gaurav.agrawal@huawei.com>2020-03-12 14:51:11 +0530
commit75e70fdc849c5e6d44ae5ff10acb81863f9c5fb4 (patch)
treed993a15dd111d9c6ad36c032ff73c43e82005b8b /aai-service/provider/src/test/java
parenta612cdd3fbed35c4d5b454c6f0329fa6ecec22e1 (diff)
Updating aai adapter to v19 model
Updated AAI XSD model to v19 to make new schema's available to SDNC. Change-Id: I5b82d97e0c96e1593237e0d10d790115bf8be965 Issue-ID: CCSDK-2171 Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
Diffstat (limited to 'aai-service/provider/src/test/java')
-rwxr-xr-xaai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java2
-rwxr-xr-xaai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java2
-rwxr-xr-xaai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java2
-rwxr-xr-xaai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java2
-rw-r--r--aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java4
-rw-r--r--aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java20
-rw-r--r--aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java26
7 files changed, 29 insertions, 29 deletions
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 f0be45877..9cc661ff7 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.v16.*;
+import org.onap.aai.inventory.v19.*;
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 9030cf9b1..bdeb9ddef 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.v16.GenericVnf;
+import org.onap.aai.inventory.v19.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 f56eee9fc..8030201a2 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.v16.LInterface;
+import org.onap.aai.inventory.v19.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 0b715fc39..f5339c24f 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.v16.GenericVnf;
+import org.onap.aai.inventory.v19.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 f0c844785..3ab823f57 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.v16.RelationshipList;
-import org.onap.aai.inventory.v16.Vlans;
+import org.onap.aai.inventory.v19.RelationshipList;
+import org.onap.aai.inventory.v19.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 8bc2c93ca..421c28803 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.v16.CloudRegion;
-import org.onap.aai.inventory.v16.GenericVnf;
-import org.onap.aai.inventory.v16.L3Network;
-import org.onap.aai.inventory.v16.LogicalLink;
-import org.onap.aai.inventory.v16.PInterface;
-import org.onap.aai.inventory.v16.Pnf;
-import org.onap.aai.inventory.v16.ServiceInstance;
-import org.onap.aai.inventory.v16.Tenant;
-import org.onap.aai.inventory.v16.Vnf;
-import org.onap.aai.inventory.v16.Vserver;
+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;
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 a4f862407..c6365ae1e 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.v16.CloudRegion;
-import org.onap.aai.inventory.v16.Complex;
-import org.onap.aai.inventory.v16.Configuration;
-import org.onap.aai.inventory.v16.GenericVnf;
-import org.onap.aai.inventory.v16.L3InterfaceIpv4AddressList;
-import org.onap.aai.inventory.v16.L3InterfaceIpv6AddressList;
-import org.onap.aai.inventory.v16.L3Network;
-import org.onap.aai.inventory.v16.LInterface;
-//import org.onap.aai.inventory.v16.OwningEntity;
-import org.onap.aai.inventory.v16.Pserver;
-import org.onap.aai.inventory.v16.ServiceInstance;
-import org.onap.aai.inventory.v16.Vnfc;
-import org.onap.aai.inventory.v16.Vserver;
+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;
public class ResultTest {