merge of v15 changes to onap

Issue-ID: AAI-2088
Change-Id: I588499af58d0e799d860b2b4362da7c48050fafd
Signed-off-by: LaMont, William (wl2432) <wl2432@us.att.com>
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

5 files changed, 221 insertions, 149 deletions

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d636bb6..cfab945 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -48,7 +48,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
 
 schema.uri.base.path=/aai
 # Lists all of the versions in the schema
-schema.version.list=v8,v9,v10,v11,v12,v13,v14
+schema.version.list=v8,v9,v10,v11,v12,v13,v14,v15
 # Specifies from which version should the depth parameter to default to zero
 schema.version.depth.start=v9
 # Specifies from which version should the related link be displayed in response payload
@@ -62,3 +62,14 @@ schema.version.namespace.change.start=v12
 schema.version.edge.label.start=v12
 # Specifies the version that the application should default to
 schema.version.api.default=v14
+schema.translator.list=schema-service
+#schema.service.client=no-auth
+schema.service.base.url=https://localhost:8452/aai/schema-service/v1/
+schema.service.nodes.endpoint=nodes?version=
+schema.service.edges.endpoint=edgerules?version=
+schema.service.versions.endpoint=versions
+
+schema.service.ssl.key-store=${server.local.startpath}etc/auth/aai_keystore
+schema.service.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
+schema.service.ssl.trust-store=${server.local.startpath}etc/auth/aai_keystore
+schema.service.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
diff --git a/src/main/resources/etc/appprops/aaiEventDMaaPPublisher.properties b/src/main/resources/etc/appprops/aaiEventDMaaPPublisher.properties
index a8f5e95..4b9371f 100644
--- a/src/main/resources/etc/appprops/aaiEventDMaaPPublisher.properties
+++ b/src/main/resources/etc/appprops/aaiEventDMaaPPublisher.properties
@@ -1,4 +1,4 @@
-topic=AAI-EVENT

-partition=AAI

-maxBatchSize=100

-maxAgeMs=250

+topic=AAI-EVENT
+partition=AAI
+maxBatchSize=100
+maxAgeMs=250
diff --git a/src/main/resources/etc/appprops/aaiconfig.properties b/src/main/resources/etc/appprops/aaiconfig.properties
index d2cf54b..c15c6f5 100644
--- a/src/main/resources/etc/appprops/aaiconfig.properties
+++ b/src/main/resources/etc/appprops/aaiconfig.properties
@@ -1,144 +1,149 @@
-#

-# ============LICENSE_START=======================================================

-# org.onap.aai

-# ================================================================================

-# Copyright © 2017-18 AT&T Intellectual Property. All rights reserved.

-# ================================================================================

-# Licensed under the Apache License, Version 2.0 (the "License");

-# you may not use this file except in compliance with the License.

-# You may obtain a copy of the License at

-#

-#    http://www.apache.org/licenses/LICENSE-2.0

-#

-# Unless required by applicable law or agreed to in writing, software

-# distributed under the License is distributed on an "AS IS" BASIS,

-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ============LICENSE_END=========================================================

-

-####################################################################

-#  REMEMBER TO THINK ABOUT ENVIRONMENTAL DIFFERENCES AND CHANGE THE

-#  TEMPLATE AND *ALL* DATAFILES

-####################################################################

-

-aai.config.checktime=1000

-

-# this could come from siteconfig.pl?

-aai.config.nodename=AutomaticallyOverwritten

-

-aai.transaction.logging=true

-aai.transaction.logging.get=true

-aai.transaction.logging.post=true

-

-aai.server.url.base=https://localhost:8443/aai/

-aai.server.url=https://localhost:8443/aai/v14/

-aai.oldserver.url.base=https://localhost:8443/aai/servers/

-aai.oldserver.url=https://localhost:8443/aai/servers/v2/

-aai.global.callback.url=https://localhost:8443/aai/

-

