Revert "AAI schema update"

This reverts commit db3f905491c6a8f844212a4227281e758d73d333.

Issue-ID: CCSDK-3601
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: Ic51d815dc095288459ea6200e70b1c14d211e41b

31 files changed, 545 insertions, 499 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 fb831a792..a3361523b 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.v25.*;
+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 170bcb899..46303dddf 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,20 +63,26 @@ 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.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.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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -140,7 +146,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";
@@ -484,7 +490,6 @@ public abstract class AAIDeclarations implements AAIClient {
         		}
         	}
         }
-
         // params passed
         getLogger().debug("parms = "+ Arrays.toString(params.entrySet().toArray()));
 
@@ -589,7 +594,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;
@@ -602,6 +607,7 @@ 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");
             }
@@ -610,15 +616,19 @@ 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) {
@@ -630,6 +640,8 @@ 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("-", "_");
@@ -1185,7 +1197,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 {
@@ -1200,7 +1212,7 @@ public abstract class AAIDeclarations implements AAIClient {
                                                 getLogger().warn(AAI_SERVICE_EXCEPTION, nsme);
                                             }
                                         }
-                                        }
+                                    }
                                     }
                                     set.remove(id);
                                 } else {
@@ -1345,7 +1357,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, "/v25/");
+                            relatedLink = relatedLink.replace(VERSION_PATTERN, "/v24/");
                         relationship.setRelatedLink(relatedLink);
                     } else {
                         Map<String, String> relParams = new HashMap<>();
@@ -1553,20 +1565,19 @@ 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 158ddb83d..239342d95 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.v25.GenericVnf;
+import org.onap.aai.inventory.v24.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, "/v25/");
+        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 8e735bff0..ddd87e111 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,6 +75,11 @@ 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;
@@ -84,11 +89,6 @@ 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,7 +371,6 @@ 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 9c058f3ae..c86e78b53 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.v25.Relationship;
-import org.onap.aai.inventory.v25.RelationshipData;
-import org.onap.aai.inventory.v25.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/BulkUpdateRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/BulkUpdateRequest.java
index 1528808fa..a513fc11a 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/v25/bulk/single-transaction";
+		generic_search_path = "/aai/v24/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 9d3e5f6e0..c869bdbf8 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/v25/dsl";
+		generic_search_path = "/narad/v24/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 171ae2152..97a295afb 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/v25/dsl";
+		generic_search_path = "/aai/v24/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 e48b2daf8..42be4cdad 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.v25.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 5cdb99d5f..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.v25.L3Network;
-import org.onap.aai.inventory.v25.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/NamedQueryRequest.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/NamedQueryRequest.java
index 4d1661e29..93b3cbbac 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.v25.InventoryResponseItems;
+import org.onap.aai.inventory.v24.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 edb972a7f..b589bdb56 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.v25.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 6b13bf326..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.v25.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 40e54eeb8..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.v25.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/RelatedNode.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/data/RelatedNode.java
index c807d95a8..c7517eae5 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.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 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 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 8f0f71d27..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.v25.RelationshipList;
-import org.onap.aai.inventory.v25.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 77fa99f5b..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.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;
+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 b39c5eaa0..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.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 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;
diff --git a/adaptors/aai-service/provider/src/main/resources/aai-path.properties b/adaptors/aai-service/provider/src/main/resources/aai-path.properties
index 2259b05f3..ae41571dc 100755
--- a/adaptors/aai-service/provider/src/main/resources/aai-path.properties
+++ b/adaptors/aai-service/provider/src/main/resources/aai-path.properties
@@ -19,357 +19,393 @@
 # ============LICENSE_END=========================================================
 ###
 
