From 67dd59385cf983ef1307e3b3e410a8f773d8a5c3 Mon Sep 17 00:00:00 2001 From: Shashank Kumar Shankar Date: Wed, 28 Feb 2018 17:54:59 -0800 Subject: Add feature to hold configs in filesystem This patch adds feature to hold config files on filesystem and adds all unit tests to have enough coverage for milestones. Change-Id: Icd6f3dc93e0f419500f82f0a6ccd62e500dfc918 Issue-ID: MUSIC-42 Signed-off-by: Shashank Kumar Shankar --- mountpath/default/sampleAAIConfig.properties | 94 +++++++++++++++++++++ mountpath/default/sampleAPPCConfig.properties | 113 ++++++++++++++++++++++++++ 2 files changed, 207 insertions(+) create mode 100644 mountpath/default/sampleAAIConfig.properties create mode 100644 mountpath/default/sampleAPPCConfig.properties (limited to 'mountpath') diff --git a/mountpath/default/sampleAAIConfig.properties b/mountpath/default/sampleAAIConfig.properties new file mode 100644 index 0000000..6052315 --- /dev/null +++ b/mountpath/default/sampleAAIConfig.properties @@ -0,0 +1,94 @@ +#################################################################### +# 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.auth.cspcookies_on=false +aai.dbmodel.filename=ex5.json + +aai.server.url.base=<%= @AAI_SERVER_URL_BASE %> +aai.server.url=<%= @AAI_SERVER_URL %> +aai.global.callback.url=<%= @AAI_GLOBAL_CALLBACK_URL %> + +aai.tools.enableBasicAuth=true +aai.tools.username=AAI +aai.tools.password=AAI + +aai.truststore.filename=<%= @AAI_TRUSTSTORE_FILENAME %> +aai.truststore.passwd.x=<%= @AAI_TRUSTSTORE_PASSWD_X %> +aai.keystore.filename=<%= @AAI_KEYSTORE_FILENAME %> +aai.keystore.passwd.x=<%= @AAI_KEYSTORE_PASSWD_X %> + + +aai.notification.current.version=<%= @AAI_NOTIFICATION_CURRENT_VERSION %> +aai.notificationEvent.default.status=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS %> +aai.notificationEvent.default.eventType=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE %> +aai.notificationEvent.default.domain=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN %> +aai.notificationEvent.default.sourceName=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME %> +aai.notificationEvent.default.sequenceNumber=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER %> +aai.notificationEvent.default.severity=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY %> +aai.notificationEvent.default.version=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_VERSION %> +# This one lets us enable/disable resource-version checking on updates/deletes +aai.resourceversion.enableflag=<%= @RESOURCE_VERSION_ENABLE_FLAG %> +aai.logging.maxStackTraceEntries=10 +aai.default.api.version=<%= @AAI_DEFAULT_API_VERSION %> + + + +# 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.file=150 +aai.grooming.default.sleep.minutes=7 + +aai.model.proc.max.levels=50 +aai.edgeTag.proc.max.levels=50 + +# for transaction log +aai.logging.hbase.interceptor=true +aai.logging.hbase.enabled=true +aai.logging.hbase.logrequest=true +aai.logging.hbase.logresponse=true + +# for gremlin server +aai.server.rebind=g +hbase.table.name=<%= @TXN_HBASE_TABLE_NAME %> +hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS +hbase.zookeeper.quorum=<%= @TXN_ZOOKEEPER_QUORUM %> +hbase.zookeeper.property.clientPort=<%= @TXN_ZOOKEEPER_PROPERTY_CLIENTPORT %> +hbase.zookeeper.znode.parent=<%= @TXN_HBASE_ZOOKEEPER_ZNODE_PARENT %> + +aai.logging.trace.enabled=true +aai.logging.trace.logrequest=false +aai.logging.trace.logresponse=false + + +aai.transaction.logging=true +aai.transaction.logging.get=false +aai.transaction.logging.post=false + +#limit set for bulk consumer APIS +aai.bulkconsumer.payloadlimit=30 + +#uncomment and use header X-OverrideLimit with the value to override the bulk api limit +#aai.bulkconsumer.payloadoverride=AAI-OVERRIDE-KEY +aai.bulkconsumer.payloadoverride=false + +#timeout for crud enabled flag +aai.crud.timeoutenabled=true + +#timeout app specific +aai.crud.timeout.appspecific=JUNITTESTAPP1,1|JUNITTESTAPP2,-1|DCAE-CCS,-1|DCAES,-1|AAI-FILEGEN-GFPIP,-1 + +#default timeout limit added for traversal if not overridden (in ms) +aai.crud.timeoutlimit=180000 \ No newline at end of file diff --git a/mountpath/default/sampleAPPCConfig.properties b/mountpath/default/sampleAPPCConfig.properties new file mode 100644 index 0000000..484337f --- /dev/null +++ b/mountpath/default/sampleAPPCConfig.properties @@ -0,0 +1,113 @@ +### ### +### Properties for demo ### +### ### +appc.demo.poolMembers=10.0.11.1:3904 +appc.demo.topic.read=APPC-CL +appc.demo.topic.write=APPC-CL +appc.demo.client.name=appcDemoEventListener +appc.demo.threads.queuesize.min=1 +appc.demo.threads.queuesize.max=1000 +appc.demo.threads.poolsize.min=1 +appc.demo.threads.poolsize.max=2 +appc.demo.provider.user=admin +appc.demo.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +appc.demo.provider.url=http://localhost:8181/restconf/operations/appc-provider +appc.provider.vfodl.url=http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@10.0.2.1:8282/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/sample-plugin:sample-plugin/pg-streams/ + +# The properties right below are needed to properly call the Master DG to serve demo purposes +appc.service.logic.module.name=APPC +appc.topology.dg.method=topology-operation-all +appc.topology.dg.version=2.0.0 + +# TEMP - Properties that might be needed to make the AAI-APPC connection +org.onap.appc.db.url.appcctl=jdbc:mysql://dbhost:3306/appcctl +org.onap.appc.db.user.appcctl=appcctl +org.onap.appc.db.pass.appcctl=appcctl + +org.onap.appc.db.url.sdnctl=jdbc:mysql://dbhost:3306/sdnctl +org.onap.appc.db.user.sdnctl=sdnctl +org.onap.appc.db.pass.sdnctl=gamma + + +### ### +### OpenStack credentials (these properties also are used in appc-rest-adapter-bundle, appc-chef-adapter-bundle, appc-iaas-adapter-bundle) ### +### ### +provider1.type=OpenStackProvider +provider1.name=OpenStack +provider1.identity=http://localhost:8181/apidoc/explorer/index.html +provider1.tenant1.name=default +provider1.tenant1.domain=default +provider1.tenant1.userid=admin +provider1.tenant1.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + + + + + +### ### +### Properties that are not covered or being replaced from default.properties files. Default value for DMaaP IP is 10.0.11.1:3904 ### +### which is what the Master HEAT Template to instantiate ONAP is pointing to (version R1). All other default values are ### +### left there since these are pre-defined as part of APP-C/ONAP default instantiation with Master HEAT Template ### +### ### + + +# Property below is valid in appc-command-executor-core, appc-license-manager-core, appc-lifecycle-management-core, +# appc-request-handler-core, appc-workflow-management-core (all from the appc-dispatcher package). +dmaap.poolMembers=10.0.11.1:3904 + + +# appc-event-listener-bundle properties (only defined in src/test of default.properties) +appc.LCM.poolMembers=10.0.11.1:3904 +appc.LCM.topic.read=APPC-LCM-READ +appc.LCM.topic.write=APPC-LCM-WRITE +appc.LCM.client.name=APPC-EVENT-LISTENER-TEST +appc.LCM.provider.user=admin +appc.LCM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +appc.LCM.provider.url=http://localhost:8181/restconf/operations/appc-provider-lcm + + +# properties from appc-netconf-adapter-bundle, appc-dg-common, appc-dmaap-adapter-bundle +poolMembers=10.0.11.1:3904 +event.pool.members=10.0.11.1:3904 +restconf.user=admin +restconf.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + + +# properties found in appc-rest-adapter-bundle, appc-chef-adapter-bundle, appc-iaas-adapter-bundle) +#Your OpenStack IP +test.ip=10.0.11.100 +# Your OpenStack Platform's Keystone Port (default is 5000) +test.port=5000 +test.tenantid=test +test.vmid=test +# Port 8774 below is default port for OpenStack's Nova API Service +test.url=http://api.appc.local/vm/9999999/test/99999999-9999-9999-9999-999999999999 +#skips hypervisor check which usually occurs during iaas-adapter-bundle startup +org.onap.appc.iaas.skiphypervisorcheck=true + + +# Properties from default.properties in the src/test and src/main paths of appc-asdc-listener-bundle +appc.sdc.host=10.0.3.1:8443 +appc.sdc.env=APPC-ASDC-ENV +appc.sdc.user=test +appc.sdc.pass=test +appc.sdc.consumer=APPC-ASDC-CONSUMER +appc.sdc.consumer.id=APPC-ASDC-CONSUMER-ID +appc.sdc.provider.url=http://localhost:8181/restconf/operations/AsdcMessage:configuration-document-request + +# Properties used by EventSenderDmaapImpl.java +DCAE.dmaap.event.topic.write=EventSenderTest +DCAE.dmaap.appc.username=test +DCAE.dmaap.appc.password=test +DCAE.dmaap.event.pool.members=10.0.11.1:3904 + +# OAM Listener +appc.OAM.disabled=true +appc.OAM.provider.url=http://localhost:8181/restconf/operations/appc-oam +appc.OAM.poolMembers=10.0.11.1:3904 +appc.OAM.service=ueb +appc.OAM.topic.read=testOAM +appc.OAM.topic.write=testOAM +appc.OAM.client.name=testOAM +appc.OAM.provider.user=admin +appc.OAM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U \ No newline at end of file -- cgit 1.2.3-korg