-# Start of INTERNAL Specific Properties

-

-aai.truststore.filename=aai_keystore

-aai.truststore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0

-aai.keystore.filename=aai-client-cert.p12

-aai.keystore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0

-

-aai.realtime.clients=RO,SDNC,MSO,SO

-

-# End of INTERNAL Specific Properties

-

-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=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=v14

-

-# Used by Model-processing code

-aai.model.delete.sleep.per.vtx.msec=500

-aai.model.query.resultset.maxcount=50

-aai.model.query.timeout.sec=90

- 

-# Used by Data Grooming

-aai.grooming.default.max.fix=150

-aai.grooming.default.sleep.minutes=7

-

-# Used by DupeTool

-aai.dupeTool.default.max.fix=25

-aai.dupeTool.default.sleep.minutes=7

-

-aai.model.proc.max.levels=50

-aai.edgeTag.proc.max.levels=50

-

-# Used by the ForceDelete tool

-aai.forceDel.protected.nt.list=cloud-region

-aai.forceDel.protected.edge.count=10

-aai.forceDel.protected.descendant.count=10

-

-# Used for CTAG-Pool generation

-aai.ctagPool.rangeString.vplsPe1=2001-2500

-aai.ctagPool.rangeString.vplsPe2=2501-3000

-

-aai.jms.enable=false

-

-#used by the dataGrooming and dataSnapshot cleanup tasks

-aai.cron.enable.datagroomingcleanup=true

-aai.cron.enable.datasnapshotcleanup=true

-aai.datagrooming.agezip=5

-aai.datagrooming.agedelete=30

-aai.datasnapshot.agezip=5

-aai.datasnapshot.agedelete=30

-

-#used by the dataSnapshot and dataGrooming tasks

-aai.cron.enable.dataSnapshot=true

-aai.cron.enable.dataGrooming=true

-

-#used by the dataGrooming tasks

-aai.datagrooming.enableautofix=true

-aai.datagrooming.enabledupefixon=true

-aai.datagrooming.enabledontfixorphans=true

-aai.datagrooming.enabletimewindowminutes=true

-aai.datagrooming.enableskiphostcheck=false

-aai.datagrooming.enablesleepminutes=false

-aai.datagrooming.enableedgesonly=false

-aai.datagrooming.enableskipedgechecks=false

-aai.datagrooming.enablemaxfix=false

-aai.datagrooming.enablesinglecommits=false

-aai.datagrooming.enabledupecheckoff=false

-aai.datagrooming.enableghost2checkoff=false

-aai.datagrooming.enableghost2fixon=false

-aai.datagrooming.enablef=false

-

-# used by the dataGrooming to set values

-aai.datagrooming.timewindowminutesvalue=10500

-aai.datagrooming.sleepminutesvalue=100

-aai.datagrooming.maxfixvalue=10

-aai.datagrooming.fvalue=10

-

-#timeout for traversal enabled flag

-aai.graphadmin.timeoutenabled=true

-

-#timeout app specific -1 to bypass for that app id, a whole number to override the timeout with that value (in ms)

-aai.graphadmin.timeout.appspecific=JUNITTESTAPP1,1|JUNITTESTAPP2,-1

-

-#default timeout limit added for graphadmin if not overridden (in ms)

-aai.graphadmin.timeoutlimit=180000

-

-# Disable the process check which are oriented towards linux OS

-# These props should only be true for local on windows

-aai.disable.check.snapshot.running=true

-aai.disable.check.grooming.running=true

-

-# Specify the params listed right here that you would have send to the dataSnapshot shell script

-# JUST_TAKE_SNAPSHOT

-# THREADED_SNAPSHOT 2 DEBUG

-# THREADED_SNAPSHOT 2

-aai.datasnapshot.params=JUST_TAKE_SNAPSHOT

-

