summaryrefslogtreecommitdiffstats
path: root/adaptors/aai-service/provider/src/main/java
diff options
context:
space:
mode:
authorCheung, Pat (kc1472) <kc1472@att.com>2022-01-14 14:32:42 -0500
committerDan Timoney <dtimoney@att.com>2022-01-18 17:11:30 -0500
commitdb3f905491c6a8f844212a4227281e758d73d333 (patch)
tree1582cd8e2b9345f103de77dbb187a39e0b421046 /adaptors/aai-service/provider/src/main/java
parentbd706ddd865a22aae9319fa246d802c23f6d384b (diff)
AAI schema update
Update AAI adaptor to v25 Issue-ID: CCSDK-3561 Signed-off-by: Cheung, Pat (kc1472) <kc1472@att.com> Change-Id: Ibf63c8fdb7018c707f760ad89af66aacf061b5c1
Diffstat (limited to 'adaptors/aai-service/provider/src/main/java')
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClient.java2
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java79
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIRequest.java4
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java11
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceUtils.java6
-rw-r--r--adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/BulkUpdateRequest.java2
-rw-r--r--adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/DslNaradQueryRequest.java2
-rw-r--r--adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/DslQueryRequest.java2
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericQueryRequest.java2
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequest.java4
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NamedQueryRequest.java2
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NodesQueryRequest.java2
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipListRequest.java2
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipRequest.java2
-rw-r--r--adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/RelatedNode.java22
-rw-r--r--adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterface.java4
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilter.java20
-rwxr-xr-xadaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/Result.java26
18 files changed, 92 insertions, 102 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 a3361523b..fb831a792 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.v24.*;
+import org.onap.aai.inventory.v25.*;
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 46303dddf..170bcb899 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
@@ -63,26 +63,20 @@ import org.onap.ccsdk.sli.adaptors.aai.query.Result;
import org.onap.ccsdk.sli.adaptors.aai.update.BulkUpdateRequestItemBody;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-import org.onap.aai.inventory.v24.GenericVnf;
-import org.onap.aai.inventory.v24.Image;
-import org.onap.aai.inventory.v24.InventoryResponseItem;
-import org.onap.aai.inventory.v24.InventoryResponseItems;
-import org.onap.aai.inventory.v24.L3Network;
-import org.onap.aai.inventory.v24.LogicalLink;
-import org.onap.aai.inventory.v24.Metadata;
-import org.onap.aai.inventory.v24.Metadatum;
-import org.onap.aai.inventory.v24.Pnf;
-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.Subnet;
-import org.onap.aai.inventory.v24.Vlan;
-import org.onap.aai.inventory.v24.Vlans;
-import org.onap.aai.inventory.v24.Vserver;
+import org.onap.aai.inventory.v25.GenericVnf;
+import org.onap.aai.inventory.v25.Image;
+import org.onap.aai.inventory.v25.Metadata;
+import org.onap.aai.inventory.v25.Metadatum;
+import org.onap.aai.inventory.v25.RelatedToProperty;
+import org.onap.aai.inventory.v25.Relationship;
+import org.onap.aai.inventory.v25.RelationshipData;
+import org.onap.aai.inventory.v25.RelationshipList;
+import org.onap.aai.inventory.v25.ResultData;
+import org.onap.aai.inventory.v25.SearchResults;
+import org.onap.aai.inventory.v25.ServiceInstance;
+import org.onap.aai.inventory.v25.Vlan;
+import org.onap.aai.inventory.v25.Vlans;
+import org.onap.aai.inventory.v25.Vserver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -146,7 +140,7 @@ public abstract class AAIDeclarations implements AAIClient {
// aai-specific proxy
public static final String HTTP_PROXY = "org.onap.ccsdk.sli.adaptors.aai.http.proxy";
-
+
private static final String VERSION_PATTERN = "/v$/";
private static final String AAI_SERVICE_EXCEPTION = "AAI Service Exception";
@@ -490,6 +484,7 @@ public abstract class AAIDeclarations implements AAIClient {
}
}
}
+
// params passed
getLogger().debug("parms = "+ Arrays.toString(params.entrySet().toArray()));
@@ -594,7 +589,7 @@ public abstract class AAIDeclarations implements AAIClient {
getLogger().debug("parms = "+ Arrays.toString(params.entrySet().toArray()));
AAIRequest request = AAIRequest.createRequest(resource, nameValues);
-
+
// Special handling for bulk-subnet
if ("bulk-subnet".equals(resource)) {
BulkUpdateRequest bulkUpdateRequest = (BulkUpdateRequest) request;
@@ -607,7 +602,6 @@ public abstract class AAIDeclarations implements AAIClient {
if (!params.containsKey("subnets")) {
throw new SvcLogicException("Missing mandatory parameter subnets for update to bulk-subnet resource");
}
-
if (!params.containsKey("orchestration-status")) {
throw new SvcLogicException("Missing mandatory parameter orchestration-status for update to bulk-subnet resource");
}
@@ -616,19 +610,15 @@ public abstract class AAIDeclarations implements AAIClient {
if ((subnetLengthStr == null) || (subnetLengthStr.length() == 0)) {
throw new SvcLogicException("subnet list length variable "+subnetListVar+"_length is unset");
}
-
String orchestrationStatus = params.get("orchestration-status");
-
BulkUpdateRequestItemBody subnet = new BulkUpdateRequestItemBody();
subnet.setOrchestrationStatus(orchestrationStatus);
-
int subnetLength = Integer.parseInt(subnetLengthStr);
for (int i = 0 ; i < subnetLength ; i++) {
String subnetId = ctx.getAttribute(subnetListVar+".subnet["+i+"].subnet-id");
String subnetPath = networkPath+"/subnets/subnet/"+subnetId+"?depth=1";
bulkUpdateRequest.addUpdate("patch", subnetPath, subnet);
}
-
try {
getExecutor().bulkUpdate(bulkUpdateRequest);
} catch (AAIServiceException e) {
@@ -640,8 +630,6 @@ public abstract class AAIDeclarations implements AAIClient {
// Handling for non-bulk transactions
request = new UpdateRequest(request, params);
-
-
String[] arguments = request.getArgsList();
for(String name : arguments) {
String modifiedKey = name.replaceAll("-", "_");
@@ -1197,7 +1185,7 @@ public abstract class AAIDeclarations implements AAIClient {
newValues.add(tmpValue);
}
if(!newValues.isEmpty()) {
- Method setter = findSetterFor(resourceClass, value);
+ Method setter = findSetterFor(resourceClass, value);
if(setter != null) {
Object o = setter.invoke(instance, newValues);
} else {
@@ -1212,7 +1200,7 @@ public abstract class AAIDeclarations implements AAIClient {
getLogger().warn(AAI_SERVICE_EXCEPTION, nsme);
}
}
- }
+ }
}
set.remove(id);
} else {
@@ -1357,7 +1345,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, "/v24/");
+ relatedLink = relatedLink.replace(VERSION_PATTERN, "/v25/");
relationship.setRelatedLink(relatedLink);
} else {
Map<String, String> relParams = new HashMap<>();
@@ -1565,19 +1553,20 @@ public abstract class AAIDeclarations implements AAIClient {
}
private Method findSetterFor(Class<? extends AAIDatum> resourceClass, String value) {
- try {
- String setterName = "set"+StringUtils.capitalize(value);
- for (Method method : resourceClass.getDeclaredMethods()) {
- int modifiers = method.getModifiers();
- if (Modifier.isPublic(modifiers) && setterName.contentEquals(method.getName())) {
- return method;
- }
- }
- } catch(Exception exc) {
- getLogger().warn("findSetterFor()", exc);
- }
- return null;
- }
+ try {
+ String setterName = "set"+StringUtils.capitalize(value);
+ for (Method method : resourceClass.getDeclaredMethods()) {
+ int modifiers = method.getModifiers();
+ if (Modifier.isPublic(modifiers) && setterName.contentEquals(method.getName())) {
+ return method;
+ }
+ }
+ } catch(Exception exc) {
+ getLogger().warn("findSetterFor()", exc);
+ }
+ return null;
+ }
+
private QueryStatus newModelProcessRelationshipList(Object instance, Map<String, String> params, String prefix, SvcLogicContext ctx) throws Exception {
Class resourceClass = instance.getClass();
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 239342d95..158ddb83d 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.v24.GenericVnf;
+import org.onap.aai.inventory.v25.GenericVnf;
import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -476,6 +476,6 @@ public abstract class AAIRequest {
}
public static final String getSupportedAAIVersion() {
- return configProperties.getProperty(AAIDeclarations.AAI_VERSION, "/v24/");
+ return configProperties.getProperty(AAIDeclarations.AAI_VERSION, "/v25/");
}
}
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 ddd87e111..8e735bff0 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
@@ -75,11 +75,6 @@ import javax.xml.bind.annotation.XmlElement;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringUtils;
-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.ccsdk.sli.adaptors.aai.data.AAIDatum;
import org.onap.ccsdk.sli.adaptors.aai.data.ErrorResponse;
import org.onap.ccsdk.sli.adaptors.aai.data.notify.NotifyEvent;
@@ -89,6 +84,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.v25.GenericVnf;
+import org.onap.aai.inventory.v25.PhysicalLink;
+import org.onap.aai.inventory.v25.ResultData;
+import org.onap.aai.inventory.v25.SearchResults;
+import org.onap.aai.inventory.v25.Vserver;
import org.onap.logging.ref.slf4j.ONAPLogConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -371,6 +371,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
} else {
con = (HttpURLConnection) http_req_url.openConnection();
}
+
// Set up the connection properties
con.setRequestProperty( "Connection", "close" );
con.setDoInput(true);
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 c86e78b53..9c058f3ae 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
@@ -45,9 +45,9 @@ import java.util.regex.Pattern;
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang.StringUtils;
-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.v25.Relationship;
+import org.onap.aai.inventory.v25.RelationshipData;
+import org.onap.aai.inventory.v25.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/BulkUpdateRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/BulkUpdateRequest.java
index a513fc11a..1528808fa 100644
--- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/BulkUpdateRequest.java
+++ b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/BulkUpdateRequest.java
@@ -46,7 +46,7 @@ public class BulkUpdateRequest extends AAIRequest {
public static final String FORMAT = "format";
public BulkUpdateRequest() {
- generic_search_path = "/aai/v24/bulk/single-transaction";
+ generic_search_path = "/aai/v25/bulk/single-transaction";
setRequestObject(new BulkUpdateRequestData());
}
diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/DslNaradQueryRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/DslNaradQueryRequest.java
index c869bdbf8..9d3e5f6e0 100644
--- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/DslNaradQueryRequest.java
+++ b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/DslNaradQueryRequest.java
@@ -48,7 +48,7 @@ public class DslNaradQueryRequest extends AAIRequest {
public DslNaradQueryRequest() {
- generic_search_path = "/narad/v24/dsl";
+ generic_search_path = "/narad/v25/dsl";
}
diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/DslQueryRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/DslQueryRequest.java
index 97a295afb..171ae2152 100644
--- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/DslQueryRequest.java
+++ b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/DslQueryRequest.java
@@ -48,7 +48,7 @@ public class DslQueryRequest extends AAIRequest {
public DslQueryRequest() {
- generic_search_path = "/aai/v24/dsl";
+ generic_search_path = "/aai/v25/dsl";
}
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 42be4cdad..e48b2daf8 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.v24.ResultData;
+import org.onap.aai.inventory.v25.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 25f5f394c..5cdb99d5f 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.v24.L3Network;
-import org.onap.aai.inventory.v24.L3Networks;
+import org.onap.aai.inventory.v25.L3Network;
+import org.onap.aai.inventory.v25.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/NamedQueryRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NamedQueryRequest.java
index 93b3cbbac..4d1661e29 100755
--- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NamedQueryRequest.java
+++ b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NamedQueryRequest.java
@@ -35,7 +35,7 @@ import java.util.List;
import java.util.Properties;
import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
-import org.onap.aai.inventory.v24.InventoryResponseItems;
+import org.onap.aai.inventory.v25.InventoryResponseItems;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
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 b589bdb56..edb972a7f 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.v24.SearchResults;
+import org.onap.aai.inventory.v25.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 d36c925a4..6b13bf326 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.v24.RelationshipList;
+import org.onap.aai.inventory.v25.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 452a936be..40e54eeb8 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.v24.Relationship;
+import org.onap.aai.inventory.v25.Relationship;
public class RelationshipRequest extends GenericRequest {
diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/RelatedNode.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/RelatedNode.java
index c7517eae5..c807d95a8 100644
--- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/RelatedNode.java
+++ b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/RelatedNode.java
@@ -3,17 +3,17 @@ package org.onap.ccsdk.sli.adaptors.aai.data;
import java.util.HashMap;
import java.util.Map;
-import org.onap.aai.inventory.v24.CloudRegion;
-import org.onap.aai.inventory.v24.Configuration;
-import org.onap.aai.inventory.v24.InstanceGroup;
-import org.onap.aai.inventory.v24.L3InterfaceIpv4AddressList;
-import org.onap.aai.inventory.v24.L3InterfaceIpv6AddressList;
-import org.onap.aai.inventory.v24.LInterface;
-import org.onap.aai.inventory.v24.LagInterface;
-import org.onap.aai.inventory.v24.LogicalLink;
-import org.onap.aai.inventory.v24.PInterface;
-import org.onap.aai.inventory.v24.Pnf;
-import org.onap.aai.inventory.v24.ServiceInstance;
+import org.onap.aai.inventory.v25.CloudRegion;
+import org.onap.aai.inventory.v25.Configuration;
+import org.onap.aai.inventory.v25.InstanceGroup;
+import org.onap.aai.inventory.v25.L3InterfaceIpv4AddressList;
+import org.onap.aai.inventory.v25.L3InterfaceIpv6AddressList;
+import org.onap.aai.inventory.v25.LInterface;
+import org.onap.aai.inventory.v25.LagInterface;
+import org.onap.aai.inventory.v25.LogicalLink;
+import org.onap.aai.inventory.v25.PInterface;
+import org.onap.aai.inventory.v25.Pnf;
+import org.onap.aai.inventory.v25.ServiceInstance;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
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 e4b113632..8f0f71d27 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.v24.RelationshipList;
-import org.onap.aai.inventory.v24.Vlans;
+import org.onap.aai.inventory.v25.RelationshipList;
+import org.onap.aai.inventory.v25.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 32c1b19ba..77fa99f5b 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.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;
+import org.onap.aai.inventory.v25.CloudRegion;
+import org.onap.aai.inventory.v25.GenericVnf;
+import org.onap.aai.inventory.v25.L3Network;
+import org.onap.aai.inventory.v25.Pnf;
+import org.onap.aai.inventory.v25.LogicalLink;
+import org.onap.aai.inventory.v25.PInterface;
+import org.onap.aai.inventory.v25.ServiceInstance;
+import org.onap.aai.inventory.v25.Tenant;
+import org.onap.aai.inventory.v25.Vnf;
+import org.onap.aai.inventory.v25.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 367e83b41..b39c5eaa0 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.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 org.onap.aai.inventory.v25.CloudRegion;
+import org.onap.aai.inventory.v25.Complex;
+import org.onap.aai.inventory.v25.Configuration;
+import org.onap.aai.inventory.v25.GenericVnf;
+import org.onap.aai.inventory.v25.L3InterfaceIpv4AddressList;
+import org.onap.aai.inventory.v25.L3InterfaceIpv6AddressList;
+import org.onap.aai.inventory.v25.L3Network;
+import org.onap.aai.inventory.v25.LInterface;
+//import org.onap.aai.inventory.v25.OwningEntity;
+import org.onap.aai.inventory.v25.Pserver;
+import org.onap.aai.inventory.v25.ServiceInstance;
+import org.onap.aai.inventory.v25.Vnfc;
+import org.onap.aai.inventory.v25.Vserver;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;