diff options
author | 2018-09-11 11:16:06 +0530 | |
---|---|---|
committer | 2018-09-11 11:16:06 +0530 | |
commit | 3547d659591f07e9e5405462818cb4f776009e76 (patch) | |
tree | c1ad5f9fc9a2e69979ec011a25099cfb90ae5089 /aai-service/provider/src/main/java/org | |
parent | 09f9e070d390f4f6389c1c62b4447a77de400dab (diff) |
Updating aai adapter to v14 model
Updated AAI XSD model to v14 to make new schema's available to SDNC.
Change-Id: I9b282bd23e754e0b8ef39a3013f7240a869fae5f
Issue-ID: CCSDK-324
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
Diffstat (limited to 'aai-service/provider/src/main/java/org')
15 files changed, 65 insertions, 65 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 fd5a6f4b..0200ccbb 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 @@ -26,7 +26,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Map; -import org.openecomp.aai.inventory.v13.*; +import org.onap.aai.inventory.v14.*; 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/AAIClientRESTExecutor.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java index 85e81b54..0050afbc 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java @@ -71,7 +71,7 @@ import org.apache.http.impl.EnglishReasonPhraseCatalog; * The AAIClientRESTExecutor class provides CRUD API for AAI Client service. * @author richtabedzki */ -public class AAIClientRESTExecutor implements AAIExecutorInterface { +public class AAIClientRESTExecutor implements AAIExecutorInterface { private final String truststorePath; private final String truststorePassword; 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 e02caac3..9943589b 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 @@ -57,25 +57,25 @@ import org.onap.ccsdk.sli.adaptors.aai.query.QueryParameters; 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.openecomp.aai.inventory.v13.GenericVnf; -import org.openecomp.aai.inventory.v13.Image; -import org.openecomp.aai.inventory.v13.InventoryResponseItem; -import org.openecomp.aai.inventory.v13.InventoryResponseItems; -import org.openecomp.aai.inventory.v13.L3Network; -import org.openecomp.aai.inventory.v13.LogicalLink; -import org.openecomp.aai.inventory.v13.Metadata; -import org.openecomp.aai.inventory.v13.Metadatum; -import org.openecomp.aai.inventory.v13.Pnf; -import org.openecomp.aai.inventory.v13.RelatedToProperty; -import org.openecomp.aai.inventory.v13.Relationship; -import org.openecomp.aai.inventory.v13.RelationshipData; -import org.openecomp.aai.inventory.v13.RelationshipList; -import org.openecomp.aai.inventory.v13.ResultData; -import org.openecomp.aai.inventory.v13.SearchResults; -import org.openecomp.aai.inventory.v13.ServiceInstance; -import org.openecomp.aai.inventory.v13.Vlan; -import org.openecomp.aai.inventory.v13.Vlans; -import org.openecomp.aai.inventory.v13.Vserver; +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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1264,7 +1264,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("v$", "v13"); + relatedLink = relatedLink.replace("v$", "v14"); relationship.setRelatedLink(relatedLink); } else { Map<String, String> relParams = new HashMap<>(); @@ -1553,7 +1553,7 @@ public abstract class AAIDeclarations implements AAIClient { if (relatedLink != null) { if(relatedLink.contains("v$")) - relatedLink = relatedLink.replace("v$", "v13"); + relatedLink = relatedLink.replace("v$", "v14"); 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 36615d91..7ac9423c 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 @@ -45,7 +45,7 @@ import java.util.Set; import java.util.TreeSet; import org.apache.commons.lang.StringUtils; -import org.openecomp.aai.inventory.v13.GenericVnf; +import org.onap.aai.inventory.v14.GenericVnf; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; 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 02fab585..bfed619c 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 @@ -77,11 +77,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.openecomp.aai.inventory.v13.GenericVnf; -import org.openecomp.aai.inventory.v13.PhysicalLink; -import org.openecomp.aai.inventory.v13.ResultData; -import org.openecomp.aai.inventory.v13.SearchResults; -import org.openecomp.aai.inventory.v13.Vserver; +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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; @@ -582,7 +582,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe /* * (non-Javadoc) - * @see org.openecomp.sdnct.sli.aai.AAIClient#requestVServersData(java.lang.String, java.lang.String) + * @see org.onap.sdnct.sli.aai.AAIClient#requestVServersData(java.lang.String, java.lang.String) */ @Override public Vserver requestVServerData(String tenantId, String vserverId, String cloudOwner, String cloudRegionId) throws AAIServiceException { 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 5c421518..10aec46a 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 @@ -38,9 +38,9 @@ import java.util.Set; import javax.xml.bind.annotation.XmlType; import org.apache.commons.lang.StringUtils; -import org.openecomp.aai.inventory.v13.Relationship; -import org.openecomp.aai.inventory.v13.RelationshipData; -import org.openecomp.aai.inventory.v13.RelationshipList; +import org.onap.aai.inventory.v14.Relationship; +import org.onap.aai.inventory.v14.RelationshipData; +import org.onap.aai.inventory.v14.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 599edd88..51535960 100644 --- 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 @@ -27,7 +27,7 @@ import java.net.URL; import java.util.Properties; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; -import org.openecomp.aai.inventory.v13.ResultData; +import org.onap.aai.inventory.v14.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 7224d00b..7987aefc 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 @@ -35,8 +35,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; -import org.openecomp.aai.inventory.v13.L3Network; -import org.openecomp.aai.inventory.v13.L3Networks; +import org.onap.aai.inventory.v14.L3Network; +import org.onap.aai.inventory.v14.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/NamedQueryRequest.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NamedQueryRequest.java index 8bd6644e..691ae27a 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NamedQueryRequest.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NamedQueryRequest.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Properties; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; -import org.openecomp.aai.inventory.v13.InventoryResponseItems; +import org.onap.aai.inventory.v14.InventoryResponseItems; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; 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 27e4567a..0099e933 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 @@ -27,7 +27,7 @@ import java.net.URL; import java.util.Properties; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; -import org.openecomp.aai.inventory.v13.SearchResults; +import org.onap.aai.inventory.v14.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 eb93fefe..847bdea0 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 @@ -30,7 +30,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.openecomp.aai.inventory.v13.RelationshipList; +import org.onap.aai.inventory.v14.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 76a377ea..9967a50c 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 @@ -32,7 +32,7 @@ import org.apache.http.NameValuePair; import org.apache.http.client.utils.URIBuilder; import org.apache.http.message.BasicNameValuePair; import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; -import org.openecomp.aai.inventory.v13.Relationship; +import org.onap.aai.inventory.v14.Relationship; 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/data/SubInterface.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterface.java index 90aafe7b..4879c74c 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.openecomp.aai.inventory.v13.RelationshipList; -import org.openecomp.aai.inventory.v13.Vlans; +import org.onap.aai.inventory.v14.RelationshipList; +import org.onap.aai.inventory.v14.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 cefb9e33..b24df92c 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.openecomp.aai.inventory.v13.CloudRegion; -import org.openecomp.aai.inventory.v13.GenericVnf; -import org.openecomp.aai.inventory.v13.L3Network; -import org.openecomp.aai.inventory.v13.Pnf; -import org.openecomp.aai.inventory.v13.LogicalLink; -import org.openecomp.aai.inventory.v13.PInterface; -import org.openecomp.aai.inventory.v13.ServiceInstance; -import org.openecomp.aai.inventory.v13.Tenant; -import org.openecomp.aai.inventory.v13.Vnf; -import org.openecomp.aai.inventory.v13.Vserver; +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; @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 d0e25696..8a22905d 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.openecomp.aai.inventory.v13.CloudRegion; -import org.openecomp.aai.inventory.v13.Complex; -import org.openecomp.aai.inventory.v13.Configuration; -import org.openecomp.aai.inventory.v13.GenericVnf; -import org.openecomp.aai.inventory.v13.L3InterfaceIpv4AddressList; -import org.openecomp.aai.inventory.v13.L3InterfaceIpv6AddressList; -import org.openecomp.aai.inventory.v13.L3Network; -import org.openecomp.aai.inventory.v13.LInterface; -//import org.openecomp.aai.inventory.v13.OwningEntity; -import org.openecomp.aai.inventory.v13.Pserver; -import org.openecomp.aai.inventory.v13.ServiceInstance; -import org.openecomp.aai.inventory.v13.Vnfc; -import org.openecomp.aai.inventory.v13.Vserver; +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 com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; |