-cloud-regions = /aai/v25/cloud-infrastructure/cloud-regions
-cloud-region = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}
-cloud-region|availability-zones = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/availability-zones
-cloud-region|availability-zone = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/availability-zones/availability-zone/{availability-zone-name}
-cloud-region|dvs-switches = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches
-cloud-region|dvs-switch = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name}
-cloud-region|flavors = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors
-cloud-region|flavor = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}
-cloud-region|flavor|hpa-capabilities = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities
-cloud-region|flavor|hpa-capability = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}
-cloud-region|flavor|hpa-capability|hpa-feature-attributes = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}
-cloud-region|group-assignments = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments
-cloud-region|group-assignment = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}
-cloud-region|hpa-capabilities = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities
-cloud-region|hpa-capability = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}
-cloud-region|hpa-capability|hpa-feature-attributes = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}
-cloud-region|images = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images
-cloud-region|image = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}
-cloud-region|image|metadata = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}/metadata
-cloud-region|image|metadatum = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}/metadata/metadatum/{metaname}
-cloud-region|oam-networks = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/oam-networks
-cloud-region|oam-network = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/oam-networks/oam-network/{network-uuid}
-cloud-region|snapshots = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/snapshots
-cloud-region|snapshot = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/snapshots/snapshot/{snapshot-id}
-cloud-region|tenants = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants
-cloud-region|tenant = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}
-cloud-region|tenant|nos-servers = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/nos-servers
-cloud-region|tenant|nos-server = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/nos-servers/nos-server/{nos-server-id}
-cloud-region|tenant|vservers = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers
-cloud-region|tenant|vserver = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}
-cloud-region|tenant|vserver|l-interfaces = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces
-cloud-region|tenant|vserver|l-interface = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}
-cloud-region|tenant|vserver|l-interface|l3-interface-ipv4-address-list = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-cloud-region|tenant|vserver|l-interface|l3-interface-ipv6-address-list = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-cloud-region|tenant|vserver|l-interface|sriov-vfs = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/sriov-vfs
-cloud-region|tenant|vserver|l-interface|sriov-vf = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
-cloud-region|tenant|vserver|l-interface|vlans = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans
-cloud-region|tenant|vserver|l-interface|vlan = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
-cloud-region|tenant|vserver|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-cloud-region|tenant|vserver|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-cloud-region|tenant|vserver|volumes = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/volumes
-cloud-region|tenant|vserver|volume = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/volumes/volume/{volume-id}
-cloud-region|vip-ipv4-address-list = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/vip-ipv4-address-list/{vip-ipv4-address}
-cloud-region|vip-ipv6-address-list = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/vip-ipv6-address-list/{vip-ipv6-address}
-cloud-region|volume-groups = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/volume-groups
-cloud-region|volume-group = /aai/v25/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/volume-groups/volume-group/{volume-group-id}
-complexes = /aai/v25/cloud-infrastructure/complexes
-complex = /aai/v25/cloud-infrastructure/complexes/complex/{physical-location-id}
-complex|ctag-pools = /aai/v25/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools
-complex|ctag-pool = /aai/v25/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}
-network-profiles = /aai/v25/cloud-infrastructure/network-profiles
-network-profile = /aai/v25/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}
-network-technologies = /aai/v25/cloud-infrastructure/network-technologies
-network-technology = /aai/v25/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}
-operational-environments = /aai/v25/cloud-infrastructure/operational-environments
-operational-environment = /aai/v25/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}
-pservers = /aai/v25/cloud-infrastructure/pservers
-pserver = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}
-pserver|lag-interfaces = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces
-pserver|lag-interface = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}
-pserver|lag-interface|l-interfaces = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces
-pserver|lag-interface|l-interface = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
-pserver|lag-interface|l-interface|l3-interface-ipv4-address-list = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-pserver|lag-interface|l-interface|l3-interface-ipv6-address-list = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-pserver|lag-interface|l-interface|sriov-vfs = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
-pserver|lag-interface|l-interface|sriov-vf = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
-pserver|lag-interface|l-interface|vlans = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
-pserver|lag-interface|l-interface|vlan = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
-pserver|lag-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-pserver|lag-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-pserver|p-interfaces = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces
-pserver|p-interface = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}
-pserver|p-interface|l-interfaces = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces
-pserver|p-interface|l-interface = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
-pserver|p-interface|l-interface|l3-interface-ipv4-address-list = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-pserver|p-interface|l-interface|l3-interface-ipv6-address-list = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-pserver|p-interface|l-interface|sriov-vfs = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
-pserver|p-interface|l-interface|sriov-vf = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
-pserver|p-interface|l-interface|vlans = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
-pserver|p-interface|l-interface|vlan = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
-pserver|p-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-pserver|p-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-pserver|p-interface|sriov-pfs = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/sriov-pfs
-pserver|p-interface|sriov-pf = /aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/sriov-pfs/sriov-pf/{pf-pci-id}
-virtual-data-centers = /aai/v25/cloud-infrastructure/virtual-data-centers
-virtual-data-center = /aai/v25/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}
-connectors = /aai/v25/business/connectors
-connector = /aai/v25/business/connectors/connector/{resource-instance-id}
-connector|metadata = /aai/v25/business/connectors/connector/{resource-instance-id}/metadata
-connector|metadatum = /aai/v25/business/connectors/connector/{resource-instance-id}/metadata/metadatum/{metaname}
-customers = /aai/v25/business/customers
-customer = /aai/v25/business/customers/customer/{global-customer-id}
-customer|service-subscriptions = /aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions
-customer|service-subscription = /aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}
-customer|service-subscription|service-instances = /aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances
-customer|service-subscription|service-instance = /aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}
-customer|service-subscription|service-instance|allotted-resources = /aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/allotted-resources
-customer|service-subscription|service-instance|allotted-resource = /aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/allotted-resources/allotted-resource/{id}
-customer|service-subscription|service-instance|allotted-resource|tunnel-xconnects = /aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/allotted-resources/allotted-resource/{id}/tunnel-xconnects
-customer|service-subscription|service-instance|allotted-resource|tunnel-xconnect = /aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/allotted-resources/allotted-resource/{id}/tunnel-xconnects/tunnel-xconnect/{id}
-customer|service-subscription|service-instance|metadata = /aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/metadata
-customer|service-subscription|service-instance|metadatum = /aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/metadata/metadatum/{metaname}
-collections = /aai/v25/network/collections
-collection = /aai/v25/network/collections/collection/{collection-id}
-configurations = /aai/v25/network/configurations
-configuration = /aai/v25/network/configurations/configuration/{configuration-id}
-configuration|evcs = /aai/v25/network/configurations/configuration/{configuration-id}/evcs
-configuration|evc = /aai/v25/network/configurations/configuration/{configuration-id}/evcs/evc/{evc-id}
-configuration|forwarder-evcs = /aai/v25/network/configurations/configuration/{configuration-id}/forwarder-evcs
-configuration|forwarder-evc = /aai/v25/network/configurations/configuration/{configuration-id}/forwarder-evcs/forwarder-evc/{forwarder-evc-id}
-configuration|forwarder-evc|vlan-mappings = /aai/v25/network/configurations/configuration/{configuration-id}/forwarder-evcs/forwarder-evc/{forwarder-evc-id}/vlan-mappings
-configuration|forwarder-evc|vlan-mapping = /aai/v25/network/configurations/configuration/{configuration-id}/forwarder-evcs/forwarder-evc/{forwarder-evc-id}/vlan-mappings/vlan-mapping/{vlan-mapping-id}
-configuration|metadata = /aai/v25/network/configurations/configuration/{configuration-id}/metadata
-configuration|metadatum = /aai/v25/network/configurations/configuration/{configuration-id}/metadata/metadatum/{metaname}
-connectivities = /aai/v25/network/connectivities
-connectivity = /aai/v25/network/connectivities/connectivity/{connectivity-id}
-devices = /aai/v25/network/devices
-device = /aai/v25/network/devices/device/{device-id}
-esr-thirdparty-sdnc = /aai/v25/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}
-esr-thirdparty-sdnc-list = /aai/v25/external-system/esr-thirdparty-sdnc-list
-forwarding-paths = /aai/v25/network/forwarding-paths
-forwarding-path = /aai/v25/network/forwarding-paths/forwarding-path/{forwarding-path-id}
-forwarding-path|forwarders = /aai/v25/network/forwarding-paths/forwarding-path/{forwarding-path-id}/forwarders
-forwarding-path|forwarder = /aai/v25/network/forwarding-paths/forwarding-path/{forwarding-path-id}/forwarders/forwarder/{sequence}
-generic-vnfs = /aai/v25/network/generic-vnfs
-generic-vnf = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}
-generic-vnf|entitlements = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/entitlements
-generic-vnf|entitlement = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/entitlements/entitlement/{group-uuid}/{resource-uuid}
-generic-vnf|l-interfaces = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces
-generic-vnf|l-interface = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}
-generic-vnf|l-interface|l3-interface-ipv4-address-list = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-generic-vnf|l-interface|l3-interface-ipv6-address-list = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-generic-vnf|l-interface|sriov-vfs = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/sriov-vfs
-generic-vnf|l-interface|sriov-vf = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
-generic-vnf|l-interface|vlans = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans
-generic-vnf|l-interface|vlan = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
-generic-vnf|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-generic-vnf|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-generic-vnf|lag-interfaces = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces
-generic-vnf|lag-interface = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}
-generic-vnf|lag-interface|l-interfaces = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces
-generic-vnf|lag-interface|l-interface = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
-generic-vnf|lag-interface|l-interface|l3-interface-ipv4-address-list = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-generic-vnf|lag-interface|l-interface|l3-interface-ipv6-address-list = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-generic-vnf|lag-interface|l-interface|sriov-vfs = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
-generic-vnf|lag-interface|l-interface|sriov-vf = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
-generic-vnf|lag-interface|l-interface|vlans = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
-generic-vnf|lag-interface|l-interface|vlan = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
-generic-vnf|lag-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-generic-vnf|lag-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-generic-vnf|licenses = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/licenses
-generic-vnf|license = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/licenses/license/{group-uuid}/{resource-uuid}
-generic-vnf|vf-modules = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/vf-modules
-generic-vnf|vf-module = /aai/v25/network/generic-vnfs/generic-vnf/{vnf-id}/vf-modules/vf-module/{vf-module-id}
-instance-groups = /aai/v25/network/instance-groups
-instance-group = /aai/v25/network/instance-groups/instance-group/{id}
-interlayer-attachments = /aai/v25/network/interlayer-attachments
-interlayer-attachment = /aai/v25/network/interlayer-attachments/interlayer-attachment/{id}
-ipsec-configurations = /aai/v25/network/ipsec-configurations
-ipsec-configuration = /aai/v25/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}
-ipsec-configuration|vig-servers = /aai/v25/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/vig-servers
-ipsec-configuration|vig-server = /aai/v25/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/vig-servers/vig-server/{vig-address-type}
-l3-networks = /aai/v25/network/l3-networks
-l3-network = /aai/v25/network/l3-networks/l3-network/{network-id}
-l3-network|aggregate-routes = /aai/v25/network/l3-networks/l3-network/{network-id}/aggregate-routes
-l3-network|aggregate-route = /aai/v25/network/l3-networks/l3-network/{network-id}/aggregate-routes/aggregate-route/{route-id}
-l3-network|ctag-assignments = /aai/v25/network/l3-networks/l3-network/{network-id}/ctag-assignments
-l3-network|ctag-assignment = /aai/v25/network/l3-networks/l3-network/{network-id}/ctag-assignments/ctag-assignment/{vlan-id-inner}
-l3-network|segmentation-assignments = /aai/v25/network/l3-networks/l3-network/{network-id}/segmentation-assignments
-l3-network|segmentation-assignment = /aai/v25/network/l3-networks/l3-network/{network-id}/segmentation-assignments/segmentation-assignment/{segmentation-id}
-l3-network|subnets = /aai/v25/network/l3-networks/l3-network/{network-id}/subnets
-l3-network|subnet = /aai/v25/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id}
-l3-network|subnet|host-routes = /aai/v25/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id}/host-routes
-l3-network|subnet|host-route = /aai/v25/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id}/host-routes/host-route/{host-route-id}
-label-restrictions = /aai/v25/network/label-restrictions
-label-restriction = /aai/v25/network/label-restrictions/label-restriction/{id}
-lag-links = /aai/v25/network/lag-links
-lag-link = /aai/v25/network/lag-links/lag-link/{link-name}
-lines-of-business = /aai/v25/business/lines-of-business
-line-of-business = /aai/v25/business/lines-of-business/line-of-business/{line-of-business-name}
-logical-links = /aai/v25/network/logical-links
-logical-link = /aai/v25/network/logical-links/logical-link/{link-name}
-models = /aai/v25/service-design-and-creation/models
-model = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}
-model|model-vers = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}/model-vers
-model|model-ver = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}
-model|model-ver|metadata = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/metadata
-model|model-ver|metadatum = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/metadata/metadatum/{metaname}
-model|model-ver|model-elements = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements
-model|model-ver|model-element = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}
-model|model-ver|model-element|model-constraints = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints
-model|model-ver|model-element|model-constraint = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}
-model|model-ver|model-element|model-constraint|constrained-element-sets = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets
-model|model-ver|model-element|model-constraint|constrained-element-set = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}
-model|model-ver|model-element|model-constraint|constrained-element-set|element-choice-sets = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}/element-choice-sets
-model|model-ver|model-element|model-constraint|constrained-element-set|element-choice-set = /aai/v25/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}/element-choice-sets/element-choice-set/{element-choice-set-uuid}
-multicast-configurations = /aai/v25/network/multicast-configurations
-multicast-configuration = /aai/v25/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}
-named-queries = /aai/v25/service-design-and-creation/named-queries
-named-query = /aai/v25/service-design-and-creation/named-queries/named-query/{named-query-uuid}
-named-query|named-query-elements = /aai/v25/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements
-named-query|named-query-element = /aai/v25/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}
-named-query|named-query-element|property-constraints = /aai/v25/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/property-constraints
-named-query|named-query-element|property-constraint = /aai/v25/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/property-constraints/property-constraint/{property-constraint-uuid}
-named-query|named-query-element|related-lookups = /aai/v25/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/related-lookups
-named-query|named-query-element|related-lookup = /aai/v25/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/related-lookups/related-lookup/{related-lookup-uuid}
-network-policies = /aai/v25/network/network-policies
-network-policy = /aai/v25/network/network-policies/network-policy/{network-policy-id}
-network-resources = /aai/v25/network/network-resources
-network-resource = /aai/v25/network/network-resources/network-resource/{network-id}
-newvces = /aai/v25/network/newvces
-newvce = /aai/v25/network/newvces/newvce/{vnf-id2}
-newvce|l-interfaces = /aai/v25/network/newvces/newvce/{vnf-id2}/l-interfaces
-newvce|l-interface = /aai/v25/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}
-newvce|l-interface|l3-interface-ipv4-address-list = /aai/v25/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-newvce|l-interface|l3-interface-ipv6-address-list = /aai/v25/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-newvce|l-interface|sriov-vfs = /aai/v25/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/sriov-vfs
-newvce|l-interface|sriov-vf = /aai/v25/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
-newvce|l-interface|vlans = /aai/v25/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans
-newvce|l-interface|vlan = /aai/v25/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
-newvce|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v25/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-newvce|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v25/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-owning-entities = /aai/v25/business/owning-entities
-owning-entity = /aai/v25/business/owning-entities/owning-entity/{owning-entity-id}
-physical-links = /aai/v25/network/physical-links
-physical-link = /aai/v25/network/physical-links/physical-link/{link-name}
-platforms = /aai/v25/business/platforms
-platform = /aai/v25/business/platforms/platform/{platform-name}
-pnfs = /aai/v25/network/pnfs
-pnf = /aai/v25/network/pnfs/pnf/{pnf-name}
-pnf|lag-interfaces = /aai/v25/network/pnfs/pnf/{pnf-name}/lag-interfaces
-pnf|lag-interface = /aai/v25/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}
-pnf|lag-interface|l-interfaces = /aai/v25/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces
-pnf|lag-interface|l-interface = /aai/v25/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
-pnf|lag-interface|l-interface|l3-interface-ipv4-address-list = /aai/v25/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-pnf|lag-interface|l-interface|l3-interface-ipv6-address-list = /aai/v25/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-pnf|lag-interface|l-interface|sriov-vfs = /aai/v25/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
-pnf|lag-interface|l-interface|sriov-vf = /aai/v25/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
-pnf|lag-interface|l-interface|vlans = /aai/v25/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
-pnf|lag-interface|l-interface|vlan = /aai/v25/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
-pnf|lag-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v25/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-pnf|lag-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v25/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-pnf|p-interfaces = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces
-pnf|p-interface = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}
-pnf|p-interface|bandwidth-attributes = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/bandwidth-attributes
-pnf|p-interface|bandwidth-attribute = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/bandwidth-attributes/bandwidth-attribute/{bwa-id}
-pnf|p-interface|bandwidth-attribute|available-bandwidth-map = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/bandwidth-attributes/bandwidth-attribute/{bwa-id}/available-bandwidth-map
-pnf|p-interface|bandwidth-attribute|available-bandwidth = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/bandwidth-attributes/bandwidth-attribute/{bwa-id}/available-bandwidth-map/available-bandwidth/{ab-id}
-pnf|p-interface|l-interfaces = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces
-pnf|p-interface|l-interface = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
-pnf|p-interface|l-interface|l3-interface-ipv4-address-list = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-pnf|p-interface|l-interface|l3-interface-ipv6-address-list = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-pnf|p-interface|l-interface|sriov-vfs = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
-pnf|p-interface|l-interface|sriov-vf = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
-pnf|p-interface|l-interface|vlans = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
-pnf|p-interface|l-interface|vlan = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
-pnf|p-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-pnf|p-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-pnf|p-interface|sriov-pfs = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/sriov-pfs
-pnf|p-interface|sriov-pf = /aai/v25/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/sriov-pfs/sriov-pf/{pf-pci-id}
-pnf|vrfs = /aai/v25/network/pnfs/pnf/{pnf-name}/vrfs
-pnf|vrf = /aai/v25/network/pnfs/pnf/{pnf-name}/vrfs/vrf/{vrf-id}
-pnf|vrf|route-targets = /aai/v25/network/pnfs/pnf/{pnf-name}/vrfs/vrf/{vrf-id}/route-targets
-pnf|vrf|route-target = /aai/v25/network/pnfs/pnf/{pnf-name}/vrfs/vrf/{vrf-id}/route-targets/route-target/{global-route-target}/{route-target-role}
-projects = /aai/v25/business/projects
-project = /aai/v25/business/projects/project/{project-name}
-route-table-references = /aai/v25/network/route-table-references
-route-table-reference = /aai/v25/network/route-table-references/route-table-reference/{route-table-reference-id}
-sdwan-vpns = /aai/v25/network/sdwan-vpns
-sdwan-vpn = /aai/v25/network/sdwan-vpns/sdwan-vpn/{sdwan-vpn-id}
-service-capabilities = /aai/v25/service-design-and-creation/service-capabilities
-service-capability = /aai/v25/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}
-services = /aai/v25/service-design-and-creation/services
-service = /aai/v25/service-design-and-creation/services/service/{service-id}
-site-pair-sets = /aai/v25/network/site-pair-sets
-site-pair-set = /aai/v25/network/site-pair-sets/site-pair-set/{site-pair-set-id}
-site-pair-set|routing-instances = /aai/v25/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances
-site-pair-set|routing-instance = /aai/v25/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}
-site-pair-set|routing-instance|site-pairs = /aai/v25/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs
-site-pair-set|routing-instance|site-pair = /aai/v25/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}
-site-pair-set|routing-instance|site-pair|classes-of-service = /aai/v25/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}/classes-of-service
-site-pair-set|routing-instance|site-pair|class-of-service = /aai/v25/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}/classes-of-service/class-of-service/{cos}
-site-resources = /aai/v25/network/site-resources
-site-resource = /aai/v25/network/site-resources/site-resource/{site-resource-id}
-te-link-attributes = /aai/v25/network/te-link-attributes
-te-link-attribute = /aai/v25/network/te-link-attributes/te-link-attribute/{id}
-tunnel-termination-points = /aai/v25/network/tunnel-termination-points
-tunnel-termination-point = /aai/v25/network/tunnel-termination-points/tunnel-termination-point/{ttp-id}
-unis = /aai/v25/network/unis
-uni = /aai/v25/network/unis/uni/{id}
-vces = /aai/v25/network/vces
-vce = /aai/v25/network/vces/vce/{vnf-id}
-vce|entitlements = /aai/v25/network/vces/vce/{vnf-id}/entitlements
-vce|entitlement = /aai/v25/network/vces/vce/{vnf-id}/entitlements/entitlement/{group-uuid}/{resource-uuid}
-vce|licenses = /aai/v25/network/vces/vce/{vnf-id}/licenses
-vce|license = /aai/v25/network/vces/vce/{vnf-id}/licenses/license/{group-uuid}/{resource-uuid}
-vce|port-groups = /aai/v25/network/vces/vce/{vnf-id}/port-groups
-vce|port-group = /aai/v25/network/vces/vce/{vnf-id}/port-groups/port-group/{interface-id}
-vce|port-group|cvlan-tags = /aai/v25/network/vces/vce/{vnf-id}/port-groups/port-group/{interface-id}/cvlan-tags
-vce|port-group|cvlan-tag-entry = /aai/v25/network/vces/vce/{vnf-id}/port-groups/port-group/{interface-id}/cvlan-tags/cvlan-tag-entry/{cvlan-tag}
-vlan-tags = /aai/v25/nodes/vlan-tags
-vlan-tag = /aai/v25/nodes/vlan-tags/vlan-tag/{vlan-tag-id}
-vnf-images = /aai/v25/service-design-and-creation/vnf-images
-vnf-image = /aai/v25/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}
-vnfcs = /aai/v25/network/vnfcs
-vnfc = /aai/v25/network/vnfcs/vnfc/{vnfc-name}
-vnfc|cps = /aai/v25/network/vnfcs/vnfc/{vnfc-name}/cps
-vnfc|cp = /aai/v25/network/vnfcs/vnfc/{vnfc-name}/cps/cp/{cp-instance-id}
-vnfc|cp|l3-interface-ipv4-address-list = /aai/v25/network/vnfcs/vnfc/{vnfc-name}/cps/cp/{cp-instance-id}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-vnfc|cp|l3-interface-ipv6-address-list = /aai/v25/network/vnfcs/vnfc/{vnfc-name}/cps/cp/{cp-instance-id}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-vnfc|l3-interface-ipv4-address-list = /aai/v25/network/vnfcs/vnfc/{vnfc-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-vnfc|l3-interface-ipv6-address-list = /aai/v25/network/vnfcs/vnfc/{vnfc-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-vpls-pes = /aai/v25/network/vpls-pes
-vpls-pe = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}
-vpls-pe|lag-interfaces = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces
-vpls-pe|lag-interface = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}
-vpls-pe|lag-interface|l-interfaces = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces
-vpls-pe|lag-interface|l-interface = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
-vpls-pe|lag-interface|l-interface|l3-interface-ipv4-address-list = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-vpls-pe|lag-interface|l-interface|l3-interface-ipv6-address-list = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-vpls-pe|lag-interface|l-interface|sriov-vfs = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
-vpls-pe|lag-interface|l-interface|sriov-vf = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
-vpls-pe|lag-interface|l-interface|vlans = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
-vpls-pe|lag-interface|l-interface|vlan = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
-vpls-pe|lag-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-vpls-pe|lag-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-vpls-pe|p-interfaces = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces
-vpls-pe|p-interface = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}
-vpls-pe|p-interface|l-interfaces = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces
-vpls-pe|p-interface|l-interface = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
-vpls-pe|p-interface|l-interface|l3-interface-ipv4-address-list = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-vpls-pe|p-interface|l-interface|l3-interface-ipv6-address-list = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-vpls-pe|p-interface|l-interface|sriov-vfs = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
-vpls-pe|p-interface|l-interface|sriov-vf = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
-vpls-pe|p-interface|l-interface|vlans = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
-vpls-pe|p-interface|l-interface|vlan = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
-vpls-pe|p-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-vpls-pe|p-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-vpls-pe|p-interface|sriov-pfs = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/sriov-pfs
-vpls-pe|p-interface|sriov-pf = /aai/v25/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/sriov-pfs/sriov-pf/{pf-pci-id}
-vpn-bindings = /aai/v25/network/vpn-bindings
-vpn-binding = /aai/v25/network/vpn-bindings/vpn-binding/{vpn-id}
-vpn-binding|route-targets = /aai/v25/network/vpn-bindings/vpn-binding/{vpn-id}/route-targets
-vpn-binding|route-target = /aai/v25/network/vpn-bindings/vpn-binding/{vpn-id}/route-targets/route-target/{global-route-target}/{route-target-role}
-wan-port-configs = /aai/v25/network/wan-port-configs
-wan-port-config = /aai/v25/network/wan-port-configs/wan-port-config/{wan-port-config-id}
-lan-port-configs = /aai/v25/network/lan-port-configs
-lan-port-config = /aai/v25/network/lan-port-configs/lan-port-config/{lan-port-config-id}
-zones = /aai/v25/network/zones
-zone = /aai/v25/network/zones/zone/{zone-id}
-network-routes = /aai/v25/network/network-routes
-network-route = /aai/v25/network/network-routes/network-route/{route-id}
-contacts = /aai/v25/common/contacts
-contact = /aai/v25/common/contacts/contact/{contact-name}
+cloud-regions = /aai/v24/cloud-infrastructure/cloud-regions
+cloud-region = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}
+cloud-region|availability-zones = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/availability-zones
+cloud-region|availability-zone = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/availability-zones/availability-zone/{availability-zone-name}
+cloud-region|dvs-switches = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches
+cloud-region|dvs-switch = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name}
+cloud-region|flavors = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors
+cloud-region|flavor = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}
+cloud-region|flavor|hpa-capabilities = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities
+cloud-region|flavor|hpa-capability = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}
+cloud-region|flavor|hpa-capability|hpa-feature-attributes = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}
+cloud-region|group-assignments = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments
+cloud-region|group-assignment = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}
+cloud-region|hpa-capabilities = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities
+cloud-region|hpa-capability = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}
+cloud-region|hpa-capability|hpa-feature-attributes = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}
+cloud-region|images = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images
+cloud-region|image = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}
+cloud-region|image|metadata = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}/metadata
+cloud-region|image|metadatum = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}/metadata/metadatum/{metaname}
+cloud-region|oam-networks = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/oam-networks
+cloud-region|oam-network = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/oam-networks/oam-network/{network-uuid}
+cloud-region|snapshots = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/snapshots
+cloud-region|snapshot = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/snapshots/snapshot/{snapshot-id}
+cloud-region|tenants = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants
+cloud-region|tenant = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}
+cloud-region|tenant|nos-servers = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/nos-servers
+cloud-region|tenant|nos-server = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/nos-servers/nos-server/{nos-server-id}
+cloud-region|tenant|vservers = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers
+cloud-region|tenant|vserver = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}
+cloud-region|tenant|vserver|l-interfaces = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces
+cloud-region|tenant|vserver|l-interface = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}
+cloud-region|tenant|vserver|l-interface|l3-interface-ipv4-address-list = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+cloud-region|tenant|vserver|l-interface|l3-interface-ipv6-address-list = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+cloud-region|tenant|vserver|l-interface|sriov-vfs = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/sriov-vfs
+cloud-region|tenant|vserver|l-interface|sriov-vf = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
+cloud-region|tenant|vserver|l-interface|vlans = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans
+cloud-region|tenant|vserver|l-interface|vlan = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
+cloud-region|tenant|vserver|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+cloud-region|tenant|vserver|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+cloud-region|tenant|vserver|volumes = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/volumes
+cloud-region|tenant|vserver|volume = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/volumes/volume/{volume-id}
+cloud-region|vip-ipv4-address-list = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/vip-ipv4-address-list/{vip-ipv4-address}
+cloud-region|vip-ipv6-address-list = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/vip-ipv6-address-list/{vip-ipv6-address}
+cloud-region|volume-groups = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/volume-groups
+cloud-region|volume-group = /aai/v24/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/volume-groups/volume-group/{volume-group-id}
+complexes = /aai/v24/cloud-infrastructure/complexes
+complex = /aai/v24/cloud-infrastructure/complexes/complex/{physical-location-id}
+complex|ctag-pools = /aai/v24/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools
+complex|ctag-pool = /aai/v24/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}
+network-profiles = /aai/v24/cloud-infrastructure/network-profiles
+network-profile = /aai/v24/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}
+network-technologies = /aai/v24/cloud-infrastructure/network-technologies
+network-technology = /aai/v24/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}
+operational-environments = /aai/v24/cloud-infrastructure/operational-environments
+operational-environment = /aai/v24/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}
+pservers = /aai/v24/cloud-infrastructure/pservers
+pserver = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}
+pserver|lag-interfaces = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces
+pserver|lag-interface = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}
+pserver|lag-interface|l-interfaces = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces
+pserver|lag-interface|l-interface = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
+pserver|lag-interface|l-interface|l3-interface-ipv4-address-list = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+pserver|lag-interface|l-interface|l3-interface-ipv6-address-list = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+pserver|lag-interface|l-interface|sriov-vfs = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
+pserver|lag-interface|l-interface|sriov-vf = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
+pserver|lag-interface|l-interface|vlans = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
+pserver|lag-interface|l-interface|vlan = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
+pserver|lag-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+pserver|lag-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+pserver|p-interfaces = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces
+pserver|p-interface = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}
+pserver|p-interface|l-interfaces = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces
+pserver|p-interface|l-interface = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
+pserver|p-interface|l-interface|l3-interface-ipv4-address-list = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+pserver|p-interface|l-interface|l3-interface-ipv6-address-list = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+pserver|p-interface|l-interface|sriov-vfs = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
+pserver|p-interface|l-interface|sriov-vf = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
+pserver|p-interface|l-interface|vlans = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
+pserver|p-interface|l-interface|vlan = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
+pserver|p-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+pserver|p-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+pserver|p-interface|sriov-pfs = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/sriov-pfs
+pserver|p-interface|sriov-pf = /aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/sriov-pfs/sriov-pf/{pf-pci-id}
+virtual-data-centers = /aai/v24/cloud-infrastructure/virtual-data-centers
+virtual-data-center = /aai/v24/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}
+connectors = /aai/v24/business/connectors
+connector = /aai/v24/business/connectors/connector/{resource-instance-id}
+connector|metadata = /aai/v24/business/connectors/connector/{resource-instance-id}/metadata
+connector|metadatum = /aai/v24/business/connectors/connector/{resource-instance-id}/metadata/metadatum/{metaname}
+customers = /aai/v24/business/customers
+customer = /aai/v24/business/customers/customer/{global-customer-id}
+customer|service-subscriptions = /aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions
+customer|service-subscription = /aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}
+customer|service-subscription|service-instances = /aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances
+customer|service-subscription|service-instance = /aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}
+customer|service-subscription|service-instance|allotted-resources = /aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/allotted-resources
+customer|service-subscription|service-instance|allotted-resource = /aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/allotted-resources/allotted-resource/{id}
+customer|service-subscription|service-instance|allotted-resource|tunnel-xconnects = /aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/allotted-resources/allotted-resource/{id}/tunnel-xconnects
+customer|service-subscription|service-instance|allotted-resource|tunnel-xconnect = /aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/allotted-resources/allotted-resource/{id}/tunnel-xconnects/tunnel-xconnect/{id}
+customer|service-subscription|service-instance|metadata = /aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/metadata
+customer|service-subscription|service-instance|metadatum = /aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/metadata/metadatum/{metaname}
+lines-of-business = /aai/v24/business/lines-of-business
+line-of-business = /aai/v24/business/lines-of-business/line-of-business/{line-of-business-name}
+owning-entities = /aai/v24/business/owning-entities
+owning-entity = /aai/v24/business/owning-entities/owning-entity/{owning-entity-id}
+platforms = /aai/v24/business/platforms
+platform = /aai/v24/business/platforms/platform/{platform-name}
+projects = /aai/v24/business/projects
+project = /aai/v24/business/projects/project/{project-name}
+models = /aai/v24/service-design-and-creation/models
+model = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}
+model|model-vers = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers
+model|model-ver = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}
+model|model-ver|metadata = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/metadata
+model|model-ver|metadatum = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/metadata/metadatum/{metaname}
+model|model-ver|model-elements = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements
+model|model-ver|model-element = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}
+model|model-ver|model-element|model-constraints = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints
+model|model-ver|model-element|model-constraint = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}
+model|model-ver|model-element|model-constraint|constrained-element-sets = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets
+model|model-ver|model-element|model-constraint|constrained-element-set = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}
+model|model-ver|model-element|model-constraint|constrained-element-set|element-choice-sets = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}/element-choice-sets
+model|model-ver|model-element|model-constraint|constrained-element-set|element-choice-set = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}/element-choice-sets/element-choice-set/{element-choice-set-uuid}
+named-queries = /aai/v24/service-design-and-creation/named-queries
+named-query = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}
+named-query|named-query-elements = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements
+named-query|named-query-element = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}
+named-query|named-query-element|property-constraints = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/property-constraints
+named-query|named-query-element|property-constraint = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/property-constraints/property-constraint/{property-constraint-uuid}
+named-query|named-query-element|related-lookups = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/related-lookups
+named-query|named-query-element|related-lookup = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/related-lookups/related-lookup/{related-lookup-uuid}
+service-capabilities = /aai/v24/service-design-and-creation/service-capabilities
+service-capability = /aai/v24/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}
+services = /aai/v24/service-design-and-creation/services
+service = /aai/v24/service-design-and-creation/services/service/{service-id}
+vnf-images = /aai/v24/service-design-and-creation/vnf-images
+vnf-image = /aai/v24/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}
+collections = /aai/v24/network/collections
+collection = /aai/v24/network/collections/collection/{collection-id}
+configurations = /aai/v24/network/configurations
+configuration = /aai/v24/network/configurations/configuration/{configuration-id}
+configuration|evcs = /aai/v24/network/configurations/configuration/{configuration-id}/evcs
+configuration|evc = /aai/v24/network/configurations/configuration/{configuration-id}/evcs/evc/{evc-id}
+configuration|forwarder-evcs = /aai/v24/network/configurations/configuration/{configuration-id}/forwarder-evcs
+configuration|forwarder-evc = /aai/v24/network/configurations/configuration/{configuration-id}/forwarder-evcs/forwarder-evc/{forwarder-evc-id}
+configuration|forwarder-evc|vlan-mappings = /aai/v24/network/configurations/configuration/{configuration-id}/forwarder-evcs/forwarder-evc/{forwarder-evc-id}/vlan-mappings
+configuration|forwarder-evc|vlan-mapping = /aai/v24/network/configurations/configuration/{configuration-id}/forwarder-evcs/forwarder-evc/{forwarder-evc-id}/vlan-mappings/vlan-mapping/{vlan-mapping-id}
+configuration|metadata = /aai/v24/network/configurations/configuration/{configuration-id}/metadata
+configuration|metadatum = /aai/v24/network/configurations/configuration/{configuration-id}/metadata/metadatum/{metaname}
+connectivities = /aai/v24/network/connectivities
+connectivity = /aai/v24/network/connectivities/connectivity/{connectivity-id}
+devices = /aai/v24/network/devices
+device = /aai/v24/network/devices/device/{device-id}
+esr-thirdparty-sdnc = /aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}
+esr-thirdparty-sdnc-list = /aai/v24/external-system/esr-thirdparty-sdnc-list
+forwarding-paths = /aai/v24/network/forwarding-paths
+forwarding-path = /aai/v24/network/forwarding-paths/forwarding-path/{forwarding-path-id}
+forwarding-path|forwarders = /aai/v24/network/forwarding-paths/forwarding-path/{forwarding-path-id}/forwarders
+forwarding-path|forwarder = /aai/v24/network/forwarding-paths/forwarding-path/{forwarding-path-id}/forwarders/forwarder/{sequence}
+generic-vnfs = /aai/v24/network/generic-vnfs
+generic-vnf = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}
+generic-vnf|entitlements = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/entitlements
+generic-vnf|entitlement = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/entitlements/entitlement/{group-uuid}/{resource-uuid}
+generic-vnf|l-interfaces = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces
+generic-vnf|l-interface = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}
+generic-vnf|l-interface|l3-interface-ipv4-address-list = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+generic-vnf|l-interface|l3-interface-ipv6-address-list = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+generic-vnf|l-interface|sriov-vfs = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/sriov-vfs
+generic-vnf|l-interface|sriov-vf = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
+generic-vnf|l-interface|vlans = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans
+generic-vnf|l-interface|vlan = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
+generic-vnf|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+generic-vnf|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+generic-vnf|lag-interfaces = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces
+generic-vnf|lag-interface = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}
+generic-vnf|lag-interface|l-interfaces = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces
+generic-vnf|lag-interface|l-interface = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
+generic-vnf|lag-interface|l-interface|l3-interface-ipv4-address-list = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+generic-vnf|lag-interface|l-interface|l3-interface-ipv6-address-list = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+generic-vnf|lag-interface|l-interface|sriov-vfs = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
+generic-vnf|lag-interface|l-interface|sriov-vf = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
+generic-vnf|lag-interface|l-interface|vlans = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
+generic-vnf|lag-interface|l-interface|vlan = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
+generic-vnf|lag-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+generic-vnf|lag-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+generic-vnf|licenses = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/licenses
+generic-vnf|license = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/licenses/license/{group-uuid}/{resource-uuid}
+generic-vnf|vf-modules = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/vf-modules
+generic-vnf|vf-module = /aai/v24/network/generic-vnfs/generic-vnf/{vnf-id}/vf-modules/vf-module/{vf-module-id}
+instance-groups = /aai/v24/network/instance-groups
+instance-group = /aai/v24/network/instance-groups/instance-group/{id}
+interlayer-attachments = /aai/v24/network/interlayer-attachments
+interlayer-attachment = /aai/v24/network/interlayer-attachments/interlayer-attachment/{id}
+ipsec-configurations = /aai/v24/network/ipsec-configurations
+ipsec-configuration = /aai/v24/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}
+ipsec-configuration|vig-servers = /aai/v24/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/vig-servers
+ipsec-configuration|vig-server = /aai/v24/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/vig-servers/vig-server/{vig-address-type}
+l3-networks = /aai/v24/network/l3-networks
+l3-network = /aai/v24/network/l3-networks/l3-network/{network-id}
+l3-network|aggregate-routes = /aai/v24/network/l3-networks/l3-network/{network-id}/aggregate-routes
+l3-network|aggregate-route = /aai/v24/network/l3-networks/l3-network/{network-id}/aggregate-routes/aggregate-route/{route-id}
+l3-network|ctag-assignments = /aai/v24/network/l3-networks/l3-network/{network-id}/ctag-assignments
+l3-network|ctag-assignment = /aai/v24/network/l3-networks/l3-network/{network-id}/ctag-assignments/ctag-assignment/{vlan-id-inner}
+l3-network|segmentation-assignments = /aai/v24/network/l3-networks/l3-network/{network-id}/segmentation-assignments
+l3-network|segmentation-assignment = /aai/v24/network/l3-networks/l3-network/{network-id}/segmentation-assignments/segmentation-assignment/{segmentation-id}
+l3-network|subnets = /aai/v24/network/l3-networks/l3-network/{network-id}/subnets
+l3-network|subnet = /aai/v24/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id}
+l3-network|subnet|host-routes = /aai/v24/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id}/host-routes
+l3-network|subnet|host-route = /aai/v24/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id}/host-routes/host-route/{host-route-id}
+label-restrictions = /aai/v24/network/label-restrictions
+label-restriction = /aai/v24/network/label-restrictions/label-restriction/{id}
+lag-links = /aai/v24/network/lag-links
+lag-link = /aai/v24/network/lag-links/lag-link/{link-name}
+lines-of-business = /aai/v24/business/lines-of-business
+line-of-business = /aai/v24/business/lines-of-business/line-of-business/{line-of-business-name}
+logical-links = /aai/v24/network/logical-links
+logical-link = /aai/v24/network/logical-links/logical-link/{link-name}
+models = /aai/v24/service-design-and-creation/models
+model = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}
+model|model-vers = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers
+model|model-ver = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}
+model|model-ver|metadata = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/metadata
+model|model-ver|metadatum = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/metadata/metadatum/{metaname}
+model|model-ver|model-elements = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements
+model|model-ver|model-element = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}
+model|model-ver|model-element|model-constraints = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints
+model|model-ver|model-element|model-constraint = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}
+model|model-ver|model-element|model-constraint|constrained-element-sets = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets
+model|model-ver|model-element|model-constraint|constrained-element-set = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}
+model|model-ver|model-element|model-constraint|constrained-element-set|element-choice-sets = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}/element-choice-sets
+model|model-ver|model-element|model-constraint|constrained-element-set|element-choice-set = /aai/v24/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}/element-choice-sets/element-choice-set/{element-choice-set-uuid}
+multicast-configurations = /aai/v24/network/multicast-configurations
+multicast-configuration = /aai/v24/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}
+named-queries = /aai/v24/service-design-and-creation/named-queries
+named-query = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}
+named-query|named-query-elements = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements
+named-query|named-query-element = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}
+named-query|named-query-element|property-constraints = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/property-constraints
+named-query|named-query-element|property-constraint = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/property-constraints/property-constraint/{property-constraint-uuid}
+named-query|named-query-element|related-lookups = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/related-lookups
+named-query|named-query-element|related-lookup = /aai/v24/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/related-lookups/related-lookup/{related-lookup-uuid}
+network-policies = /aai/v24/network/network-policies
+network-policy = /aai/v24/network/network-policies/network-policy/{network-policy-id}
+network-resources = /aai/v24/network/network-resources
+network-resource = /aai/v24/network/network-resources/network-resource/{network-id}
+newvces = /aai/v24/network/newvces
+newvce = /aai/v24/network/newvces/newvce/{vnf-id2}
+newvce|l-interfaces = /aai/v24/network/newvces/newvce/{vnf-id2}/l-interfaces
+newvce|l-interface = /aai/v24/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}
+newvce|l-interface|l3-interface-ipv4-address-list = /aai/v24/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+newvce|l-interface|l3-interface-ipv6-address-list = /aai/v24/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+newvce|l-interface|sriov-vfs = /aai/v24/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/sriov-vfs
+newvce|l-interface|sriov-vf = /aai/v24/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
+newvce|l-interface|vlans = /aai/v24/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans
+newvce|l-interface|vlan = /aai/v24/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
+newvce|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v24/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+newvce|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v24/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+owning-entities = /aai/v24/business/owning-entities
+owning-entity = /aai/v24/business/owning-entities/owning-entity/{owning-entity-id}
+physical-links = /aai/v24/network/physical-links
+physical-link = /aai/v24/network/physical-links/physical-link/{link-name}
+platforms = /aai/v24/business/platforms
+platform = /aai/v24/business/platforms/platform/{platform-name}
+pnfs = /aai/v24/network/pnfs
+pnf = /aai/v24/network/pnfs/pnf/{pnf-name}
+pnf|lag-interfaces = /aai/v24/network/pnfs/pnf/{pnf-name}/lag-interfaces
+pnf|lag-interface = /aai/v24/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}
+pnf|lag-interface|l-interfaces = /aai/v24/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces
+pnf|lag-interface|l-interface = /aai/v24/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
+pnf|lag-interface|l-interface|l3-interface-ipv4-address-list = /aai/v24/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+pnf|lag-interface|l-interface|l3-interface-ipv6-address-list = /aai/v24/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+pnf|lag-interface|l-interface|sriov-vfs = /aai/v24/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
+pnf|lag-interface|l-interface|sriov-vf = /aai/v24/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
+pnf|lag-interface|l-interface|vlans = /aai/v24/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
+pnf|lag-interface|l-interface|vlan = /aai/v24/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
+pnf|lag-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v24/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+pnf|lag-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v24/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+pnf|p-interfaces = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces
+pnf|p-interface = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}
+pnf|p-interface|bandwidth-attributes = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/bandwidth-attributes
+pnf|p-interface|bandwidth-attribute = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/bandwidth-attributes/bandwidth-attribute/{bwa-id}
+pnf|p-interface|bandwidth-attribute|available-bandwidth-map = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/bandwidth-attributes/bandwidth-attribute/{bwa-id}/available-bandwidth-map
+pnf|p-interface|bandwidth-attribute|available-bandwidth = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/bandwidth-attributes/bandwidth-attribute/{bwa-id}/available-bandwidth-map/available-bandwidth/{ab-id}
+pnf|p-interface|l-interfaces = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces
+pnf|p-interface|l-interface = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
+pnf|p-interface|l-interface|l3-interface-ipv4-address-list = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+pnf|p-interface|l-interface|l3-interface-ipv6-address-list = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+pnf|p-interface|l-interface|sriov-vfs = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
+pnf|p-interface|l-interface|sriov-vf = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
+pnf|p-interface|l-interface|vlans = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
+pnf|p-interface|l-interface|vlan = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
+pnf|p-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+pnf|p-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+pnf|p-interface|sriov-pfs = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/sriov-pfs
+pnf|p-interface|sriov-pf = /aai/v24/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/sriov-pfs/sriov-pf/{pf-pci-id}
+pnf|vrfs = /aai/v24/network/pnfs/pnf/{pnf-name}/vrfs
+pnf|vrf = /aai/v24/network/pnfs/pnf/{pnf-name}/vrfs/vrf/{vrf-id}
+pnf|vrf|route-targets = /aai/v24/network/pnfs/pnf/{pnf-name}/vrfs/vrf/{vrf-id}/route-targets
+pnf|vrf|route-target = /aai/v24/network/pnfs/pnf/{pnf-name}/vrfs/vrf/{vrf-id}/route-targets/route-target/{global-route-target}/{route-target-role}
+projects = /aai/v24/business/projects
+project = /aai/v24/business/projects/project/{project-name}
+route-table-references = /aai/v24/network/route-table-references
+route-table-reference = /aai/v24/network/route-table-references/route-table-reference/{route-table-reference-id}
+sdwan-vpns = /aai/v24/network/sdwan-vpns
+sdwan-vpn = /aai/v24/network/sdwan-vpns/sdwan-vpn/{sdwan-vpn-id}
+service-capabilities = /aai/v24/service-design-and-creation/service-capabilities
+service-capability = /aai/v24/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}
+services = /aai/v24/service-design-and-creation/services
+service = /aai/v24/service-design-and-creation/services/service/{service-id}
+site-pair-sets = /aai/v24/network/site-pair-sets
+site-pair-set = /aai/v24/network/site-pair-sets/site-pair-set/{site-pair-set-id}
+site-pair-set|routing-instances = /aai/v24/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances
+site-pair-set|routing-instance = /aai/v24/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}
+site-pair-set|routing-instance|site-pairs = /aai/v24/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs
+site-pair-set|routing-instance|site-pair = /aai/v24/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}
+site-pair-set|routing-instance|site-pair|classes-of-service = /aai/v24/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}/classes-of-service
+site-pair-set|routing-instance|site-pair|class-of-service = /aai/v24/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}/classes-of-service/class-of-service/{cos}
+site-resources = /aai/v24/network/site-resources
+site-resource = /aai/v24/network/site-resources/site-resource/{site-resource-id}
+te-link-attributes = /aai/v24/network/te-link-attributes
+te-link-attribute = /aai/v24/network/te-link-attributes/te-link-attribute/{id}
+tunnel-termination-points = /aai/v24/network/tunnel-termination-points
+tunnel-termination-point = /aai/v24/network/tunnel-termination-points/tunnel-termination-point/{ttp-id}
+unis = /aai/v24/network/unis
+uni = /aai/v24/network/unis/uni/{id}
+vces = /aai/v24/network/vces
+vce = /aai/v24/network/vces/vce/{vnf-id}
+vce|entitlements = /aai/v24/network/vces/vce/{vnf-id}/entitlements
+vce|entitlement = /aai/v24/network/vces/vce/{vnf-id}/entitlements/entitlement/{group-uuid}/{resource-uuid}
+vce|licenses = /aai/v24/network/vces/vce/{vnf-id}/licenses
+vce|license = /aai/v24/network/vces/vce/{vnf-id}/licenses/license/{group-uuid}/{resource-uuid}
+vce|port-groups = /aai/v24/network/vces/vce/{vnf-id}/port-groups
+vce|port-group = /aai/v24/network/vces/vce/{vnf-id}/port-groups/port-group/{interface-id}
+vce|port-group|cvlan-tags = /aai/v24/network/vces/vce/{vnf-id}/port-groups/port-group/{interface-id}/cvlan-tags
+vce|port-group|cvlan-tag-entry = /aai/v24/network/vces/vce/{vnf-id}/port-groups/port-group/{interface-id}/cvlan-tags/cvlan-tag-entry/{cvlan-tag}
+vlan-tags = /aai/v24/nodes/vlan-tags
+vlan-tag = /aai/v24/nodes/vlan-tags/vlan-tag/{vlan-tag-id}
+vnf-images = /aai/v24/service-design-and-creation/vnf-images
+vnf-image = /aai/v24/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}
+vnfcs = /aai/v24/network/vnfcs
+vnfc = /aai/v24/network/vnfcs/vnfc/{vnfc-name}
+vnfc|cps = /aai/v24/network/vnfcs/vnfc/{vnfc-name}/cps
+vnfc|cp = /aai/v24/network/vnfcs/vnfc/{vnfc-name}/cps/cp/{cp-instance-id}
+vnfc|cp|l3-interface-ipv4-address-list = /aai/v24/network/vnfcs/vnfc/{vnfc-name}/cps/cp/{cp-instance-id}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+vnfc|cp|l3-interface-ipv6-address-list = /aai/v24/network/vnfcs/vnfc/{vnfc-name}/cps/cp/{cp-instance-id}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+vnfc|l3-interface-ipv4-address-list = /aai/v24/network/vnfcs/vnfc/{vnfc-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+vnfc|l3-interface-ipv6-address-list = /aai/v24/network/vnfcs/vnfc/{vnfc-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+vpls-pes = /aai/v24/network/vpls-pes
+vpls-pe = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}
+vpls-pe|lag-interfaces = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces
+vpls-pe|lag-interface = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}
+vpls-pe|lag-interface|l-interfaces = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces
+vpls-pe|lag-interface|l-interface = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
+vpls-pe|lag-interface|l-interface|l3-interface-ipv4-address-list = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+vpls-pe|lag-interface|l-interface|l3-interface-ipv6-address-list = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+vpls-pe|lag-interface|l-interface|sriov-vfs = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
+vpls-pe|lag-interface|l-interface|sriov-vf = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
+vpls-pe|lag-interface|l-interface|vlans = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
+vpls-pe|lag-interface|l-interface|vlan = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
+vpls-pe|lag-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+vpls-pe|lag-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+vpls-pe|p-interfaces = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces
+vpls-pe|p-interface = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}
+vpls-pe|p-interface|l-interfaces = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces
+vpls-pe|p-interface|l-interface = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}
+vpls-pe|p-interface|l-interface|l3-interface-ipv4-address-list = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+vpls-pe|p-interface|l-interface|l3-interface-ipv6-address-list = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+vpls-pe|p-interface|l-interface|sriov-vfs = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs
+vpls-pe|p-interface|l-interface|sriov-vf = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}
+vpls-pe|p-interface|l-interface|vlans = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans
+vpls-pe|p-interface|l-interface|vlan = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
+vpls-pe|p-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
+vpls-pe|p-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+vpls-pe|p-interface|sriov-pfs = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/sriov-pfs
+vpls-pe|p-interface|sriov-pf = /aai/v24/network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/sriov-pfs/sriov-pf/{pf-pci-id}
+vpn-bindings = /aai/v24/network/vpn-bindings
+vpn-binding = /aai/v24/network/vpn-bindings/vpn-binding/{vpn-id}
+vpn-binding|route-targets = /aai/v24/network/vpn-bindings/vpn-binding/{vpn-id}/route-targets
+vpn-binding|route-target = /aai/v24/network/vpn-bindings/vpn-binding/{vpn-id}/route-targets/route-target/{global-route-target}/{route-target-role}
+wan-port-configs = /aai/v24/network/wan-port-configs
+wan-port-config = /aai/v24/network/wan-port-configs/wan-port-config/{wan-port-config-id}
+lan-port-configs = /aai/v24/network/lan-port-configs
+lan-port-config = /aai/v24/network/lan-port-configs/lan-port-config/{lan-port-config-id}
+zones = /aai/v24/network/zones
+zone = /aai/v24/network/zones/zone/{zone-id}
+network-routes = /aai/v24/network/network-routes
+network-route = /aai/v24/network/network-routes/network-route/{route-id}
+contacts = /aai/v24/common/contacts
+contact = /aai/v24/common/contacts/contact/{contact-name}
diff --git a/adaptors/aai-service/provider/src/main/resources/aai-schema-bindings.xjb b/adaptors/aai-service/provider/src/main/resources/aai-schema-bindings.xjb
index 431736696..307db6c06 100755
--- a/adaptors/aai-service/provider/src/main/resources/aai-schema-bindings.xjb
+++ b/adaptors/aai-service/provider/src/main/resources/aai-schema-bindings.xjb
@@ -3,7 +3,7 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
   jxb:extensionBindingPrefixes="xjc">
