From 7b42006c51d4f014f72ae39170544a85d2f09fb5 Mon Sep 17 00:00:00 2001 From: Shawn Severin Date: Mon, 11 Dec 2017 15:42:52 -0500 Subject: Adding UI extensibility Adding the ability for Sparky developers to create their own custom front-end views Issue-ID: AAI-542 Change-Id: I83f9608639799e3bf85b654f44a0a7a5a85ad264 Signed-off-by: Shawn Severin --- src/test/resources/appconfig/aai.properties | 87 ---------- .../resources/appconfig/elasticsearch.properties | 70 -------- .../appconfig/etc/aaiEntityNodeDescriptors.json | 188 --------------------- src/test/resources/appconfig/etc/ajsc-chef.jks | Bin 5256 -> 0 bytes src/test/resources/appconfig/etc/ajsc-jetty.xml | 128 -------------- .../resources/appconfig/etc/ajsc-override-web.xml | 70 -------- src/test/resources/appconfig/etc/ajscJetty.jks | Bin 3736 -> 0 bytes .../appconfig/etc/autoSuggestMappings.json | 10 -- .../appconfig/etc/autoSuggestSettings.json | 21 --- .../resources/appconfig/etc/dynamicMappings.json | 14 -- .../appconfig/etc/entityCountHistoryMappings.json | 16 -- src/test/resources/appconfig/etc/es_mappings.json | 32 ---- src/test/resources/appconfig/etc/es_settings.json | 36 ---- .../appconfig/etc/jul-redirect.properties | 13 -- src/test/resources/appconfig/etc/keyfile | 27 --- src/test/resources/appconfig/etc/runner-web.xml | 112 ------------ src/test/resources/appconfig/roles.config | 6 - .../resources/appconfig/search-service.properties | 29 ---- .../appconfig/suggestive-search.properties | 27 --- .../resources/appconfig/synchronizer.properties | 33 ---- .../portal/portal-authentication.properties | 2 +- ...estionEntity_getIndexDocumentJson_expected.json | 1 - .../user-auth-reader/authorized-users-empty.config | 0 .../user-auth-reader/authorized-users.config | 3 + .../user-validator/authorized-users.config | 3 + 25 files changed, 7 insertions(+), 921 deletions(-) delete mode 100644 src/test/resources/appconfig/aai.properties delete mode 100644 src/test/resources/appconfig/elasticsearch.properties delete mode 100644 src/test/resources/appconfig/etc/aaiEntityNodeDescriptors.json delete mode 100644 src/test/resources/appconfig/etc/ajsc-chef.jks delete mode 100644 src/test/resources/appconfig/etc/ajsc-jetty.xml delete mode 100644 src/test/resources/appconfig/etc/ajsc-override-web.xml delete mode 100644 src/test/resources/appconfig/etc/ajscJetty.jks delete mode 100644 src/test/resources/appconfig/etc/autoSuggestMappings.json delete mode 100644 src/test/resources/appconfig/etc/autoSuggestSettings.json delete mode 100644 src/test/resources/appconfig/etc/dynamicMappings.json delete mode 100644 src/test/resources/appconfig/etc/entityCountHistoryMappings.json delete mode 100644 src/test/resources/appconfig/etc/es_mappings.json delete mode 100644 src/test/resources/appconfig/etc/es_settings.json delete mode 100644 src/test/resources/appconfig/etc/jul-redirect.properties delete mode 100644 src/test/resources/appconfig/etc/keyfile delete mode 100644 src/test/resources/appconfig/etc/runner-web.xml delete mode 100644 src/test/resources/appconfig/roles.config delete mode 100644 src/test/resources/appconfig/search-service.properties delete mode 100644 src/test/resources/appconfig/suggestive-search.properties delete mode 100644 src/test/resources/appconfig/synchronizer.properties delete mode 100644 src/test/resources/sync/entity/AggregationSuggestionEntity_getIndexDocumentJson_expected.json create mode 100644 src/test/resources/user-auth-reader/authorized-users-empty.config create mode 100644 src/test/resources/user-auth-reader/authorized-users.config create mode 100644 src/test/resources/user-validator/authorized-users.config (limited to 'src/test/resources') diff --git a/src/test/resources/appconfig/aai.properties b/src/test/resources/appconfig/aai.properties deleted file mode 100644 index bef9497..0000000 --- a/src/test/resources/appconfig/aai.properties +++ /dev/null @@ -1,87 +0,0 @@ -################################################################################################################ -############################## ActiveInventoryDataCollector TLS/SSL configuration ############################## -################################################################################################################ - -############################## Networking ############################## -# -# The ip address/hostname and port to the desired AAI instance -# -aai.rest.host=aai.api.simpledemo.openecomp.org -aai.rest.port=8443 - -############################## REST ############################## -# OXM version -aai.rest.resourceBasePath=/aai/v9 -aai.rest.connectTimeoutInMs=30000 -aai.rest.readTimeoutInMs=60000 -aai.rest.numRequestRetries=5 -# HTTP_NOAUTH - straight HTTP no user/pass -# SSL_BASIC - HTTP/S with user/pass -# SSL_CERT - HTTP/S with client cert -aai.rest.authenticationMode=SSL_BASIC - -############################## Cache ############################## -# Experimental caching feature that is NOT production ready. -# Enable at your own risk... it might not work. -aai.rest.cache.enabled=false -aai.rest.cache.numWorkers=10 -aai.rest.cache.cacheFailures=false -aai.rest.cache.useCacheOnly=false -aai.rest.cache.storageFolderOverride= -aai.rest.cache.maxTimeToLiveInMs=-1 - -# The shallowEntity filter will display the entity in a visualization -# but will not collect it's relationships or complex attributes. -aai.rest.shallowEntities=cloud-region,complex,vnf-image,att-aic,image - -############################## Certs, Auth, and SSL Settings ############################## -aai.ssl.keystore.filename=aai-os-cert.p12 -aai.ssl.keystore.pass=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o -aai.ssl.keystore.type=pkcs12 -# Enable debug on the SSL connections -aai.ssl.enableDebug=false -# Degree of strictness to SSL connection standards -aai.ssl.validateServerHostName=false; -aai.ssl.validateServerCertificateChain=false; -# If basic auth is implemented, username and password as required -aai.ssl.basicAuth.username=AaiUI -aai.ssl.basicAuth.password=OBF:1gfr1p571unz1p4j1gg7 - -############################## Statistics Report Formatting ############################## -# -# During synchronization, a formatted statisitics log is generated -# -# Response size in bytes histogram -aai.taskProcessor.bytesHistogramLabel="[Response Size In Bytes]" -aai.taskProcessor.bytesHistogramMaxYAxis=1000000 -aai.taskProcessor.bytesHistogramNumBins=20 -aai.taskProcessor.bytesHistogramNumDecimalPoints=2 -# "Work on Hand" statisitcs for external resource requests -aai.taskProcessor.queueLengthHistogramLabel="[Queue Item Length]" -aai.taskProcessor.queueLengthHistogramMaxYAxis=20000 -aai.taskProcessor.queueLengthHistogramNumBins=20 -aai.taskProcessor.queueLengthHistogramNumDecimalPoints=2 -# Time on queue (how long does a task stay on the work queue) -aai.taskProcessor.taskAgeHistogramLabel="[Task Age In Ms]" -aai.taskProcessor.taskAgeHistogramMaxYAxis=600000 -aai.taskProcessor.taskAgeHistogramNumBins=20 -aai.taskProcessor.taskAgeHistogramNumDecimalPoints=2 -# Per transaction response time for external resource requests -aai.taskProcessor.responseTimeHistogramLabel="[Response Time In Ms]" -aai.taskProcessor.responseTimeHistogramMaxYAxis=10000 -aai.taskProcessor.responseTimeHistogramNumBins=20 -aai.taskProcessor.responseTimeHistogramNumDecimalPoints=2 -# Transaction throughput velocity -aai.taskProcessor.tpsHistogramLabel="[Transactions Per Second]" -aai.taskProcessor.tpsHistogramMaxYAxis=100 -aai.taskProcessor.tpsHistogramNumBins=20 -aai.taskProcessor.tpsHistogramNumDecimalPoints=2 - -############################## Deprecated, to be removed or updated ############################## -aai.rest.numResolverWorkers=15 -aai.ssl.truststore.filename=asdc-client.jks -aai.ssl.truststore.type=jks -aai.taskProcessor.maxConcurrentWorkers=5 -aai.taskProcessor.transactionRateControllerEnabled=false -aai.taskProcessor.numSamplesPerThreadForRunningAverage=100 -aai.taskProcessor.targetTPS=100 \ No newline at end of file diff --git a/src/test/resources/appconfig/elasticsearch.properties b/src/test/resources/appconfig/elasticsearch.properties deleted file mode 100644 index 07f16dc..0000000 --- a/src/test/resources/appconfig/elasticsearch.properties +++ /dev/null @@ -1,70 +0,0 @@ -####################################################################################### -############################## ElasticSearch Config ################################### -####################################################################################### - -############################## Networking ############################## -# -# The ip address/hostname and port to the desired AAI instance -# For development it's recommended to use a local instance of ES -# -elasticsearch.ipAddress=aai.elasticsearch.simpledemo.openecomp.org -elasticsearch.httpPort=9200 -elasticsearch.javaApiPort=8443 - -############################## Indexes ############################## -# -# Index names for various searches. -# -elasticsearch.indexName=entity-search-index -elasticsearch.autosuggestIndexname=entity-autosuggest-index - -# Default document type -elasticsearch.type=default - -############################## Index Mappings and Settings ############################## -# -# JSON files for sparky elasticsearch indexes. -# -elasticsearch.mappingsFileName=/etc/es_mappings.json -elasticsearch.settingsFileName=/etc/es_settings.json -elasticsearch.autosuggestSettingsFileName=/etc/autoSuggestSettings.json -elasticsearch.autosuggestMappingsFileName=/etc/autoSuggestMappings.json -elasticsearch.dynamicMappingsFileName=/etc/dynamicMappings.json -elasticsearch.entityCountHistoryMappingsFileName=/etc/entityCountHistoryMappings.json - -############################## Statistics Report Formatting ############################## -# -# During synchronization, a formatted statisitics log is generated. -# -# Response size in bytes histogram -elasticsearch.taskProcessor.bytesHistogramLabel="[Response Size In Bytes]" -elasticsearch.taskProcessor.bytesHistogramMaxYAxis=1000000 -elasticsearch.taskProcessor.bytesHistogramNumBins=20 -elasticsearch.taskProcessor.bytesHistogramNumDecimalPoints=2 -# "Work on Hand" statisitcs for external resource requests -elasticsearch.taskProcessor.queueLengthHistogramLabel="[Queue Item Length]" -elasticsearch.taskProcessor.queueLengthHistogramMaxYAxis=20000 -elasticsearch.taskProcessor.queueLengthHistogramNumBins=20 -elasticsearch.taskProcessor.queueLengthHistogramNumDecimalPoints=2 -# Time on queue (how long does a task stay on the work queue) -elasticsearch.taskProcessor.taskAgeHistogramLabel="[Task Age In Ms]" -elasticsearch.taskProcessor.taskAgeHistogramMaxYAxis=600000 -elasticsearch.taskProcessor.taskAgeHistogramNumBins=20 -elasticsearch.taskProcessor.taskAgeHistogramNumDecimalPoints=2 -# Per transaction response time for external resource requests -elasticsearch.taskProcessor.responseTimeHistogramLabel="[Response Time In Ms]" -elasticsearch.taskProcessor.responseTimeHistogramMaxYAxis=1000 -elasticsearch.taskProcessor.responseTimeHistogramNumBins=20 -elasticsearch.taskProcessor.responseTimeHistogramNumDecimalPoints=2 -# Transaction throughput velocity -elasticsearch.taskProcessor.tpsHistogramLabel="[Transactions Per Second]" -elasticsearch.taskProcessor.tpsHistogramMaxYAxis=100 -elasticsearch.taskProcessor.tpsHistogramNumBins=20 -elasticsearch.taskProcessor.tpsHistogramNumDecimalPoints=2 - -############################## Deprecated, to be removed or updated ############################## -elasticsearch.taskProcessor.maxConcurrentWorkers=5 -elasticsearch.taskProcessor.transactionRateControllerEnabled=false -elasticsearch.taskProcessor.numSamplesPerThreadForRunningAverage=100 -elasticsearch.taskProcessor.targetTPS=100 -elasticsearch.clusterName=ES_AAI_LOCALHOST \ No newline at end of file diff --git a/src/test/resources/appconfig/etc/aaiEntityNodeDescriptors.json b/src/test/resources/appconfig/etc/aaiEntityNodeDescriptors.json deleted file mode 100644 index bf95f28..0000000 --- a/src/test/resources/appconfig/etc/aaiEntityNodeDescriptors.json +++ /dev/null @@ -1,188 +0,0 @@ -{ - "generalNodeClass": { - "class": "aai-entity-node general-node", - "visualElements": [{ - "type": "circle", - "class": "outer", - "svgAttributes": { - "r": "16" - } - }, - { - "type": "circle", - "class": "inner", - "svgAttributes": { - "r": "10" - } - }, - { - "type": "text", - "class": "id-type-label", - "displayKey": "itemType", - "shapeAttributes": { - "offset": { - "x": "0", - "y": "33" - } - } - }, - { - "type": "text", - "class": "id-value-label", - "displayKey": "itemNameValue", - "shapeAttributes": { - "offset": { - "x": "0", - "y": "48" - } - } - }] - }, - "searchedNodeClass": { - "class": "aai-entity-node search-node", - "visualElements": [{ - "type": "circle", - "class": "outer", - "svgAttributes": { - "r": "16" - } - }, - { - "type": "circle", - "class": "inner", - "svgAttributes": { - "r": "10" - } - }, - { - "type": "text", - "class": "id-type-label", - "displayKey": "itemType", - "shapeAttributes": { - "offset": { - "x": "0", - "y": "33" - } - } - }, - { - "type": "text", - "class": "id-value-label", - "displayKey": "itemNameValue", - "shapeAttributes": { - "offset": { - "x": "0", - "y": "48" - } - } - }] - }, - "selectedSearchedNodeClass": { - "class": "aai-entity-node selected-search-node", - "visualElements": [{ - "type": "circle", - "class": "outer", - "svgAttributes": { - "r": "31" - } - }, - { - "type": "circle", - "class": "inner", - "svgAttributes": { - "r": "20" - } - }, - { - "type": "text", - "class": "id-type-label", - "displayKey": "itemType", - "shapeAttributes": { - "offset": { - "x": "0", - "y": "48" - } - } - }, - { - "type": "text", - "class": "id-value-label", - "displayKey": "itemNameValue", - "shapeAttributes": { - "offset": { - "x": "0", - "y": "63" - } - } - }, - { - "type": "button", - "name": "icon_ellipses", - "class": "node-button", - "shapeAttributes": { - "offset": { - "x": "33", - "y": "-35" - } - }, - "svgAttributes": { - "className": "node-button", - "r": "10" - } - }] - }, - "selectedNodeClass": { - "class": "aai-entity-node selected-node", - "visualElements": [{ - "type": "circle", - "class": "outer", - "svgAttributes": { - "r": "31" - } - }, - { - "type": "circle", - "class": "inner", - "svgAttributes": { - "r": "20" - } - }, - { - "type": "text", - "class": "id-type-label", - "displayKey": "itemType", - "shapeAttributes": { - "offset": { - "x": "0", - "y": "48" - } - } - }, - { - "type": "text", - "class": "id-value-label", - "displayKey": "itemNameValue", - "shapeAttributes": { - "offset": { - "x": "0", - "y": "63" - } - } - }, - { - "type": "button", - "name": "icon_ellipses", - "class": "node-button", - "shapeAttributes": { - "offset": { - "x": "33", - "y": "-35" - } - }, - "svgAttributes": { - "className": "node-button", - "r": "10" - } - }] - } -} \ No newline at end of file diff --git a/src/test/resources/appconfig/etc/ajsc-chef.jks b/src/test/resources/appconfig/etc/ajsc-chef.jks deleted file mode 100644 index aeca770..0000000 Binary files a/src/test/resources/appconfig/etc/ajsc-chef.jks and /dev/null differ diff --git a/src/test/resources/appconfig/etc/ajsc-jetty.xml b/src/test/resources/appconfig/etc/ajsc-jetty.xml deleted file mode 100644 index 1e026cd..0000000 --- a/src/test/resources/appconfig/etc/ajsc-jetty.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - true - - - /etc/runner-web.xml - /etc/ajsc-override-web.xml - true - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - /extApps - 10 - true - - - - - - - - - - - - - - - - - - - - - /auth/inventory-ui-keystore - - - - - - - - - - - false - false - - - - - - - - - - - - - http/1.1 - - - - - - - - - - - - - - - - - - - - - - 30000 - - - - - - - - - false - - - diff --git a/src/test/resources/appconfig/etc/ajsc-override-web.xml b/src/test/resources/appconfig/etc/ajsc-override-web.xml deleted file mode 100644 index c66ac89..0000000 --- a/src/test/resources/appconfig/etc/ajsc-override-web.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - ElasticSearchSynchronizerFilter - /nothingShouldBeSentHere/* - - - - OxmModelLoaderFilter - /nothingShouldBeSentHereEither/* - - - - PortalRestAPIProxy - /api/v2/* - - - - VisualizationServlet - /visualization/* - - - - springSecurityFilterChain - /* - - - - ManagementServlet - /mgmt - - - - RestletServlet - /rest/* - - - - CamelServlet - /services/* - - - - SearchServlet - /elasticSearchQuery/* - /search/* - - - - jsp - *.jsp - *.jspf - *.jspx - *.xsp - *.JSP - *.JSPF - *.JSPX - *.XSP - - - default - /* - - \ No newline at end of file diff --git a/src/test/resources/appconfig/etc/ajscJetty.jks b/src/test/resources/appconfig/etc/ajscJetty.jks deleted file mode 100644 index 48cdbff..0000000 Binary files a/src/test/resources/appconfig/etc/ajscJetty.jks and /dev/null differ diff --git a/src/test/resources/appconfig/etc/autoSuggestMappings.json b/src/test/resources/appconfig/etc/autoSuggestMappings.json deleted file mode 100644 index 7857617..0000000 --- a/src/test/resources/appconfig/etc/autoSuggestMappings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "properties" : { - "entity_suggest" : { - "type" : "completion", - "payloads" : true, - "analyzer" : "custom_analyzer", - "preserve_position_increments": false - } - } -} \ No newline at end of file diff --git a/src/test/resources/appconfig/etc/autoSuggestSettings.json b/src/test/resources/appconfig/etc/autoSuggestSettings.json deleted file mode 100644 index 4525be1..0000000 --- a/src/test/resources/appconfig/etc/autoSuggestSettings.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "analysis": { - "filter": { - "eng_stop": { - "type": "stop", - "stopwords": "_english_" - } - }, - "analyzer": { - "custom_analyzer": { - "type": "custom", - "tokenizer": "standard", - "filter": [ - "lowercase", - "asciifolding", - "eng_stop" - ] - } - } - } - } \ No newline at end of file diff --git a/src/test/resources/appconfig/etc/dynamicMappings.json b/src/test/resources/appconfig/etc/dynamicMappings.json deleted file mode 100644 index 09a00ac..0000000 --- a/src/test/resources/appconfig/etc/dynamicMappings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dynamic_templates": [ - { - "strings": { - "match_mapping_type": "string", - "match": "*", - "mapping": { - "type": "string", - "index": "not_analyzed" - } - } - } - ] -} \ No newline at end of file diff --git a/src/test/resources/appconfig/etc/entityCountHistoryMappings.json b/src/test/resources/appconfig/etc/entityCountHistoryMappings.json deleted file mode 100644 index 84e3aec..0000000 --- a/src/test/resources/appconfig/etc/entityCountHistoryMappings.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "properties": { - "count": { - "type": "long" - }, - "entityType": { - "type": "string", - "index": "not_analyzed" - }, - "timestamp": { - "type": "date", - "format": "MMM d y HH:m:s||dd-MM-yyyy HH:mm:ss||yyyy-MM-dd'T'HH:mm:ss.SSSZZ||MM/dd/yyyy||yyyyMMdd'T'HHmmssZ" - } - } -} - diff --git a/src/test/resources/appconfig/etc/es_mappings.json b/src/test/resources/appconfig/etc/es_mappings.json deleted file mode 100644 index 216e3d9..0000000 --- a/src/test/resources/appconfig/etc/es_mappings.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "properties": { - "entityType": { - "type": "string", - "analyzer": "ngram_analyzer", - "search_analyzer": "ngram_analyzer" - }, - "entityPrimaryKeyValue": { - "type": "string", - "index": "not_analyzed" - }, - "searchTagIDs": { - "type": "string" - }, - "searchTags": { - "type": "string", - "analyzer": "ngram_analyzer" - }, - "crossEntityReferenceValues": { - "type": "string", - "analyzer": "ngram_analyzer" - }, - "link": { - "type": "string", - "index": "not_analyzed" - }, - "lastmodTimestamp": { - "type": "date", - "format": "MMM d y HH:m:s||dd-MM-yyyy HH:mm:ss||yyyy-MM-dd'T'HH:mm:ss.SSSZZ||yyyy-MM-dd HH:mm:ss||MM/dd/yyyy||yyyyMMdd'T'HHmmssZ" - } - } -} \ No newline at end of file diff --git a/src/test/resources/appconfig/etc/es_settings.json b/src/test/resources/appconfig/etc/es_settings.json deleted file mode 100644 index 21a357c..0000000 --- a/src/test/resources/appconfig/etc/es_settings.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "analysis": { - "filter": { - "ngram_filter": { - "type": "nGram", - "min_gram": 1, - "max_gram": 50, - "token_chars": [ - "letter", - "digit", - "punctuation", - "symbol" - ] - } - }, - "analyzer": { - "ngram_analyzer": { - "type": "custom", - "tokenizer": "whitespace", - "filter": [ - "lowercase", - "asciifolding", - "ngram_filter" - ] - }, - "whitespace_analyzer": { - "type": "custom", - "tokenizer": "whitespace", - "filter": [ - "lowercase", - "asciifolding" - ] - } - } - } -} \ No newline at end of file diff --git a/src/test/resources/appconfig/etc/jul-redirect.properties b/src/test/resources/appconfig/etc/jul-redirect.properties deleted file mode 100644 index 8b6624d..0000000 --- a/src/test/resources/appconfig/etc/jul-redirect.properties +++ /dev/null @@ -1,13 +0,0 @@ - -# Bridge JUL->slf4j Logging Configuration File -# -# This file bridges the JUL logging infrastructure into -# SLF4J so JUL logs go to logback implementation provided -# in this project. SLF4J also captures log4j and has -# other framework options as well providing a common -# logging infrastructure for capturing all logs from different -# libraries using different frameworks in one place. - -# Global properties -handlers=org.slf4j.bridge.SLF4JBridgeHandler -.level= ALL diff --git a/src/test/resources/appconfig/etc/keyfile b/src/test/resources/appconfig/etc/keyfile deleted file mode 100644 index 882e86a..0000000 --- a/src/test/resources/appconfig/etc/keyfile +++ /dev/null @@ -1,27 +0,0 @@ -ZuIwp0TkyVPDeX1Up-8JtkMWvjsCpoiu1_VKeWrtrvxunvAke8_tiFyHPPyb2nkhepFYj6tXzpfS -rGz5XF_TH9NbsKaP8u0HV5clz2WriYQRvHS85vjY7hXxkpFuLb7zkLAPqTyIDpj7FiW61NzsRUAq -TM8jH16jr7mBNnb56w24mNGOwznMPcIZKcjgZU1ekaPDFpWyhQElU7Y0q_94P_Gkk45r66Hj22sU -OiOaaftmudZlswLw8-8Zaakqf2yW9HjMVfuYCwSodBHCW5rdB3Ctb5W36rnD_AQco3Ky2PgPmqvk -QkJYuUHpbuDqVHqLOajlKSIGMTIqAIBg51fRaaONtD-Q5xzY8E5wO1YWTLKcP5tsNvUpzM8Wu3NS -ynpGpUcvlTqWWsGzTbzOyamyKkdNdx97sSqjM25Zh1-ps48h6cddGYWpab7SUvqRCS11QBUyLTry -2iwTEHMhHRIbo7PO99ALQfuq9gI1zKGfurJdvLBeBaFs5SCF0AiCZ3WcDO8Rv3HpxVZ2_ShbDxb0 -eMoO6SotXu51fj8Y3-WqsfZziQyEsHyqpg5uQ6yUtz01h5YHLEoVuotF1U4agmQR6kEkYk-wNOiZ -v-8gaA9gtbLoAdKhuKFxQgQLNMf6GzVzZNujbmDzLoZAP_mXAv29aBPaf64Ugzv-Oa5GZdBgD-Xd -_pahML-ionw99r0TnkpShYmDqMKhMdjaP3m87WIAZkIB-L-VTyKcEsJ4340VSzCOsv3waiM0S89u -4cMcG5y-PLY8IoipIlLUPTWD3SjcQ9DV1Dt3T5KjdWLsj48D3W4K4e9PB8yxs0gtUjgVUR2_xEir -G5eDO9Ac1eHFWGDFFP0SgG-TbHJUKlvy9mwLzmU0fC3xPjhqmIr-v0HxF7HN-tmb1LHDorno8tSN -u7kUGcKSchIiFfvkd066crUb2mH7PnXTaWmAjyVj9VsBExFUYEdpHMAV4sAP9-RxZGDRt46UhrDK -QZvvNhBVyOEjHPHWI4vl1r1v8HNH1_2jZu5DVJWyHWR56aCo1lhFH9_X6UAHUHbnXViDONZOVXlT -9-WD0tk2zJGuwrhdZDAnPnAmjfwbwbpnr5Hmex1i1JiD7WVyP1kbfoej2TmdiYbxr9oBYaGQ29JI -aHod7MQCLtvL1z5XgnDPLZ4y3_9SbqHKYbNa8UgZkTLF5EacGThYVFDLA9cbafHDtR1kMGE3vv4D -EJ-0pAYTOGmKlVI7DwNyKsY9JTyudrxTqhOxi9jgcJNWiUaNe9yhL8Pyc2YBqUTTYhh_a2d1rvkZ -0Gh1crviVxqBrIkRKaMRXZ4f1vDLz-3NvG_vwPOo8WRFo5nGmSdTw7CjBaigJ_cYCfDhoP11pEnw -cndsZNcHs-v05LlxeIIMDD_f5Bvz-il_DLA4eK2HqgLdxh8ziSDl2azk14MJY4amzz6reEXUuKLV -RsZGf_jbDGKhE2HuDQ5ovoLOi4OqE1oRuqh-dGxitrYouP2SN1l_1tCEMRth86FMV-6AQtZsvdUo -y9MtQ7e35atjA8nHtgADlDTmJBKQiUHUsOZ77p1qp17HAFMovUkc739opfEYnKUn6Itpw5Ipm_Is -ra6chJUfMpOFof5rb5OjqFAN27c_-mPo1lQU3ndYlKGh_n5V8ufX6v2Yri8WzOPf6hjVYotkmoMP -NPAICDCB8W5ddBjsopzLVVEtaXDu9Qj6-zf77hT4iQ7rBd2Ner8iLqN3Kis0dvkNM3_uH8onau1G -Y_YYw7PPSZyd2S_7Dd6G-IG4ayO6e5DD6oUwwekyiQI_3rTXNa_wldGxqW9u818010ekE4Qdlfcj -beIn7fAeaOjReZ87hRgWyMs-EgTVHw8RL3yI_O6VvRTVRONRF1Y4C_-IYa8z-bfrwXx3BBd9TTgb -EnS9wVOyC2OgUN6BhPLGLhxzkJ05nEjizXEc9t5EPYoSRwesajGGrrG_0-qWbuU5hKLPLkyeJLHb -5HXOTVsrUR59Vov2M3_EswkxcImblox3k3VS2yihZMGyfqLzZIUXgd8ufkevKKU6DxwacGTb \ No newline at end of file diff --git a/src/test/resources/appconfig/etc/runner-web.xml b/src/test/resources/appconfig/etc/runner-web.xml deleted file mode 100644 index 1c6ccdc..0000000 --- a/src/test/resources/appconfig/etc/runner-web.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - contextConfigLocation - /WEB-INF/spring-servlet.xml, - classpath:applicationContext.xml - - - - - spring.profiles.default - nooauth - - - - org.springframework.web.context.ContextLoaderListener - - - - ManagementServlet - ajsc.ManagementServlet - - - - VisualizationServlet - org.onap.aai.sparky.viewandinspect.servlet.VisualizationServlet - - - - ElasticSearchSynchronizerFilter - org.onap.aai.sparky.synchronizer.filter.ElasticSearchSynchronizerFilter - - - - OxmModelLoaderFilter - org.onap.aai.sparky.config.oxm.OxmModelLoaderFilter - - - - WriteableRequestFilter - com.att.ajsc.csi.writeablerequestfilter.WriteableRequestFilter - - - - RestletServlet - ajsc.restlet.RestletSpringServlet - - org.restlet.component - restletComponent - - - - - CamelServlet - ajsc.servlet.AjscCamelServlet - - - - SearchServlet - org.onap.aai.sparky.viewandinspect.servlet.SearchServlet - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - spring - org.springframework.web.servlet.DispatcherServlet - 1 - - - - PortalRestAPIProxy - org.openecomp.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy - - - - - - - - - jsp - org.apache.jasper.servlet.JspServlet - - - - - - - default - org.eclipse.jetty.servlet.DefaultServlet - - dirAllowed - true - - - - - - - - diff --git a/src/test/resources/appconfig/roles.config b/src/test/resources/appconfig/roles.config deleted file mode 100644 index b8313bd..0000000 --- a/src/test/resources/appconfig/roles.config +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "id":1, - "name":"View" - } -] \ No newline at end of file diff --git a/src/test/resources/appconfig/search-service.properties b/src/test/resources/appconfig/search-service.properties deleted file mode 100644 index 4f7f036..0000000 --- a/src/test/resources/appconfig/search-service.properties +++ /dev/null @@ -1,29 +0,0 @@ -######################################################################################## -############################## Search Data Service Config ############################## -######################################################################################## - -############################## Networking ############################## -# -# The ip address/hostname and port to the desired Search Data Service instance -# -search-service.ipAddress=aai.searchservice.simpledemo.openecomp.org -search-service.httpPort=9509 - -############################## Indexes ############################## -# -# Index values that will be associated with searches -# -# Searchable entities -search-service.indexName=entity-search-index - -############################## Version ############################## -# -# Search Data Service version and type (see Search Data Service for more details) -# -search-service.version=v1 -search-service.type=default - -############################## Certs ############################## -search-service.ssl.cert-name=client-cert-onap.p12 -search-service.ssl.keystore-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 -search-service.ssl.keystore=tomcat_keystore \ No newline at end of file diff --git a/src/test/resources/appconfig/suggestive-search.properties b/src/test/resources/appconfig/suggestive-search.properties deleted file mode 100644 index b82baff..0000000 --- a/src/test/resources/appconfig/suggestive-search.properties +++ /dev/null @@ -1,27 +0,0 @@ -###################################################################################### -############################## Suggestive Search Config ############################## -###################################################################################### - -# Indexes to be taken into account when generating suggestion entries -suggestion.indexes=elasticsearch.autosuggestIndexname,elasticsearch.indexName -# List of stop words to be used during suggestive search -suggestion.stopwords=a,an,and,are,as,at,be,but,by,called,for,if,in,into,is,it,no,not,of,on,or,such,that,the,their,then,there,these,they,this,to,was,will,with -# Assigns which class, within sparky, will process the searches related to an assosiated index -suggestion.routing=elasticsearch.autosuggestIndexname:SearchServiceWrapper,elasticsearch.indexName:VnfSearchService - -############################## Pairings ############################## -# -# "called" pairings, keys reference types within the OXM, and the value -# is the suggestion term used for matches with any of the "called" keys. -# e.g. "x called vserver-id" (but actual value of vserver-id) -suggestion.pairing.called.key=volume-group-id,volume-group-name,physical-location-id,data-center-code,complex-name,tenant-id,tenant-name,vserver-id,vserver-name,vserver-name2,hostname,pserver-name2,pserver-id,global-customer-id,subscriber-name,service-instance-id,service-instance-name,link-name,vpn-id,vpn-name,vpe-id,vnf-id,vnf-name,vnf-name2,vnfc-name,network-id,network-name,network-policy-id,vf-module-id,vf-module-name,vnf-id2,pnf-name,circuit-id -suggestion.pairing.called.value=called -# -# Exact same explanation as the "called" pairings above. -# e.g. "x at ipv4-oam-address" -suggestion.pairing.at.key=street1,street2,postal-code,ipv4-oam-address,network-policy-fqdn -suggestion.pairing.at.value=at -# -# Default pairing values for any OXM types that aren't part of the the other -# pairing lists. -suggestion.pairing.default.value=with \ No newline at end of file diff --git a/src/test/resources/appconfig/synchronizer.properties b/src/test/resources/appconfig/synchronizer.properties deleted file mode 100644 index 0b84f06..0000000 --- a/src/test/resources/appconfig/synchronizer.properties +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################################## -############################## ElasticSearchSynchronizer Config ############################## -############################################################################################## - -# Initial delay on startup before starting synchronization tasks -synchronizer.syncTask.initialDelayInMs=60000 -# The frequency at which the synchronizationtask will be run -synchronizer.syncTask.taskFrequencyInDay=2 - -# Time at which to run synchronization. Format = hh:mm:ss UTC(-/+)hh:mm -synchronizer.syncTask.startTimestamp=05:00:00 UTC+00:00 - -# Generates a count in elasticsearch related to inventory -synchronizer.historicalEntitySummarizerEnabled=true -# Toggles the suggestion synchronizer -synchronizer.autosuggestSynchronizationEnabled=true -# Frequency at which above count is generated -synchronizer.historicalEntitySummarizedFrequencyInMinutes=60 - -# Elasticsearch scroll api context keep alive value -synchronizer.scrollContextTimeToLiveInMinutes=5 -# Elasticsearch scroll api context max items per batch request -synchronizer.numScrollContextItemsToRetrievePerRequest=5000 - - -############################## Deprecated, to be removed or updated ############################## -synchronizer.resolver.progressLogFrequencyInMs=60000 -synchronizer.resolver.queueMonitorFrequencyInMs=1000 -synchronizer.resolver.displayVerboseQueueManagerStats=false -synchronizer.indexIntegrityValidator.enabled=false -synchronizer.indexIntegrityValidatorFrequencyInMs=3600000 -synchronizer.suppressResourceNotFoundErrors=true -synchronizer.applyNodesOnlyModifier=false \ No newline at end of file diff --git a/src/test/resources/portal/portal-authentication.properties b/src/test/resources/portal/portal-authentication.properties index d0732a1..c3c34d6 100644 --- a/src/test/resources/portal/portal-authentication.properties +++ b/src/test/resources/portal/portal-authentication.properties @@ -1,2 +1,2 @@ username=testuser -password=18fa91d072b7b072a8d3326c448e5861 \ No newline at end of file +password=OBF:1vv31vn61xtv1zlo1y0s1v1p1v2p1y0y1zlu1xtn1vnw1vu7 \ No newline at end of file diff --git a/src/test/resources/sync/entity/AggregationSuggestionEntity_getIndexDocumentJson_expected.json b/src/test/resources/sync/entity/AggregationSuggestionEntity_getIndexDocumentJson_expected.json deleted file mode 100644 index b9e2501..0000000 --- a/src/test/resources/sync/entity/AggregationSuggestionEntity_getIndexDocumentJson_expected.json +++ /dev/null @@ -1 +0,0 @@ -{"entity_suggest":{"output":"VNFs","input":["VNFs","generic-vnfs"],"payload":{},"weight":100}} \ No newline at end of file diff --git a/src/test/resources/user-auth-reader/authorized-users-empty.config b/src/test/resources/user-auth-reader/authorized-users-empty.config new file mode 100644 index 0000000..e69de29 diff --git a/src/test/resources/user-auth-reader/authorized-users.config b/src/test/resources/user-auth-reader/authorized-users.config new file mode 100644 index 0000000..b9bb4e2 --- /dev/null +++ b/src/test/resources/user-auth-reader/authorized-users.config @@ -0,0 +1,3 @@ +user1 +user2 user3 +user4 \ No newline at end of file diff --git a/src/test/resources/user-validator/authorized-users.config b/src/test/resources/user-validator/authorized-users.config new file mode 100644 index 0000000..58698bc --- /dev/null +++ b/src/test/resources/user-validator/authorized-users.config @@ -0,0 +1,3 @@ + user1 +user2 user3 +user4 \ No newline at end of file -- cgit 1.2.3-korg