diff options
Diffstat (limited to 'adaptors/aai-service/provider/src/main/java/org/onap/ccsdk')
13 files changed, 57 insertions, 57 deletions
diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClient.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClient.java index 5390d45de..7fd2dfe76 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClient.java +++ b/adaptors/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.v21.*; +import org.onap.aai.inventory.v24.*; 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/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java index ef823a690..aca1e6b81 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java +++ b/adaptors/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.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.onap.aai.inventory.v24.GenericVnf; +import org.onap.aai.inventory.v24.Image; +import org.onap.aai.inventory.v24.Metadata; +import org.onap.aai.inventory.v24.Metadatum; +import org.onap.aai.inventory.v24.RelatedToProperty; +import org.onap.aai.inventory.v24.Relationship; +import org.onap.aai.inventory.v24.RelationshipData; +import org.onap.aai.inventory.v24.RelationshipList; +import org.onap.aai.inventory.v24.ResultData; +import org.onap.aai.inventory.v24.SearchResults; +import org.onap.aai.inventory.v24.ServiceInstance; +import org.onap.aai.inventory.v24.Vlan; +import org.onap.aai.inventory.v24.Vlans; +import org.onap.aai.inventory.v24.Vserver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1286,7 +1286,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, "/v21/"); + relatedLink = relatedLink.replace(VERSION_PATTERN, "/v24/"); relationship.setRelatedLink(relatedLink); } else { Map<String, String> relParams = new HashMap<>(); diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIRequest.java index b38e75195..e9fa9e67e 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIRequest.java +++ b/adaptors/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.v21.GenericVnf; +import org.onap.aai.inventory.v24.GenericVnf; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.onap.ccsdk.sli.core.utils.common.EnvProperties; import org.osgi.framework.Bundle; @@ -489,6 +489,6 @@ public abstract class AAIRequest { } public static final String getSupportedAAIVersion() { - return configProperties.getProperty(AAIDeclarations.AAI_VERSION, "/v21/"); + return configProperties.getProperty(AAIDeclarations.AAI_VERSION, "/v24/"); } } diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java index 747688746..0039aa0fe 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java +++ b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java @@ -82,11 +82,11 @@ 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.ccsdk.sli.core.utils.common.EnvProperties; -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.aai.inventory.v24.GenericVnf; +import org.onap.aai.inventory.v24.PhysicalLink; +import org.onap.aai.inventory.v24.ResultData; +import org.onap.aai.inventory.v24.SearchResults; +import org.onap.aai.inventory.v24.Vserver; import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceUtils.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceUtils.java index b3ee7474d..3c8668aee 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceUtils.java +++ b/adaptors/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.v21.Relationship; -import org.onap.aai.inventory.v21.RelationshipData; -import org.onap.aai.inventory.v21.RelationshipList; +import org.onap.aai.inventory.v24.Relationship; +import org.onap.aai.inventory.v24.RelationshipData; +import org.onap.aai.inventory.v24.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/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericQueryRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericQueryRequest.java index 29fe24ef2..857edacf3 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericQueryRequest.java +++ b/adaptors/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.v21.ResultData; +import org.onap.aai.inventory.v24.ResultData; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequest.java index 604dd0e5c..25f5f394c 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequest.java +++ b/adaptors/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.v21.L3Network; -import org.onap.aai.inventory.v21.L3Networks; +import org.onap.aai.inventory.v24.L3Network; +import org.onap.aai.inventory.v24.L3Networks; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NodesQueryRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NodesQueryRequest.java index c40d96cad..6db9434e4 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NodesQueryRequest.java +++ b/adaptors/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.v21.SearchResults; +import org.onap.aai.inventory.v24.SearchResults; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipListRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipListRequest.java index 751fe5d59..d36c925a4 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipListRequest.java +++ b/adaptors/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.v21.RelationshipList; +import org.onap.aai.inventory.v24.RelationshipList; public class RelationshipListRequest extends GenericRequest { diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipRequest.java index fa71d6f22..452a936be 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipRequest.java +++ b/adaptors/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.v21.Relationship; +import org.onap.aai.inventory.v24.Relationship; public class RelationshipRequest extends GenericRequest { diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterface.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterface.java index 7c66daa62..e4b113632 100644 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterface.java +++ b/adaptors/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.v21.RelationshipList; -import org.onap.aai.inventory.v21.Vlans; +import org.onap.aai.inventory.v24.RelationshipList; +import org.onap.aai.inventory.v24.Vlans; @JsonInclude(JsonInclude.Include.NON_NULL) @Generated("org.jsonschema2pojo") diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilter.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilter.java index 48ada1fa9..32c1b19ba 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilter.java +++ b/adaptors/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.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; +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.Pnf; +import org.onap.aai.inventory.v24.LogicalLink; +import org.onap.aai.inventory.v24.PInterface; +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; @JsonInclude(JsonInclude.Include.NON_NULL) @Generated("org.jsonschema2pojo") diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/Result.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/Result.java index 1f8a17551..367e83b41 100755 --- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/Result.java +++ b/adaptors/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.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 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 com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; |