diff options
Diffstat (limited to 'aai-service/provider/src/main/java/org/onap/ccsdk')
13 files changed, 62 insertions, 62 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 752bd9f3..4b4c439a 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.v14.*; +import org.onap.aai.inventory.v16.*; 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 11f4f653..2aa5c544 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.v14.GenericVnf; -import org.onap.aai.inventory.v14.Image; -import org.onap.aai.inventory.v14.InventoryResponseItem; -import org.onap.aai.inventory.v14.InventoryResponseItems; -import org.onap.aai.inventory.v14.L3Network; -import org.onap.aai.inventory.v14.LogicalLink; -import org.onap.aai.inventory.v14.Metadata; -import org.onap.aai.inventory.v14.Metadatum; -import org.onap.aai.inventory.v14.Pnf; -import org.onap.aai.inventory.v14.RelatedToProperty; -import org.onap.aai.inventory.v14.Relationship; -import org.onap.aai.inventory.v14.RelationshipData; -import org.onap.aai.inventory.v14.RelationshipList; -import org.onap.aai.inventory.v14.ResultData; -import org.onap.aai.inventory.v14.SearchResults; -import org.onap.aai.inventory.v14.ServiceInstance; -import org.onap.aai.inventory.v14.Vlan; -import org.onap.aai.inventory.v14.Vlans; -import org.onap.aai.inventory.v14.Vserver; +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.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, "/v14/"); + relatedLink = relatedLink.replace(VERSION_PATTERN, "/v16/"); 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 0edd09df..42a9369a 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.v14.GenericVnf; +import org.onap.aai.inventory.v16.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, "/v14/"); + return configProperties.getProperty(AAIDeclarations.AAI_VERSION, "/v16/"); } } 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 f83ff8ca..41290c07 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.v14.GenericVnf; -import org.onap.aai.inventory.v14.PhysicalLink; -import org.onap.aai.inventory.v14.ResultData; -import org.onap.aai.inventory.v14.SearchResults; -import org.onap.aai.inventory.v14.Vserver; +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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; 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 e773da52..793fb0f8 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.v14.Relationship; -import org.onap.aai.inventory.v14.RelationshipData; -import org.onap.aai.inventory.v14.RelationshipList; +import org.onap.aai.inventory.v16.Relationship; +import org.onap.aai.inventory.v16.RelationshipData; +import org.onap.aai.inventory.v16.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 07bb69d8..5e8b4345 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.v14.ResultData; +import org.onap.aai.inventory.v16.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 59aba1b8..7c6234e5 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.v14.L3Network; -import org.onap.aai.inventory.v14.L3Networks; +import org.onap.aai.inventory.v16.L3Network; +import org.onap.aai.inventory.v16.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 6b050b5a..b9583593 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.v14.SearchResults; +import org.onap.aai.inventory.v16.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 8cd7a44e..70a7d235 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.v14.RelationshipList; +import org.onap.aai.inventory.v16.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 e26421aa..eb00bee4 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.v14.Relationship; +import org.onap.aai.inventory.v16.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 4879c74c..e947d974 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.v14.RelationshipList; -import org.onap.aai.inventory.v14.Vlans; +import org.onap.aai.inventory.v16.RelationshipList; +import org.onap.aai.inventory.v16.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 b24df92c..4f7d922c 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.v14.CloudRegion; -import org.onap.aai.inventory.v14.GenericVnf; -import org.onap.aai.inventory.v14.L3Network; -import org.onap.aai.inventory.v14.Pnf; -import org.onap.aai.inventory.v14.LogicalLink; -import org.onap.aai.inventory.v14.PInterface; -import org.onap.aai.inventory.v14.ServiceInstance; -import org.onap.aai.inventory.v14.Tenant; -import org.onap.aai.inventory.v14.Vnf; -import org.onap.aai.inventory.v14.Vserver; +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; @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 8a22905d..b0f1b8b5 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.v14.CloudRegion; -import org.onap.aai.inventory.v14.Complex; -import org.onap.aai.inventory.v14.Configuration; -import org.onap.aai.inventory.v14.GenericVnf; -import org.onap.aai.inventory.v14.L3InterfaceIpv4AddressList; -import org.onap.aai.inventory.v14.L3InterfaceIpv6AddressList; -import org.onap.aai.inventory.v14.L3Network; -import org.onap.aai.inventory.v14.LInterface; -//import org.onap.aai.inventory.v14.OwningEntity; -import org.onap.aai.inventory.v14.Pserver; -import org.onap.aai.inventory.v14.ServiceInstance; -import org.onap.aai.inventory.v14.Vnfc; -import org.onap.aai.inventory.v14.Vserver; +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 com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; |