-    <jxb:bindings schemaLocation="aai_schema_v25.xsd" node="/xs:schema">
+    <jxb:bindings schemaLocation="aai_schema_v24.xsd" node="/xs:schema">
     <jxb:globalBindings>
         <xjc:superInterface name="org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum"/>
         <xjc:superClass name="org.onap.ccsdk.sli.adaptors.aai.data.AAIAbstractDatum"/>
diff --git a/adaptors/aai-service/provider/src/main/resources/aai_schema_v25.xsd b/adaptors/aai-service/provider/src/main/resources/aai_schema_v24.xsd
index b504d0c85..b504d0c85 100644
--- a/adaptors/aai-service/provider/src/main/resources/aai_schema_v25.xsd
+++ b/adaptors/aai-service/provider/src/main/resources/aai_schema_v24.xsd
diff --git a/adaptors/aai-service/provider/src/main/resources/aaiclient.properties b/adaptors/aai-service/provider/src/main/resources/aaiclient.properties
index 295e00198..eeea30c2b 100755
--- a/adaptors/aai-service/provider/src/main/resources/aaiclient.properties
+++ b/adaptors/aai-service/provider/src/main/resources/aaiclient.properties
@@ -42,30 +42,30 @@ connection.timeout=60000
 read.timeout=60000
 
 # aai version
