From 0e5d88605f1e1693938cc6c5081766eff4cbf7f7 Mon Sep 17 00:00:00 2001 From: "Kajur, Harish (vk250x)" Date: Mon, 13 Aug 2018 15:00:04 -0400 Subject: Update test config for schema ingest library Issue-ID: AAI-1472 Change-Id: I81bc9075eac003495f0cb8506102cf51b84ab0d8 Signed-off-by: Kajur, Harish (vk250x) --- aai-resources/appconfig/aaiconfig.properties | 13 ++---- aai-resources/appconfig/application.properties | 65 ++++++++++++-------------- aai-resources/appconfig/logback.xml | 13 +++--- 3 files changed, 42 insertions(+), 49 deletions(-) (limited to 'aai-resources/appconfig') 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 @@ + - - - - - - + + + + + + -- cgit 1.2.3-korg