[AAI-50 Amsterdam] Add support for v11 version API

Update rest controller paths to include v11
remove unneeded test resources from traversal
Update default api version for dmaap msgs
Update version of aai core and schema for traversal
update version in app props to v11

Change-Id: I8c96310de42679f95646dd456535404bd78290c7
Signed-off-by: Maharajh, Robby (rx2202) <rx2202@att.com>

diff --git a/aai-traversal/bundleconfig-csi/etc/appprops/app-intercepts.properties b/aai-traversal/bundleconfig-csi/etc/appprops/app-intercepts.properties
deleted file mode 100644 (file)
index 3230921..0000000
--- a/aai-traversal/bundleconfig-csi/etc/appprops/app-intercepts.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#This is where all your application intercept strategies must be configured. AJSC reads this property file and adds
-#the list of intercepts specified here to the camel context. This can be useful for accessing every exchange object transferred from/to
-#each endpoint in the request/response flow and can allow for more precise debugging and/or processing of the exchange. 
-
-#e.g. 
-#intercepts=org.openecomp.aai.ajsc_aai.JaxrsEchoService,packagename.class1name,packagename.class2name

diff --git a/aai-traversal/bundleconfig-local/etc/appprops/aaiconfig.properties b/aai-traversal/bundleconfig-local/etc/appprops/aaiconfig.properties
index 4cbbd38..e1da8ed 100644 (file)
--- a/aai-traversal/bundleconfig-local/etc/appprops/aaiconfig.properties
+++ b/aai-traversal/bundleconfig-local/etc/appprops/aaiconfig.properties
@@ -26,7 +26,7 @@ aai.tools.username=AAI
 aai.tools.password=AAI
 
 aai.server.url.base=https://localhost:8443/aai/
-aai.server.url=https://localhost:8443/aai/v10/
+aai.server.url=https://localhost:8443/aai/v11/
 aai.global.callback.url=https://localhost:8443/aai/
 
 aai.auth.cspcookies_on=false
@@ -58,18 +58,18 @@ aai.rsync.options.list=-v|-t
 aai.rsync.remote.user=aaiadmin
 aai.rsync.enabled=y
 
-aai.notification.current.version=v10
+aai.notification.current.version=v11
 aai.notificationEvent.default.status=UNPROCESSED
 aai.notificationEvent.default.eventType=AAI-EVENT
 aai.notificationEvent.default.domain=devINT1
 aai.notificationEvent.default.sourceName=aai
 aai.notificationEvent.default.sequenceNumber=0
 aai.notificationEvent.default.severity=NORMAL
-aai.notificationEvent.default.version=v10
+aai.notificationEvent.default.version=v11
 # This one lets us enable/disable resource-version checking on updates/deletes
 aai.resourceversion.enableflag=true
 aai.logging.maxStackTraceEntries=10
-aai.default.api.version=v10
+aai.default.api.version=v11
 
 # Used by Model-processing code
 aai.model.delete.sleep.per.vtx.msec=500

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index f2f5471..e1f51ec 100644 (file)
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -737,4 +737,4 @@
         </plugin>
       </plugins>
     </reporting>
-</project>
+</project>
\ No newline at end of file

diff --git a/aai-traversal/src/main/java/org/openecomp/aai/rest/QueryConsumer.java b/aai-traversal/src/main/java/org/openecomp/aai/rest/QueryConsumer.java
index af1d350..e5f7aad 100644 (file)
--- a/aai-traversal/src/main/java/org/openecomp/aai/rest/QueryConsumer.java
+++ b/aai-traversal/src/main/java/org/openecomp/aai/rest/QueryConsumer.java
@@ -66,7 +66,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-@Path("{version: v9|v1[0]}/query")
+@Path("{version: v9|v1[01]}/query")
 public class QueryConsumer extends RESTAPI {
        
        /** The introspector factory type. */

diff --git a/aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java b/aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java
index 99339b9..ee6b1ab 100644 (file)
--- a/aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java
+++ b/aai-traversal/src/main/java/org/openecomp/aai/rest/search/SearchProvider.java
@@ -59,7 +59,7 @@ import org.openecomp.aai.serialization.queryformats.utils.UrlBuilder;
  *
  */
 
-@Path("/{version: v2|v[789]|v1[0]|latest}/search")
+@Path("/{version: v2|v[789]|v1[01]|latest}/search")
 public class SearchProvider extends RESTAPI {
        
        protected static String authPolicyFunctionName = "search";

diff --git a/aai-traversal/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java b/aai-traversal/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java
index c50dbab..1c73987 100644 (file)
--- a/aai-traversal/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java
+++ b/aai-traversal/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java
@@ -60,7 +60,7 @@ public class UEBNotification {
        public UEBNotification(Loader loader) {
                events = new ArrayList<>();
                currentVersionLoader = LoaderFactory.createLoaderForVersion(loader.getModelType(), AAIProperties.LATEST);
-               notificationVersion = Version.valueOf(AAIConfig.get("aai.notification.current.version","v10"));
+               notificationVersion = Version.valueOf(AAIConfig.get("aai.notification.current.version","v11"));
        }
        
        

diff --git a/aai-traversal/src/test/resources/test_aaiconfig.properties b/aai-traversal/src/test/resources/test_aaiconfig.properties
index 0af948a..926d3f8 100644 (file)
--- a/aai-traversal/src/test/resources/test_aaiconfig.properties
+++ b/aai-traversal/src/test/resources/test_aaiconfig.properties
@@ -41,7 +41,7 @@ aai.auth.cspcookies_on=false
 aai.dbmodel.filename=ex5.json
 
 aai.server.url.base=https://localhost:8446/aai/
-aai.server.url=https://localhost:8446/aai/v10/
+aai.server.url=https://localhost:8446/aai/v11/
 
 aai.truststore.filename=aai_keystore
 aai.truststore.passwd.x=
@@ -81,7 +81,7 @@ aai.rsync.options.list=-v|-t
 aai.rsync.remote.user=aaiadmin
 aai.rsync.enabled=y
 
-aai.notification.current.version=v10
+aai.notification.current.version=v11
 aai.notificationEvent.default.status=UNPROCESSED
 aai.notificationEvent.default.eventType=AAI-EVENT
 aai.notificationEvent.default.domain=devINT1
@@ -92,6 +92,6 @@ aai.notificationEvent.default.version=v9
 # This one lets us enable/disable resource-version checking on updates/deletes
 aai.resourceversion.enableflag=true
 aai.logging.maxStackTraceEntries=10
-aai.default.api.version=v10
+aai.default.api.version=v11