diff options
author | 2022-03-08 11:01:34 -0500 | |
---|---|---|
committer | 2022-03-08 11:19:56 -0500 | |
commit | 297e65766e3a5cc127549be4e7ca7409cf88ff89 (patch) | |
tree | 7f2b85ac692c6dedbf9f2067d90e3c81d276a610 /adaptors/aai-service/provider/src/test | |
parent | a6665ff61e46c96fc806939c42f553f0a60712a9 (diff) |
Updating AAI schema to v25 inside CCSDK/sli's aai-service-provider adaptor.
Issue-ID: CCSDK-3601
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I3f9ef79bdd72a2fe832d7b1185c123be14953e49
Diffstat (limited to 'adaptors/aai-service/provider/src/test')
9 files changed, 42 insertions, 42 deletions
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 diff --git a/adaptors/aai-service/provider/src/test/resources/aaiclient.properties b/adaptors/aai-service/provider/src/test/resources/aaiclient.properties index 16c6ae2b5..2d773e773 100755 --- a/adaptors/aai-service/provider/src/test/resources/aaiclient.properties +++ b/adaptors/aai-service/provider/src/test/resources/aaiclient.properties @@ -42,34 +42,34 @@ connection.timeout=60000 read.timeout=60000 # aai version -org.onap.ccsdk.sli.adaptors.aai.version=/v24/ +org.onap.ccsdk.sli.adaptors.aai.version=/v25/ # query -org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v24/search/sdn-zone-query -org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v24/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name} -org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v24/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3 +org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v25/search/sdn-zone-query +org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v25/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name} +org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v25/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3 #update -org.onap.ccsdk.sli.adaptors.aai.update=/aai/v24/actions/update +org.onap.ccsdk.sli.adaptors.aai.update=/aai/v25/actions/update # UBB Notify -org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v24/actions/notify +org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v25/actions/notify org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=<%= @ubbUri %>/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=<%= @ubbUri %>/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information # P-Interfaces -org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces -org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces +org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name} # VNF IMAGES -org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v24/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} +org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v25/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} # service instance -org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v24/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance -org.onap.ccsdk.sli.adaptors.aai.path.service.instance=/aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id} +org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v25/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance +org.onap.ccsdk.sli.adaptors.aai.path.service.instance=/aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id} # VNF IMAGES QUERY -org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v24/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} +org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v25/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} # # Formatting |