Add collection under network for v13 and v14

Issue-ID: AAI-1395
Change-Id: I6d18c9686093e70c106efa22afbd536658231a29
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

7 files changed, 10 insertions, 10 deletions

diff --git a/aai-resources/src/main/java/org/onap/aai/rest/BulkAddConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/BulkAddConsumer.java
index 3f60771..50e7634 100644
--- a/aai-resources/src/main/java/org/onap/aai/rest/BulkAddConsumer.java
+++ b/aai-resources/src/main/java/org/onap/aai/rest/BulkAddConsumer.java
@@ -23,7 +23,7 @@ import javax.ws.rs.Path;
 
 import org.onap.aai.restcore.HttpMethod;
 
-@Path("{version: v[8-9]|v1[012]}/bulkadd")
+@Path("{version: v[8-9]|v1[01234]}/bulkadd")
 public class BulkAddConsumer extends BulkConsumer {
 
 	@Override
diff --git a/aai-resources/src/main/java/org/onap/aai/rest/BulkProcessConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/BulkProcessConsumer.java
index 6bf6bc3..2cae668 100644
--- a/aai-resources/src/main/java/org/onap/aai/rest/BulkProcessConsumer.java
+++ b/aai-resources/src/main/java/org/onap/aai/rest/BulkProcessConsumer.java
@@ -23,7 +23,7 @@ import javax.ws.rs.Path;
 
 import org.onap.aai.restcore.HttpMethod;
 
-@Path("{version: v[789]|v1[012]}/bulkprocess")
+@Path("{version: v[789]|v1[01234]}/bulkprocess")
 public class BulkProcessConsumer extends BulkConsumer {
 
 	@Override
diff --git a/aai-resources/src/main/java/org/onap/aai/rest/ExampleConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/ExampleConsumer.java
index 4d99825..d52befd 100644
--- a/aai-resources/src/main/java/org/onap/aai/rest/ExampleConsumer.java
+++ b/aai-resources/src/main/java/org/onap/aai/rest/ExampleConsumer.java
@@ -45,7 +45,7 @@ import org.onap.aai.restcore.RESTAPI;
 /**
  * The Class ExampleConsumer.
  */
-@Path("/{version: v[789]|v1[0123]}/examples")
+@Path("/{version: v[789]|v1[01234]}/examples")
 public class ExampleConsumer extends RESTAPI {
 
 	
diff --git a/aai-resources/src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java
index 0a3f4c4..61f0d88 100644
--- a/aai-resources/src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java
+++ b/aai-resources/src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java
@@ -79,7 +79,7 @@ import com.google.common.base.Joiner;
 /**
  * The Class LegacyMoxyConsumer.
  */
-@Path("{version: v[789]|v1[0123]}")
+@Path("{version: v[789]|v1[01234]}")
 public class LegacyMoxyConsumer extends RESTAPI {
 	
 	private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(LegacyMoxyConsumer.class.getName());
diff --git a/aai-resources/src/main/java/org/onap/aai/rest/URLFromVertexIdConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/URLFromVertexIdConsumer.java
index f423eba..eb54194 100644
--- a/aai-resources/src/main/java/org/onap/aai/rest/URLFromVertexIdConsumer.java
+++ b/aai-resources/src/main/java/org/onap/aai/rest/URLFromVertexIdConsumer.java
@@ -53,7 +53,7 @@ import org.onap.aai.workarounds.LegacyURITransformer;
 /**
  * The Class URLFromVertexIdConsumer.
  */
-@Path("{version: v[789]|v1[0123]}/generateurl")
+@Path("{version: v[789]|v1[01234]}/generateurl")
 public class URLFromVertexIdConsumer extends RESTAPI {
 	private ModelType introspectorFactoryType = ModelType.MOXY;
 	private QueryStyle queryStyle = QueryStyle.TRAVERSAL;
diff --git a/aai-resources/src/main/java/org/onap/aai/rest/VertexIdConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/VertexIdConsumer.java
index 3d90b64..94a6a68 100644
--- a/aai-resources/src/main/java/org/onap/aai/rest/VertexIdConsumer.java
+++ b/aai-resources/src/main/java/org/onap/aai/rest/VertexIdConsumer.java
@@ -62,7 +62,7 @@ import org.onap.aai.serialization.engines.TransactionalGraphEngine;
 /**
  * The Class VertexIdConsumer.
  */
-@Path("{version: v[789]|v1[0123]}/resources")
+@Path("{version: v[789]|v1[01234]}/resources")
 public class VertexIdConsumer extends RESTAPI {
 	
 	private ModelType introspectorFactoryType = ModelType.MOXY;
diff --git a/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties b/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties
index a14e5fe..0d7bc4e 100644
--- a/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties
+++ b/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties
@@ -52,7 +52,7 @@ ecm.openstack.tenantid=b0a529aba48440a39e0caf1aea9b27e3
 aai.avpn.interim.laginterface=ae0
 
 aai.server.url.base=https://localhost:8443/aai/
-aai.server.url=https://localhost:8443/aai/v12/
+aai.server.url=https://localhost:8443/aai/v14/
 aai.global.callback.url=https://localhost:8443/aai/
 
 aai.auth.cspcookies_on=false
@@ -99,18 +99,18 @@ aai.servicedescription.vusp=VIRTUAL USP
 aai.servicedescription.vvig=vVIGaaS
 aai.servicedescription.lrsi=LRSI-OSPF
 
-aai.notification.current.version=v12
+aai.notification.current.version=v14
 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=v12
+aai.notificationEvent.default.version=v14
 # This one lets us enable/disable resource-version checking on updates/deletes
 aai.resourceversion.enableflag=true
 aai.logging.maxStackTraceEntries=10
-aai.default.api.version=v12
+aai.default.api.version=v14
 
 # Used by Model-processing code
 aai.model.delete.sleep.per.vtx.msec=500