-org.onap.ccsdk.sli.adaptors.aai.version=/v25/
+org.onap.ccsdk.sli.adaptors.aai.version=/v24/
 
 # query
-org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v25/search/sdn-zone-query
-org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v25/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name}
-org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v25/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3
+org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v24/search/sdn-zone-query
+org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v24/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name}
+org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v24/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3
 
 #update
-org.onap.ccsdk.sli.adaptors.aai.update=/aai/v25/actions/update
+org.onap.ccsdk.sli.adaptors.aai.update=/aai/v24/actions/update
 
 # UBB Notify
-org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v25/actions/notify
+org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v24/actions/notify
 org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=<%= @ubbUri %>/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id}
 org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=<%= @ubbUri %>/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information
 
 # VNF IMAGES
-org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v25/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
+org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v24/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
 
 # service instance
-org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v25/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
-org.onap.ccsdk.sli.adaptors.aai.path.service.instance=/aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}
+org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v24/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
+org.onap.ccsdk.sli.adaptors.aai.path.service.instance=/aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}
 
 # VNF IMAGES QUERY
-org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v25/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
+org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v24/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
 
 #
 # Formatting
diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java
index 6b4ee9d32..774803231 100755
--- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java
+++ b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java
@@ -51,7 +51,7 @@ import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.onap.aai.inventory.v25.*;
+import org.onap.aai.inventory.v24.*;
 
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java
index 9864240e9..c368f1b86 100755
--- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java
+++ b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java
@@ -62,7 +62,7 @@ import org.junit.runners.MethodSorters;
 import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
