From 75e70fdc849c5e6d44ae5ff10acb81863f9c5fb4 Mon Sep 17 00:00:00 2001 From: Gaurav Agrawal Date: Thu, 12 Mar 2020 14:43:38 +0530 Subject: 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 --- .../org/onap/ccsdk/sli/adaptors/aai/AAIClient.java | 2 +- .../ccsdk/sli/adaptors/aai/AAIDeclarations.java | 40 +++++++++++----------- .../onap/ccsdk/sli/adaptors/aai/AAIRequest.java | 4 +-- .../onap/ccsdk/sli/adaptors/aai/AAIService.java | 10 +++--- .../ccsdk/sli/adaptors/aai/AAIServiceUtils.java | 6 ++-- .../sli/adaptors/aai/GenericQueryRequest.java | 2 +- .../ccsdk/sli/adaptors/aai/GenericRequest.java | 4 +-- .../ccsdk/sli/adaptors/aai/NodesQueryRequest.java | 2 +- .../sli/adaptors/aai/RelationshipListRequest.java | 2 +- .../sli/adaptors/aai/RelationshipRequest.java | 2 +- .../ccsdk/sli/adaptors/aai/data/SubInterface.java | 4 +-- .../sli/adaptors/aai/query/InstanceFilter.java | 20 +++++------ .../onap/ccsdk/sli/adaptors/aai/query/Result.java | 26 +++++++------- 13 files changed, 62 insertions(+), 62 deletions(-) (limited to 'aai-service/provider/src/main/java') diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClient.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClient.java index 28b4955a4..527c4336d 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClient.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClient.java @@ -30,7 +30,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Map; -import org.onap.aai.inventory.v16.*; +import org.onap.aai.inventory.v19.*; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java index 8b8aaaab6..4066f4620 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java @@ -58,25 +58,25 @@ import org.onap.ccsdk.sli.adaptors.aai.query.FormattedQueryResultList; import org.onap.ccsdk.sli.adaptors.aai.query.Result; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; -import org.onap.aai.inventory.v16.GenericVnf; -import org.onap.aai.inventory.v16.Image; -import org.onap.aai.inventory.v16.InventoryResponseItem; -import org.onap.aai.inventory.v16.InventoryResponseItems; -import org.onap.aai.inventory.v16.L3Network; -import org.onap.aai.inventory.v16.LogicalLink; -import org.onap.aai.inventory.v16.Metadata; -import org.onap.aai.inventory.v16.Metadatum; -import org.onap.aai.inventory.v16.Pnf; -import org.onap.aai.inventory.v16.RelatedToProperty; -import org.onap.aai.inventory.v16.Relationship; -import org.onap.aai.inventory.v16.RelationshipData; -import org.onap.aai.inventory.v16.RelationshipList; -import org.onap.aai.inventory.v16.ResultData; -import org.onap.aai.inventory.v16.SearchResults; -import org.onap.aai.inventory.v16.ServiceInstance; -import org.onap.aai.inventory.v16.Vlan; -import org.onap.aai.inventory.v16.Vlans; -import org.onap.aai.inventory.v16.Vserver; +import org.onap.aai.inventory.v19.GenericVnf; +import org.onap.aai.inventory.v19.Image; +import org.onap.aai.inventory.v19.InventoryResponseItem; +import org.onap.aai.inventory.v19.InventoryResponseItems; +import org.onap.aai.inventory.v19.L3Network; +import org.onap.aai.inventory.v19.LogicalLink; +import org.onap.aai.inventory.v19.Metadata; +import org.onap.aai.inventory.v19.Metadatum; +import org.onap.aai.inventory.v19.Pnf; +import org.onap.aai.inventory.v19.RelatedToProperty; +import org.onap.aai.inventory.v19.Relationship; +import org.onap.aai.inventory.v19.RelationshipData; +import org.onap.aai.inventory.v19.RelationshipList; +import org.onap.aai.inventory.v19.ResultData; +import org.onap.aai.inventory.v19.SearchResults; +import org.onap.aai.inventory.v19.ServiceInstance; +import org.onap.aai.inventory.v19.Vlan; +import org.onap.aai.inventory.v19.Vlans; +import org.onap.aai.inventory.v19.Vserver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1265,7 +1265,7 @@ public abstract class AAIDeclarations implements AAIClient { getLogger().debug("About to process related link of {}", relatedLink); if(relatedLink != null) { if(relatedLink.contains("v$")) - relatedLink = relatedLink.replace(VERSION_PATTERN, "/v16/"); + relatedLink = relatedLink.replace(VERSION_PATTERN, "/v19/"); relationship.setRelatedLink(relatedLink); } else { Map relParams = new HashMap<>(); diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIRequest.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIRequest.java index 42a9369a1..9f0a7ffb5 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIRequest.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIRequest.java @@ -51,7 +51,7 @@ import java.util.Set; import java.util.TreeSet; import org.apache.commons.lang.StringUtils; -import org.onap.aai.inventory.v16.GenericVnf; +import org.onap.aai.inventory.v19.GenericVnf; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -473,6 +473,6 @@ public abstract class AAIRequest { } public static final String getSupportedAAIVersion() { - return configProperties.getProperty(AAIDeclarations.AAI_VERSION, "/v16/"); + return configProperties.getProperty(AAIDeclarations.AAI_VERSION, "/v19/"); } } diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java index c0dc5696b..d5c72738c 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java @@ -81,11 +81,11 @@ import org.onap.ccsdk.sli.core.sli.MetricLogger; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicResource; -import org.onap.aai.inventory.v16.GenericVnf; -import org.onap.aai.inventory.v16.PhysicalLink; -import org.onap.aai.inventory.v16.ResultData; -import org.onap.aai.inventory.v16.SearchResults; -import org.onap.aai.inventory.v16.Vserver; +import org.onap.aai.inventory.v19.GenericVnf; +import org.onap.aai.inventory.v19.PhysicalLink; +import org.onap.aai.inventory.v19.ResultData; +import org.onap.aai.inventory.v19.SearchResults; +import org.onap.aai.inventory.v19.Vserver; import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceUtils.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceUtils.java index 793fb0f8f..722426503 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceUtils.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceUtils.java @@ -43,9 +43,9 @@ import java.util.Set; import javax.xml.bind.annotation.XmlType; import org.apache.commons.lang.StringUtils; -import org.onap.aai.inventory.v16.Relationship; -import org.onap.aai.inventory.v16.RelationshipData; -import org.onap.aai.inventory.v16.RelationshipList; +import org.onap.aai.inventory.v19.Relationship; +import org.onap.aai.inventory.v19.RelationshipData; +import org.onap.aai.inventory.v19.RelationshipList; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.slf4j.Logger; diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericQueryRequest.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericQueryRequest.java index 5e8b4345d..e30c913b7 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericQueryRequest.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericQueryRequest.java @@ -32,7 +32,7 @@ import java.net.URL; import java.util.Properties; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; -import org.onap.aai.inventory.v16.ResultData; +import org.onap.aai.inventory.v19.ResultData; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequest.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequest.java index 7f15c03f5..3a5fb9bfc 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequest.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequest.java @@ -40,8 +40,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; -import org.onap.aai.inventory.v16.L3Network; -import org.onap.aai.inventory.v16.L3Networks; +import org.onap.aai.inventory.v19.L3Network; +import org.onap.aai.inventory.v19.L3Networks; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NodesQueryRequest.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NodesQueryRequest.java index b95835937..61238af17 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NodesQueryRequest.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NodesQueryRequest.java @@ -32,7 +32,7 @@ import java.net.URL; import java.util.Properties; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; -import org.onap.aai.inventory.v16.SearchResults; +import org.onap.aai.inventory.v19.SearchResults; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipListRequest.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipListRequest.java index 70a7d2357..5ee19d46d 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipListRequest.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipListRequest.java @@ -33,7 +33,7 @@ import java.util.List; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URIBuilder; import org.apache.http.message.BasicNameValuePair; -import org.onap.aai.inventory.v16.RelationshipList; +import org.onap.aai.inventory.v19.RelationshipList; public class RelationshipListRequest extends GenericRequest { diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipRequest.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipRequest.java index eb00bee42..1c70031c3 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipRequest.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipRequest.java @@ -35,7 +35,7 @@ import org.apache.http.NameValuePair; import org.apache.http.client.utils.URIBuilder; import org.apache.http.message.BasicNameValuePair; -import org.onap.aai.inventory.v16.Relationship; +import org.onap.aai.inventory.v19.Relationship; public class RelationshipRequest extends GenericRequest { diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterface.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterface.java index e947d9741..e58662421 100644 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterface.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterface.java @@ -31,8 +31,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; -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; @JsonInclude(JsonInclude.Include.NON_NULL) @Generated("org.jsonschema2pojo") diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilter.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilter.java index 4f7d922c4..82ba0108f 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilter.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilter.java @@ -33,16 +33,16 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; -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.Pnf; -import org.onap.aai.inventory.v16.LogicalLink; -import org.onap.aai.inventory.v16.PInterface; -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.Pnf; +import org.onap.aai.inventory.v19.LogicalLink; +import org.onap.aai.inventory.v19.PInterface; +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; @JsonInclude(JsonInclude.Include.NON_NULL) @Generated("org.jsonschema2pojo") diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/Result.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/Result.java index b0f1b8b59..794effed7 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/Result.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/Result.java @@ -30,19 +30,19 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -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; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; -- cgit 1.2.3-korg