+#
+# ============LICENSE_START=======================================================
+# org.onap.aai
+# ================================================================================
+# Copyright © 2017-18 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+
+####################################################################
+#  REMEMBER TO THINK ABOUT ENVIRONMENTAL DIFFERENCES AND CHANGE THE
+#  TEMPLATE AND *ALL* DATAFILES
+####################################################################
+
+aai.config.checktime=1000
+
+# this could come from siteconfig.pl?
+aai.config.nodename=AutomaticallyOverwritten
+
+aai.transaction.logging=true
+aai.transaction.logging.get=true
+aai.transaction.logging.post=true
+
+aai.server.url.base=https://localhost:8443/aai/
+aai.server.url=https://localhost:8443/aai/v14/
+aai.oldserver.url.base=https://localhost:8443/aai/servers/
+aai.oldserver.url=https://localhost:8443/aai/servers/v2/
+aai.global.callback.url=https://localhost:8443/aai/
+
+# Start of INTERNAL Specific Properties
+
+aai.truststore.filename=aai_keystore
+aai.truststore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
+aai.keystore.filename=aai-client-cert.p12
+aai.keystore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
+
+aai.realtime.clients=RO,SDNC,MSO,SO
+
+# End of INTERNAL Specific Properties
+
+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=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=v14
+
+# Used by Model-processing code
+aai.model.delete.sleep.per.vtx.msec=500
+aai.model.query.resultset.maxcount=50
+aai.model.query.timeout.sec=90
+ 
+# Used by Data Grooming
+aai.grooming.default.max.fix=150
+aai.grooming.default.sleep.minutes=7
+
+# Used by Data Snapshot
+aai.datasnapshot.default.threads.for.create=16
+
+# Used by DupeTool
+aai.dupeTool.default.max.fix=25
+aai.dupeTool.default.sleep.minutes=7
+
+aai.model.proc.max.levels=50
+aai.edgeTag.proc.max.levels=50
+
+# Used by the ForceDelete tool
+aai.forceDel.protected.nt.list=cloud-region
+aai.forceDel.protected.edge.count=10
+aai.forceDel.protected.descendant.count=10
+
+# Used for CTAG-Pool generation
+aai.ctagPool.rangeString.vplsPe1=2001-2500
+aai.ctagPool.rangeString.vplsPe2=2501-3000
+
+aai.jms.enable=false
+
+#used by the dataGrooming and dataSnapshot cleanup tasks
+aai.cron.enable.datagroomingcleanup=true
+aai.cron.enable.datasnapshotcleanup=true
+aai.datagrooming.agezip=5
+aai.datagrooming.agedelete=30
+aai.datasnapshot.agezip=5
+aai.datasnapshot.agedelete=30
+
+#used by the dataSnapshot and dataGrooming tasks
+aai.cron.enable.dataSnapshot=true
+aai.cron.enable.dataGrooming=true
+
+#used by the dataGrooming tasks
+aai.datagrooming.enableautofix=true
+aai.datagrooming.enabledupefixon=true
+aai.datagrooming.enabledontfixorphans=true
+aai.datagrooming.enabletimewindowminutes=true
+aai.datagrooming.enableskiphostcheck=false
+aai.datagrooming.enablesleepminutes=false
+aai.datagrooming.enableedgesonly=false
+aai.datagrooming.enableskipedgechecks=false
+aai.datagrooming.enablemaxfix=false
+aai.datagrooming.enablesinglecommits=false
+aai.datagrooming.enabledupecheckoff=false
+aai.datagrooming.enableghost2checkoff=false
+aai.datagrooming.enableghost2fixon=false
+aai.datagrooming.enablef=false
+
+# used by the dataGrooming to set values
+aai.datagrooming.timewindowminutesvalue=10500
+aai.datagrooming.sleepminutesvalue=100
+aai.datagrooming.maxfixvalue=10
+aai.datagrooming.fvalue=10
+
+#timeout for traversal enabled flag
+aai.graphadmin.timeoutenabled=true
+
+#timeout app specific -1 to bypass for that app id, a whole number to override the timeout with that value (in ms)
+aai.graphadmin.timeout.appspecific=JUNITTESTAPP1,1|JUNITTESTAPP2,-1
+
+#default timeout limit added for graphadmin if not overridden (in ms)
+aai.graphadmin.timeoutlimit=180000
+
+# Disable the process check which are oriented towards linux OS
+# These props should only be true for local on windows
+aai.disable.check.snapshot.running=true
+aai.disable.check.grooming.running=true
+
+# Specify the params listed right here that you would have send to the dataSnapshot shell script
+# JUST_TAKE_SNAPSHOT
+# THREADED_SNAPSHOT 2 DEBUG
+# THREADED_SNAPSHOT 2
+aai.datasnapshot.params=JUST_TAKE_SNAPSHOT
+
+# Threshold for margin of error (in ms) for resources_with_sot format to derive the most recent http method performed
+aai.resource.formatter.threshold=10
diff --git a/src/main/resources/etc/appprops/error.properties b/src/main/resources/etc/appprops/error.properties
index 708fb1f..1550d6c 100644
--- a/src/main/resources/etc/appprops/error.properties
+++ b/src/main/resources/etc/appprops/error.properties
@@ -32,6 +32,10 @@ AAI_3011=5:6:WARN:3011:400:3000:Unknown XML namespace used in payload
 AAI_3012=5:6:WARN:3012:400:3012:Unrecognized AAI function
 AAI_3013=5:6:WARN:3013:400:3013:Query payload missing required parameters %1
 AAI_3014=5:6:WARN:3014:400:3014:Query payload is invalid %1
