From 0e5d88605f1e1693938cc6c5081766eff4cbf7f7 Mon Sep 17 00:00:00 2001 From: "Kajur, Harish (vk250x)" Date: Mon, 13 Aug 2018 15:00:04 -0400 Subject: [PATCH] Update test config for schema ingest library Issue-ID: AAI-1472 Change-Id: I81bc9075eac003495f0cb8506102cf51b84ab0d8 Signed-off-by: Kajur, Harish (vk250x) --- .gitignore | 1 + aai-graphadmin/appconfig/aai_keystore | Bin 0 -> 4929 bytes aai-graphadmin/appconfig/aaiconfig.properties | 146 +++++ aai-graphadmin/appconfig/application.properties | 64 ++ .../appconfig/janusgraph-cached.properties | 43 ++ .../appconfig/janusgraph-realtime.properties | 40 ++ .../appconfig/localhost-access-logback.xml | 62 ++ aai-graphadmin/appconfig/logback.xml | 701 +++++++++++++++++++++ aai-graphadmin/appconfig/realm.properties | 13 + aai-resources/appconfig/aaiconfig.properties | 13 +- aai-resources/appconfig/application.properties | 65 +- aai-resources/appconfig/logback.xml | 13 +- aai-traversal/appconfig/application.properties | 64 +- aai-traversal/appconfig/logback.xml | 14 +- aaicron.sh | 7 - aaicrontab | 1 - deploy_vm1.sh | 65 +- docker-compose-app.yml | 27 +- 18 files changed, 1234 insertions(+), 105 deletions(-) create mode 100644 .gitignore create mode 100644 aai-graphadmin/appconfig/aai_keystore create mode 100644 aai-graphadmin/appconfig/aaiconfig.properties create mode 100644 aai-graphadmin/appconfig/application.properties create mode 100644 aai-graphadmin/appconfig/janusgraph-cached.properties create mode 100644 aai-graphadmin/appconfig/janusgraph-realtime.properties create mode 100644 aai-graphadmin/appconfig/localhost-access-logback.xml create mode 100644 aai-graphadmin/appconfig/logback.xml create mode 100644 aai-graphadmin/appconfig/realm.properties delete mode 100644 aaicron.sh delete mode 100644 aaicrontab diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9019bee --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +aai-schema/** diff --git a/aai-graphadmin/appconfig/aai_keystore b/aai-graphadmin/appconfig/aai_keystore new file mode 100644 index 0000000000000000000000000000000000000000..83cae95273e9c975f891f4ac8c0ea33c9973b358 GIT binary patch literal 4929 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 Mbgr|7JL%Rx08Cf%rvLx| literal 0 HcmV?d00001 diff --git a/aai-graphadmin/appconfig/aaiconfig.properties b/aai-graphadmin/appconfig/aaiconfig.properties new file mode 100644 index 0000000..a11fef1 --- /dev/null +++ b/aai-graphadmin/appconfig/aaiconfig.properties @@ -0,0 +1,146 @@ +# +# ============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://aai.api.simpledemo.onap.org:8443/aai/ +aai.server.url=https://aai.api.simpledemo.onap.org:8443/aai/v11/ +aai.global.callback.url=https://aai.api.simpledemo.onap.org:8443/aai/ + +aai.tools.enableBasicAuth=true +aai.tools.username=AAI +aai.tools.password=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 + diff --git a/aai-graphadmin/appconfig/application.properties b/aai-graphadmin/appconfig/application.properties new file mode 100644 index 0000000..9d6a982 --- /dev/null +++ b/aai-graphadmin/appconfig/application.properties @@ -0,0 +1,64 @@ + +spring.application.name=GraphAdmin + +server.contextPath=/ +spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration + +spring.profiles.active=production,one-way-ssl,dmaap + +spring.jersey.application-path=${schema.uri.base.path} + +#This property is used to set the Tomcat connector attributes.developers can define multiple attributes separated by comma +#tomcat.connector.attributes=allowTrace-true +#The max number of active threads in this pool +jetty.threadPool.maxThreads=200 +#The minimum number of threads always kept alive +jetty.threadPool.minThreads=8 +#The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads +server.tomcat.max-idle-time=60000 + +# If you get an application startup failure that the port is already taken +# If thats not it, please check if the key-store file path makes sense +server.local.startpath=src/main/resources/ +server.basic.auth.location=${server.local.startpath}etc/auth/realm.properties + +server.port=8449 +server.ssl.enabled-protocols=TLSv1.1,TLSv1.2 +server.ssl.key-store=${server.local.startpath}etc/auth/aai_keystore +server.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0) +server.ssl.trust-store=${server.local.startpath}etc/auth/aai_keystore +server.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0) +server.ssl.client-auth=want +server.ssl.key-store-type=JKS + +# JMS bind address host port +jms.bind.address=tcp://localhost:61450 +dmaap.ribbon.listOfServers=mr.api.simpledemo.onap.org:3904 + +# Schema related attributes for the oxm and edges +# Any additional schema related attributes should start with prefix schema +schema.configuration.location=N/A +schema.source.name=onap +schema.nodes.location=${server.local.startpath}/schema/${schema.source.name}/oxm/ +schema.edges.location=${server.local.startpath}/schema/${schema.source.name}/dbedgerules/ + +schema.ingest.file=${server.local.startpath}/application.properties + +# Schema Version Related Attributes + +schema.uri.base.path=/aai +# Lists all of the versions in the schema +schema.version.list=v8,v9,v10,v11,v12,v13,v14 +# 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 +schema.version.related.link.start=v10 +# Specifies from which version should the client see only the uri excluding host info +# Before this version server base will also be included +schema.version.app.root.start=v11 + +schema.version.namespace.change.start=v12 +# Specifies from which version should the client start seeing the edge label in payload +schema.version.edge.label.start=v12 +# Specifies the version that the application should default to +schema.version.api.default=v14 diff --git a/aai-graphadmin/appconfig/janusgraph-cached.properties b/aai-graphadmin/appconfig/janusgraph-cached.properties new file mode 100644 index 0000000..c2110f7 --- /dev/null +++ b/aai-graphadmin/appconfig/janusgraph-cached.properties @@ -0,0 +1,43 @@ +# +# ============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========================================================= +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# + +query.fast-property=true +query.smart-limit=false + +# the following parameters are not reloaded automatically and require a manual bounce +storage.backend=cassandra +storage.hostname=aai.hbase.simpledemo.onap.org + +storage.cassandra.keyspace=aaigraph + +#schema.default=none +storage.lock.wait-time=300 +storage.hbase.table=aaigraph-dev1.dev +storage.hbase.ext.zookeeper.znode.parent=/hbase +#caching on +cache.db-cache = true +cache.db-cache-clean-wait = 20 +cache.db-cache-time = 180000 +cache.db-cache-size = 0.3 + +#load graphson file on startup +load.snapshot.file=false diff --git a/aai-graphadmin/appconfig/janusgraph-realtime.properties b/aai-graphadmin/appconfig/janusgraph-realtime.properties new file mode 100644 index 0000000..4791431 --- /dev/null +++ b/aai-graphadmin/appconfig/janusgraph-realtime.properties @@ -0,0 +1,40 @@ +# +# ============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========================================================= +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# + +query.fast-property=true +query.smart-limit=false + +# the following parameters are not reloaded automatically and require a manual bounce +storage.backend=cassandra +storage.hostname=aai.hbase.simpledemo.onap.org + +storage.cassandra.keyspace=aaigraph + +#schema.default=none +storage.lock.wait-time=300 +storage.hbase.table=aaigraph-dev1.dev +storage.hbase.ext.zookeeper.znode.parent=/hbase +# 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 diff --git a/aai-graphadmin/appconfig/localhost-access-logback.xml b/aai-graphadmin/appconfig/localhost-access-logback.xml new file mode 100644 index 0000000..a318796 --- /dev/null +++ b/aai-graphadmin/appconfig/localhost-access-logback.xml @@ -0,0 +1,62 @@ + + + + + ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log + + ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd} + + + + %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D + + + + + + \ No newline at end of file diff --git a/aai-graphadmin/appconfig/logback.xml b/aai-graphadmin/appconfig/logback.xml new file mode 100644 index 0000000..8f40031 --- /dev/null +++ b/aai-graphadmin/appconfig/logback.xml @@ -0,0 +1,701 @@ + + + + + + + + + + + + + + + + + + + + + + + + + %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} + + + + + + ${logDirectory}/rest/sane.log + + ${logDirectory}/rest/sane.log.%d{yyyy-MM-dd} + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n + + + + + + 1000 + true + + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/rest/metrics.log + + ${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd} + + + + ${eelfMetricLogPattern} + + + + 1000 + true + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/rest/debug.log + + ${logDirectory}/rest/debug.log.%d{yyyy-MM-dd} + + + + ${eelfLogPattern} + + + + + 1000 + true + + + + + + WARN + + ${logDirectory}/rest/error.log + + ${logDirectory}/rest/error.log.%d{yyyy-MM-dd} + + + + ${"eelfErrorLogPattern"} + + + + + 1000 + true + + + + + ${logDirectory}/rest/audit.log + + ${logDirectory}/rest/audit.log.%d{yyyy-MM-dd} + + + + ${eelfAuditLogPattern} + + + + + 1000 + true + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/rest/translog.log + + ${logDirectory}/rest/translog.log.%d{yyyy-MM-dd} + + + + ${eelfTransLogPattern} + + + + + 1000 + true + + + + + + WARN + + ${logDirectory}/dmaapAAIEventConsumer/error.log + + ${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd} + + + + ${"eelfErrorLogPattern"} + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/dmaapAAIEventConsumer/debug.log + + ${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd} + + + + ${eelfLogPattern} + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/dmaapAAIEventConsumer/metrics.log + + ${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd} + + + + ${eelfMetricLogPattern} + + + + + WARN + + ${logDirectory}/external/external.log + + ${logDirectory}/external/external.log.%d{yyyy-MM-dd} + + + + ${eelfLogPattern} + + + + + + + WARN + + ${logDirectory}/dataGrooming/error.log + + ${logDirectory}/dataGrooming/error.log.%d{yyyy-MM-dd} + + + ${eelfErrorLogPattern} + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/dataGrooming/debug.log + + ${logDirectory}/dataGrooming/debug.log.%d{yyyy-MM-dd} + + + ${eelfLogPattern} + + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/dataGrooming/metrics.log + + ${logDirectory}/dataGrooming/metrics.log.%d{yyyy-MM-dd} + + + ${eelfMetricLogPattern} + + + + + + + + + WARN + + ${logDirectory}/dataSnapshot/error.log + + ${logDirectory}/dataSnapshot/error.log.%d{yyyy-MM-dd} + + + ${eelfErrorLogPattern} + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/dataSnapshot/debug.log + + ${logDirectory}/dataSnapshot/debug.log.%d{yyyy-MM-dd} + + + ${eelfLogPattern} + + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/dataSnapshot/metrics.log + + ${logDirectory}/dataSnapshot/metrics.log.%d{yyyy-MM-dd} + + + ${eelfMetricLogPattern} + + + + + + + + + WARN + + ${logDirectory}/createDBSchema/error.log + + ${logDirectory}/createDBSchema/error.log.%d{yyyy-MM-dd} + + + ${"eelfErrorLogPattern"} + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/createDBSchema/debug.log + + ${logDirectory}/createDBSchema/debug.log.%d{yyyy-MM-dd} + + + ${eelfLogPattern} + + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/createDBSchema/metrics.log + + ${logDirectory}/createDBSchema/metrics.log.%d{yyyy-MM-dd} + + + ${eelfMetricLogPattern} + + + + + + + + WARN + + ${logDirectory}/misc/error.log + + ${logDirectory}/misc/error.log.%d{yyyy-MM-dd} + + + ${"eelfErrorLogPattern"} + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/misc/debug.log + + ${logDirectory}/misc/debug.log.%d{yyyy-MM-dd} + + + ${eelfLogPattern} + + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/misc/metrics.log + + ${logDirectory}/misc/metrics.log.%d{yyyy-MM-dd} + + + ${eelfMetricLogPattern} + + + + + + + + WARN + + ${logDirectory}/pullInvData/error.log + + ${logDirectory}/pullInvData/error.log.%d{yyyy-MM-dd} + + + ${"eelfErrorLogPattern"} + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/pullInvData/debug.log + + ${logDirectory}/pullInvData/debug.log.%d{yyyy-MM-dd} + + + ${eelfLogPattern} + + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/pullInvData/metrics.log + + ${logDirectory}/pullInvData/metrics.log.%d{yyyy-MM-dd} + + + ${eelfMetricLogPattern} + + + + + + + WARN + + ${logDirectory}/dataExport/error.log + + ${logDirectory}/dataExport/error.log.%d{yyyy-MM-dd} + + + ${eelfErrorLogPattern} + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/dataExport/debug.log + + ${logDirectory}/dataExport/debug.log.%d{yyyy-MM-dd} + + + ${eelfLogPattern} + + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/dataExport/metrics.log + + ${logDirectory}/dataExport/metrics.log.%d{yyyy-MM-dd} + + + ${eelfMetricLogPattern} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log + + + ${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip + + 1 + 9 + + + 5MB + + + eelfAuditLogPattern + + + + + ${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log + + + ${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip + + 1 + 9 + + + 5MB + + + "%d [%thread] %-5level %logger{1024} - %msg%n" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/aai-graphadmin/appconfig/realm.properties b/aai-graphadmin/appconfig/realm.properties new file mode 100644 index 0000000..f0e0172 --- /dev/null +++ b/aai-graphadmin/appconfig/realm.properties @@ -0,0 +1,13 @@ +# format : username: password[,rolename ...] +# default username/password: AAI/AAI, MSO/MSO, ModelLoader/ModelLoader... +AAI:OBF:1gfr1ev31gg7,admin +MSO:OBF:1jzx1lz31k01,admin +SDNC:OBF:1itr1i0l1i151isv,admin +DCAE:OBF:1g8u1f9d1f991g8w,admin +POLICY:OBF:1mk61i171ima1im41i0j1mko,admin +ASDC:OBF:1f991j0u1j001f9d,admin +VID:OBF:1jm91i0v1jl9,admin +APPC:OBF:1f991ksf1ksf1f9d,admin +ModelLoader:OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw,admin +AaiUI:OBF:1gfr1p571unz1p4j1gg7,admin +OOF:OBF:1img1ke71ily,admin diff --git a/aai-resources/appconfig/aaiconfig.properties b/aai-resources/appconfig/aaiconfig.properties index fb32ac8..bfef486 100644 --- a/aai-resources/appconfig/aaiconfig.properties +++ b/aai-resources/appconfig/aaiconfig.properties @@ -35,13 +35,8 @@ aai.config.checktime=1000 # this could come from siteconfig.pl? aai.config.nodename=AutomaticallyOverwritten - - -aai.auth.cspcookies_on=false -aai.dbmodel.filename=ex5.json - aai.server.url.base=https://aai.api.simpledemo.onap.org:8443/aai/ -aai.server.url=https://aai.api.simpledemo.onap.org:8443/aai/v11/ +aai.server.url=https://aai.api.simpledemo.onap.org:8443/aai/v14/ aai.global.callback.url=https://aai.api.simpledemo.onap.org:8443/aai/ aai.tools.enableBasicAuth=true @@ -54,18 +49,18 @@ aai.keystore.filename=aai_keystore aai.keystore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0 -aai.notification.current.version=v11 +aai.notification.current.version=v14 aai.notificationEvent.default.status=UNPROCESSED aai.notificationEvent.default.eventType=AAI-EVENT aai.notificationEvent.default.domain=dev aai.notificationEvent.default.sourceName=aai aai.notificationEvent.default.sequenceNumber=0 aai.notificationEvent.default.severity=NORMAL -aai.notificationEvent.default.version=v11 +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=v11 +aai.default.api.version=v14 diff --git a/aai-resources/appconfig/application.properties b/aai-resources/appconfig/application.properties index b9c51ea..c3b9d0b 100644 --- a/aai-resources/appconfig/application.properties +++ b/aai-resources/appconfig/application.properties @@ -8,9 +8,12 @@ spring.application.name=aai-resources spring.jersey.type=filter server.contextPath=/ + spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration -spring.profiles.active=production,dmaap +spring.jersey.application-path=${schema.uri.base.path} + +spring.profiles.active=production,one-way-ssl,dmaap #The max number of active threads in this pool server.tomcat.max-threads=200 #The minimum number of threads always kept alive @@ -18,15 +21,6 @@ server.tomcat.min-Spare-Threads=25 #The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads server.tomcat.max-idle-time=60000 - -#Add this properties only if you want to change the URL, AJSC Framework interceptors will intercept -#com.att.ajsc.common.interceptors.PreInterceptor.url=/** -#com.att.ajsc.common.interceptors.PostInterceptor.url=/** - -#Servlet context parameters -server.context_parameters.p-name=value #context parameter with p-name as key and value as value. -kubernetes.namespace=org-onap-aai - # If you get an application startup failure that the port is already taken # If thats not it, please check if the key-store file path makes sense server.local.startpath=aai-resources/src/main/resources/ @@ -43,30 +37,33 @@ server.ssl.key-store-type=JKS # JMS bind address host port jms.bind.address=tcp://localhost:61647 -dmaap.ribbon.eureka.enabled=false dmaap.ribbon.listOfServers=mr.api.simpledemo.onap.org:3904 -# Number of milliseconds to wait before making ping requests again -dmaap.ribbon.ServerListRefreshInterval=75000 -dmaap.ribbon.NFLoadBalancerPingInterval=75000 -dmaap.ribbon.NFLoadBalancerRuleClassName=com.netflix.loadbalancer.AvailabilityFilteringRule -dmaap.ribbon.NFLoadBalancerPingClassName=org.onap.aai.config.HttpPingImpl -dmaap.ribbon.EnableMarkingServerDownOnReachingFailureLimit=true -dmaap.ribbon.ServerDownFailureLimit=1 -# This needs to be verified but it seems that adding this property should automatically -# Make the dmaap client change the url from http to https depending on the server -dmaap.ribbon.securePorts=3905 -# Custom Dmaap Specific Configuration -dmaap.ribbon.username= -dmaap.ribbon.password= -dmaap.ribbon.health.endpoint=/topics/AAI-EVENT -# Number of seconds to wait for the ping to work and might need to increase this if the pings are all failing -dmaap.ribbon.pingport.timeout=3 +# Schema related attributes for the oxm and edges +# Any additional schema related attributes should start with prefix schema +schema.configuration.location=N/A +schema.source.name=onap +schema.nodes.location=${server.local.startpath}/schema/${schema.source.name}/oxm/ +schema.edges.location=${server.local.startpath}/schema/${schema.source.name}/dbedgerules/ + +schema.ingest.file=${server.local.startpath}/application.properties + +# Schema Version Related Attributes + +schema.uri.base.path=/aai +# Lists all of the versions in the schema +schema.version.list=v8,v9,v10,v11,v12,v13,v14 +# 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 +schema.version.related.link.start=v10 +# Specifies from which version should the client see only the uri excluding host info +# Before this version server base will also be included +schema.version.app.root.start=v11 +# Specifies from which version should the namespace be changed +schema.version.namespace.change.start=v12 +# Specifies from which version should the client start seeing the edge label in payload +schema.version.edge.label.start=v12 +# Specifies the version that the application should default to +schema.version.api.default=v14 -niws.loadbalancer.dmaap.filterCircuitTripped=true -niws.loadbalancer.dmaap.connectionFailureCountThreshold=3 -niws.loadbalancer.dmaap.circuitTripMaxTimeoutSeconds=180 -#dmaap.ribbon.retryableStatusCodes=404,503 -#dmaap.ribbon.retryableStatusCodes.MaxAutoRetriesNextServer=2 -#dmaap.ribbon.retryableStatusCodes.MaxAutoRetries=2 -#dmaap.ribbon.retryableStatusCodes.OkToRetryOnAllOperations=true diff --git a/aai-resources/appconfig/logback.xml b/aai-resources/appconfig/logback.xml index ee7ee61..e8301e6 100644 --- a/aai-resources/appconfig/logback.xml +++ b/aai-resources/appconfig/logback.xml @@ -30,13 +30,14 @@ + - - - - - - + + + + + + diff --git a/aai-traversal/appconfig/application.properties b/aai-traversal/appconfig/application.properties index 0292512..3cd69cc 100644 --- a/aai-traversal/appconfig/application.properties +++ b/aai-traversal/appconfig/application.properties @@ -10,7 +10,9 @@ spring.jersey.type=filter server.contextPath=/ spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration -spring.profiles.active=production,dmaap +spring.jersey.application-path=${schema.uri.base.path} + +spring.profiles.active=production,one-way-ssl,dmaap #The max number of active threads in this pool server.tomcat.max-threads=200 #The minimum number of threads always kept alive @@ -18,15 +20,6 @@ server.tomcat.min-Spare-Threads=25 #The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads server.tomcat.max-idle-time=60000 - -#Add this properties only if you want to change the URL, AJSC Framework interceptors will intercept -#com.att.ajsc.common.interceptors.PreInterceptor.url=/** -#com.att.ajsc.common.interceptors.PostInterceptor.url=/** - -#Servlet context parameters -server.context_parameters.p-name=value #context parameter with p-name as key and value as value. -kubernetes.namespace=org-onap-aai - # If you get an application startup failure that the port is already taken # If thats not it, please check if the key-store file path makes sense server.local.startpath=aai-traversal/src/main/resources/ @@ -43,30 +36,33 @@ server.ssl.key-store-type=JKS # JMS bind address host port jms.bind.address=tcp://localhost:61647 -dmaap.ribbon.eureka.enabled=false dmaap.ribbon.listOfServers=mr.api.simpledemo.onap.org:3904 -# Number of milliseconds to wait before making ping requests again -dmaap.ribbon.ServerListRefreshInterval=75000 -dmaap.ribbon.NFLoadBalancerPingInterval=75000 -dmaap.ribbon.NFLoadBalancerRuleClassName=com.netflix.loadbalancer.AvailabilityFilteringRule -dmaap.ribbon.NFLoadBalancerPingClassName=org.onap.aai.config.HttpPingImpl -dmaap.ribbon.EnableMarkingServerDownOnReachingFailureLimit=true -dmaap.ribbon.ServerDownFailureLimit=1 -# This needs to be verified but it seems that adding this property should automatically -# Make the dmaap client change the url from http to https depending on the server -dmaap.ribbon.securePorts=3905 -# Custom Dmaap Specific Configuration -dmaap.ribbon.username= -dmaap.ribbon.password= -dmaap.ribbon.health.endpoint=/topics/AAI-EVENT -# Number of seconds to wait for the ping to work and might need to increase this if the pings are all failing -dmaap.ribbon.pingport.timeout=3 +# Schema related attributes for the oxm and edges +# Any additional schema related attributes should start with prefix schema +schema.configuration.location=N/A +schema.source.name=onap +schema.nodes.location=${server.local.startpath}/schema/${schema.source.name}/oxm/ +schema.edges.location=${server.local.startpath}/schema/${schema.source.name}/dbedgerules/ + +schema.ingest.file=${server.local.startpath}/application.properties + +# Schema Version Related Attributes + +schema.uri.base.path=/aai +# Lists all of the versions in the schema +schema.version.list=v8,v9,v10,v11,v12,v13,v14 +# 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 +schema.version.related.link.start=v10 +# Specifies from which version should the client see only the uri excluding host info +# Before this version server base will also be included +schema.version.app.root.start=v11 +# Specifies from which version should the namespace be changed +schema.version.namespace.change.start=v12 +# Specifies from which version should the client start seeing the edge label in payload +schema.version.edge.label.start=v12 +# Specifies the version that the application should default to +schema.version.api.default=v14 -niws.loadbalancer.dmaap.filterCircuitTripped=true -niws.loadbalancer.dmaap.connectionFailureCountThreshold=3 -niws.loadbalancer.dmaap.circuitTripMaxTimeoutSeconds=180 -#dmaap.ribbon.retryableStatusCodes=404,503 -#dmaap.ribbon.retryableStatusCodes.MaxAutoRetriesNextServer=2 -#dmaap.ribbon.retryableStatusCodes.MaxAutoRetries=2 -#dmaap.ribbon.retryableStatusCodes.OkToRetryOnAllOperations=true diff --git a/aai-traversal/appconfig/logback.xml b/aai-traversal/appconfig/logback.xml index 57bb5f6..aca13a1 100644 --- a/aai-traversal/appconfig/logback.xml +++ b/aai-traversal/appconfig/logback.xml @@ -30,14 +30,14 @@ - - - - - - - + + + + + + + diff --git a/aaicron.sh b/aaicron.sh deleted file mode 100644 index 80b70fe..0000000 --- a/aaicron.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -RESOURCES_COUNT=$(docker ps | grep 'testconfig_aai-resources.api.simpledemo.openecomp.org_1' | wc -l); - -if [ ${RESOURCES_COUNT} -eq 1 ]; then - docker exec -u aaiadmin testconfig_aai-resources.api.simpledemo.openecomp.org_1 /opt/app/aai-resources/bin/dataSnapshot.sh >> /var/log/aaicron.log 2>&1 -fi; diff --git a/aaicrontab b/aaicrontab deleted file mode 100644 index 56d2b41..0000000 --- a/aaicrontab +++ /dev/null @@ -1 +0,0 @@ -0 * * * * /bin/bash /opt/test-config/aaicron.sh diff --git a/deploy_vm1.sh b/deploy_vm1.sh index 9cd1cf8..7370201 100755 --- a/deploy_vm1.sh +++ b/deploy_vm1.sh @@ -9,6 +9,7 @@ fi export RESOURCES_LOGS="/opt/aai/logroot/AAI-RESOURCES"; export TRAVERSAL_LOGS="/opt/aai/logroot/AAI-TRAVERSAL"; +export GRAPHADMIN_LOGS="/opt/aai/logroot/AAI-GRAPHADMIN"; export SEARCH_LOGS="/opt/aai/logroot/AAI-SEARCH"; export DATA_ROUTER_LOGS="/opt/aai/logroot/AAI-DATA-ROUTER"; export MODEL_LOADER_LOGS="/opt/aai/logroot/AAI-MODEL-LOADER"; @@ -18,6 +19,12 @@ export CRUD_LOGS="/opt/aai/logroot/AAI-CRUD-SERVICE"; export SPIKE_LOGS="/opt/aai/logroot/AAI-SPIKE-SERVICE"; export BABEL_LOGS="/opt/aai/logroot/AAI-BAS"; +if [ ! -d "$GRAPHADMIN_LOGS" ]; +then + echo "Warning: Unable to find the volume directory $GRAPHADMIN_LOGS so creating it as regular directory"; + mkdir -p $GRAPHADMIN_LOGS; +fi; + if [ ! -d "$RESOURCES_LOGS" ]; then echo "Warning: Unable to find the volume directory $RESOURCES_LOGS so creating it as regular directory"; @@ -90,8 +97,9 @@ DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) DOCKER_REGISTRY=${NEXUS_DOCKER_REPO} -RESOURCES_DOCKER_IMAGE_VERSION=1.2.2 -TRAVERSAL_DOCKER_IMAGE_VERSION=1.2.2 +RESOURCES_DOCKER_IMAGE_VERSION=1.3-STAGING-latest +TRAVERSAL_DOCKER_IMAGE_VERSION=1.3-STAGING-latest +GRAPHADMIN_DOCKER_IMAGE_VERSION=1.0-STAGING-latest SEARCH_DATA_SERVICE_DOCKER_IMAGE_VERSION=1.2.1 DATA_ROUTER_DOCKER_IMAGE_VERSION=1.2.2 MODEL_LOADER_DOCKER_IMAGE_VERSION=1.2.1 @@ -142,6 +150,49 @@ function check_if_user_exists(){ } } +# Instead of duplicating the changes from aai-common +# Clone the repo and extract the oxm and dbedgerules +function retrieve_schema_edgerules(){ + + local current_branch=$(git rev-parse --abbrev-ref HEAD); + local current_dir=$(pwd); + + local microservice_name=aai-common; + temp_dir=/tmp/${microservice_name}-$(uuidgen); + ( + mkdir -p ${temp_dir} && cd ${temp_dir}; + rm -r ${current_dir}/aai-schema + + git init + git remote add origin https://gerrit.onap.org/r/aai/aai-common + git config core.sparsecheckout true + + # Specifies which folders to checkout from the repo + # Limited to only the aai-resources as we don't need other folders from + # microservice deployment for this repository + + echo "aai-schema/src/main/resources/**" >> .git/info/sparse-checkout + + git fetch --depth=1 origin ${current_branch} && { + git checkout ${current_branch} + } || { + echo "Unable to find the branch ${current_branch} in aai-common, so using default branch ${default_branch}"; + git fetch --depth=1 origin ${default_branch} + git checkout ${default_branch} + } + + mkdir -p ${current_dir}/aai-schema + cp -R ${temp_dir}/aai-schema/src/main/resources/onap/ ${current_dir}/aai-schema + + rm -rf ${temp_dir} + ); +} + +retrieve_schema_edgerules; + +docker pull ${DOCKER_REGISTRY}/onap/aai-graphadmin:${GRAPHADMIN_DOCKER_IMAGE_VERSION}; +docker tag $DOCKER_REGISTRY/onap/aai-graphadmin:${GRAPHADMIN_DOCKER_IMAGE_VERSION} $DOCKER_REGISTRY/onap/aai-graphadmin:latest; + docker pull ${DOCKER_REGISTRY}/onap/aai-resources:${RESOURCES_DOCKER_IMAGE_VERSION}; docker tag $DOCKER_REGISTRY/onap/aai-resources:$RESOURCES_DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/onap/aai-resources:latest; @@ -190,12 +241,16 @@ fi; chown -R $USER_ID:$USER_ID $RESOURCE_LOGS $TRAVERSAL_LOGS; chown -R 341790:492381 $BABEL_LOGS; -$DOCKER_COMPOSE_CMD run --rm aai-resources.api.simpledemo.onap.org createDBSchema.sh +$DOCKER_COMPOSE_CMD run --rm aai-graphadmin.api.simpledemo.onap.org createDBSchema.sh + +GRAPHADMIN_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-graphadmin.api.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1); +wait_for_container $GRAPHADMIN_CONTAINER_NAME 'GraphAdmin Microservice Started'; + +# Deploy haproxy and traversal at the same time for traversal to make updateQuery against resources using haproxy RESOURCES_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-resources.api.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1); wait_for_container $RESOURCES_CONTAINER_NAME 'Resources Microservice Started'; -# Deploy haproxy and traversal at the same time for traversal to make updateQuery against resources using haproxy $DOCKER_COMPOSE_CMD up -d aai-traversal.api.simpledemo.onap.org aai.api.simpledemo.onap.org sleep 3; @@ -215,5 +270,3 @@ $DOCKER_COMPOSE_CMD up -d spike-service $DOCKER_COMPOSE_CMD up -d babel echo "A&AI Microservices are successfully started"; - -crontab < /opt/test-config/aaicrontab diff --git a/docker-compose-app.yml b/docker-compose-app.yml index 256579c..d2395d2 100644 --- a/docker-compose-app.yml +++ b/docker-compose-app.yml @@ -6,7 +6,6 @@ services: environment: - LOCAL_USER_ID=${USER_ID} - LOCAL_GROUP_ID=${GROUP_ID} - - SKIP_CREATE_DB_SCHEMA_AT_STARTUP=true ports: - 8447:8447 volumes: @@ -19,6 +18,7 @@ services: - /opt/test-config/aai-resources/appconfig/localhost-access-logback.xml:/opt/app/aai-resources/resources/localhost-access-logback.xml - /opt/test-config/aai-resources/appconfig/aai_keystore:/opt/app/aai-resources/resources/etc/auth/aai_keystore - /opt/test-config/aai-resources/appconfig/realm.properties:/opt/app/aai-resources/resources/etc/auth/realm.properties + - /opt/test-config/aai-schema/:/opt/app/aai-resources/resources/schema/ logging: driver: "json-file" options: @@ -41,6 +41,7 @@ services: - /opt/test-config/aai-traversal/appconfig/localhost-access-logback.xml:/opt/app/aai-traversal/resources/localhost-access-logback.xml - /opt/test-config/aai-traversal/appconfig/aai_keystore:/opt/app/aai-traversal/resources/etc/auth/aai_keystore - /opt/test-config/aai-traversal/appconfig/realm.properties:/opt/app/aai-traversal/resources/etc/auth/realm.properties + - /opt/test-config/aai-schema/:/opt/app/aai-resources/resources/schema/ ports: - 8446:8446 logging: @@ -48,6 +49,30 @@ services: options: max-size: "30m" max-file: "5" + aai-graphadmin.api.simpledemo.onap.org: + image: ${DOCKER_REGISTRY}/onap/aai-graphadmin + hostname: aai-graphadmin.api.simpledemo.onap.org + environment: + - LOCAL_USER_ID=${USER_ID} + - LOCAL_GROUP_ID=${GROUP_ID} + volumes: + - ${GRAPHADMIN_LOGS}:/opt/aai/logroot/AAI-GA + - /opt/test-config/aai-graphadmin/appconfig/janusgraph-realtime.properties:/opt/app/aai-graphadmin/resources/etc/appprops/janusgraph-realtime.properties + - /opt/test-config/aai-graphadmin/appconfig/janusgraph-cached.properties:/opt/app/aai-graphadmin/resources/etc/appprops/janusgraph-cached.properties + - /opt/test-config/aai-graphadmin/appconfig/aaiconfig.properties:/opt/app/aai-graphadmin/resources/etc/appprops/aaiconfig.properties + - /opt/test-config/aai-graphadmin/appconfig/application.properties:/opt/app/aai-graphadmin/resources/application.properties + - /opt/test-config/aai-graphadmin/appconfig/logback.xml:/opt/app/aai-graphadmin/resources/logback.xml + - /opt/test-config/aai-graphadmin/appconfig/localhost-access-logback.xml:/opt/app/aai-graphadmin/resources/localhost-access-logback.xml + - /opt/test-config/aai-graphadmin/appconfig/aai_keystore:/opt/app/aai-graphadmin/resources/etc/auth/aai_keystore + - /opt/test-config/aai-graphadmin/appconfig/realm.properties:/opt/app/aai-graphadmin/resources/etc/auth/realm.properties + - /opt/test-config/aai-schema/:/opt/app/aai-resources/resources/schema/ + ports: + - 8449:8449 + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" aai.api.simpledemo.onap.org: image: ${AAI_HAPROXY_IMAGE}:${AAI_HAPROXY_VERSION} hostname: aai.api.simpledemo.onap.org -- 2.16.6