-import org.onap.aai.inventory.v25.GenericVnf;
+import org.onap.aai.inventory.v24.GenericVnf;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.AnnotationUtils;
diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java
index e988dabf9..dc4a63780 100755
--- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java
+++ b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java
@@ -38,7 +38,7 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
-import org.onap.aai.inventory.v25.LInterface;
+import org.onap.aai.inventory.v24.LInterface;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java
index 66d34a8b8..0011a296f 100755
--- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java
+++ b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java
@@ -49,7 +49,7 @@ import org.onap.ccsdk.sli.adaptors.aai.AAIRequest;
 import org.onap.ccsdk.sli.adaptors.aai.AAIService;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
-import org.onap.aai.inventory.v25.GenericVnf;
+import org.onap.aai.inventory.v24.GenericVnf;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java
index ad5b8a15d..c6c300613 100644
--- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java
+++ b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java
@@ -10,8 +10,8 @@ import java.util.Map;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.aai.inventory.v25.RelationshipList;
-import org.onap.aai.inventory.v25.Vlans;
+import org.onap.aai.inventory.v24.RelationshipList;
+import org.onap.aai.inventory.v24.Vlans;
 
 public class SubInterfaceTest {
 
diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java
index 30e99e893..869c54937 100644
--- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java
+++ b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java
@@ -9,16 +9,16 @@ import java.util.Map;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-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.LogicalLink;
-import org.onap.aai.inventory.v25.PInterface;
-import org.onap.aai.inventory.v25.Pnf;
-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;
+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.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.v24.Tenant;
+import org.onap.aai.inventory.v24.Vnf;
+import org.onap.aai.inventory.v24.Vserver;
 
 public class InstanceFilterTest {
 
diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java
index 6ff013b0b..af47bcfa4 100644
--- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java
+++ b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java
@@ -10,19 +10,19 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-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 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;
 
 public class ResultTest {
 
diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/update/BulkUpdateRequestDataTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/update/BulkUpdateRequestDataTest.java
index 62268b1f7..f26df4cf2 100644
--- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/update/BulkUpdateRequestDataTest.java
+++ b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/update/BulkUpdateRequestDataTest.java
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.junit.Test;
-import org.onap.aai.inventory.v25.Subnet;
+import org.onap.aai.inventory.v24.Subnet;
 
 public class BulkUpdateRequestDataTest {
     @Test
diff --git a/adaptors/aai-service/provider/src/test/resources/aaiclient.properties b/adaptors/aai-service/provider/src/test/resources/aaiclient.properties
index 2d773e773..16c6ae2b5 100755
--- a/adaptors/aai-service/provider/src/test/resources/aaiclient.properties
+++ b/adaptors/aai-service/provider/src/test/resources/aaiclient.properties
@@ -42,34 +42,34 @@ connection.timeout=60000
 read.timeout=60000
 
 # aai version
-org.onap.ccsdk.sli.adaptors.aai.version=/v25/
+org.onap.ccsdk.sli.adaptors.aai.version=/v24/
 
 # query
-org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v25/search/sdn-zone-query
-org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v25/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name}
-org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v25/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3
+org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v24/search/sdn-zone-query
+org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v24/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name}
+org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v24/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3
 
 #update
-org.onap.ccsdk.sli.adaptors.aai.update=/aai/v25/actions/update
+org.onap.ccsdk.sli.adaptors.aai.update=/aai/v24/actions/update
 
 # UBB Notify
-org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v25/actions/notify
+org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v24/actions/notify
 org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=<%= @ubbUri %>/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id}
 org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=<%= @ubbUri %>/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information
 
 # P-Interfaces
-org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces
-org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v25/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}
+org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces
+org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v24/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}
 
 # VNF IMAGES
-org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v25/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
+org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v24/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
 
 # service instance
-org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v25/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
-org.onap.ccsdk.sli.adaptors.aai.path.service.instance=/aai/v25/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}
+org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v24/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
+org.onap.ccsdk.sli.adaptors.aai.path.service.instance=/aai/v24/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}
 
 # VNF IMAGES QUERY
-org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v25/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
+org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v24/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
 
 #
 # Formatting