diff options
Diffstat (limited to 'aai-service/provider/src/main/java/org/onap')
13 files changed, 57 insertions, 57 deletions
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 527c4336..5390d45d 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.v19.*; +import org.onap.aai.inventory.v21.*; 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 dadcca4f..6765e152 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 @@ -60,20 +60,20 @@ 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.v19.GenericVnf; -import org.onap.aai.inventory.v19.Image; -import org.onap.aai.inventory.v19.Metadata; -import org.onap.aai.inventory.v19.Metadatum; -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.onap.aai.inventory.v21.GenericVnf; +import org.onap.aai.inventory.v21.Image; +import org.onap.aai.inventory.v21.Metadata; +import org.onap.aai.inventory.v21.Metadatum; +import org.onap.aai.inventory.v21.RelatedToProperty; +import org.onap.aai.inventory.v21.Relationship; +import org.onap.aai.inventory.v21.RelationshipData; +import org.onap.aai.inventory.v21.RelationshipList; +import org.onap.aai.inventory.v21.ResultData; +import org.onap.aai.inventory.v21.SearchResults; +import org.onap.aai.inventory.v21.ServiceInstance; +import org.onap.aai.inventory.v21.Vlan; +import org.onap.aai.inventory.v21.Vlans; +import org.onap.aai.inventory.v21.Vserver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1288,7 +1288,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, "/v19/"); + relatedLink = relatedLink.replace(VERSION_PATTERN, "/v21/"); relationship.setRelatedLink(relatedLink); } else { Map<String, String> 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 b1f6743d..0515218b 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.v19.GenericVnf; +import org.onap.aai.inventory.v21.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, "/v19/"); + return configProperties.getProperty(AAIDeclarations.AAI_VERSION, "/v21/"); } } 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 d5c72738..4d51550a 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.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.aai.inventory.v21.GenericVnf; +import org.onap.aai.inventory.v21.PhysicalLink; +import org.onap.aai.inventory.v21.ResultData; +import org.onap.aai.inventory.v21.SearchResults; +import org.onap.aai.inventory.v21.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 72242650..b3ee7474 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.v19.Relationship; -import org.onap.aai.inventory.v19.RelationshipData; -import org.onap.aai.inventory.v19.RelationshipList; +import org.onap.aai.inventory.v21.Relationship; +import org.onap.aai.inventory.v21.RelationshipData; +import org.onap.aai.inventory.v21.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 e30c913b..29fe24ef 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.v19.ResultData; +import org.onap.aai.inventory.v21.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 3a5fb9bf..604dd0e5 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.v19.L3Network; -import org.onap.aai.inventory.v19.L3Networks; +import org.onap.aai.inventory.v21.L3Network; +import org.onap.aai.inventory.v21.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 61238af1..c40d96ca 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.v19.SearchResults; +import org.onap.aai.inventory.v21.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 5ee19d46..751fe5d5 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.v19.RelationshipList; +import org.onap.aai.inventory.v21.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 1c70031c..fa71d6f2 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.v19.Relationship; +import org.onap.aai.inventory.v21.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 e5866242..7c66daa6 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.v19.RelationshipList; -import org.onap.aai.inventory.v19.Vlans; +import org.onap.aai.inventory.v21.RelationshipList; +import org.onap.aai.inventory.v21.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 82ba0108..48ada1fa 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.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; +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.Pnf; +import org.onap.aai.inventory.v21.LogicalLink; +import org.onap.aai.inventory.v21.PInterface; +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; @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 794effed..1f8a1755 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.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 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 com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; |