+AAI_3025=5:4:FATAL:3025:500:3025:Error connecting to Schema Service - Investigate
+AAI_3026=5:4:FATAL:3026:500:3026:Error reading OXM from Schema Service - Investigate
+AAI_3027=5:4:FATAL:3026:500:3026:Error reading EdgeRules from Schema Service - Investigate
+
 # pol errors
 AAI_3100=5:1:WARN:3100:400:3100:Unsupported operation %1
 AAI_3101=5:1:WARN:3101:403:3101:Attempt by client %1 to execute API %2
diff --git a/src/main/resources/etc/appprops/janusgraph-migration.properties b/src/main/resources/etc/appprops/janusgraph-migration.properties
new file mode 100644
index 0000000..6090c84
--- /dev/null
+++ b/src/main/resources/etc/appprops/janusgraph-migration.properties
@@ -0,0 +1,52 @@
+#
+# ============LICENSE_START=======================================================
+# org.onap.aai
+# ================================================================================
+# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+
+query.fast-property=true
+# the following parameters are not reloaded automatically and require a manual bounce
+storage.backend=inmemory
+storage.hostname=localhost
+
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=aaigraph-dev1.dev
+storage.hbase.ext.zookeeper.znode.parent=/hbase-unsecure
+# Setting db-cache to false ensure the fastest propagation of changes across servers
+cache.db-cache = false
+
+#load graphson file on startup
+load.snapshot.file=false
+query.smart-limit=false
+
+
+#storage.backend=cql
+#storage.hostname=host1,host2,host3
+#storage.cql.replication-strategy-class=NetworkTopologyStrategy
+#storage.cql.replication-strategy-options=options
+# for single datacenter cluster
+#storage.cql.replication-factor=3
+
+#storage.cql.keyspace=aaigraph_single_dc
+#storage.cql.only-use-local-consistency-for-system-operations=true
+#storage.cql.cluster-name=clusterName
+#storage.cql.local-datacenter=dataCenter
+#storage.cql.read-consistency-level=ONE
+#storage.cql.write-consistency-level=QUORUM
+#storage.connection-timeout=100000
+#cache.tx-cache-size = 1000000
+#metrics.enabled=true
\ No newline at end of file