aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/aai
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2018-09-06 14:06:58 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-06 14:06:58 +0000
commit9f5521745269f5d544eb69a9d92dd319a71d8e05 (patch)
tree44bd56821cea109fc91d27377315f3d5941460c6 /kubernetes/aai
parentfd6f03148fbe2a94a6547aec64a6b5ab51ec55a5 (diff)
parentb59b7fd9d98742593eced1b77e5b48e1b91d91e8 (diff)
Merge "Casablanca sparky chart updates"
Diffstat (limited to 'kubernetes/aai')
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/application-oxm-default.properties (renamed from kubernetes/aai/charts/aai-sparky-be/resources/config/roles.config)36
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/application-oxm-override.properties (renamed from kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-unified-search.xml)11
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/application-oxm-schema-prod.properties (renamed from kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-http-config.properties)2
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/application-resources.properties (renamed from kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-filter-aggregation.xml)18
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/application-ssl.properties (renamed from kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-ssl-config.properties)4
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/application.properties (renamed from kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-application.properties)22
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-prepareSchema.xml28
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-subscriptionService.xml23
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-unifiedFilterRequest.xml23
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/descriptors/aaiEntityNodeDescriptors.json218
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/filters/aaiui_filters.json79
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/filters/aaiui_views.json21
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/filters/subscription_object_inspector_mapping.json16
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/log/logback.xml188
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/autoSuggestMappings.json10
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/autoSuggestSettings.json21
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/dynamicMappings.json14
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/entityCountHistoryMappings.json16
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/es_mappings.json32
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/es_settings.json36
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-aggregateVnfSearchProvider.xml50
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-apigw.xml48
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-gizmo.xml45
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml390
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-viewInspect.xml71
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-viewInspectSearchProvider.xml50
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core.xml257
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml62
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml100
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/values.yaml2
30 files changed, 105 insertions, 1788 deletions
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/roles.config b/kubernetes/aai/charts/aai-sparky-be/resources/config/application-oxm-default.properties
index 42f9286ca5..67a22f71f7 100644
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/roles.config
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/application-oxm-default.properties
@@ -1,20 +1,16 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# 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.
-
-[
- {
- "id":1,
- "name":"View"
- }
-]
+# Copyright © 2018 Amdocs, Bell Canada, AT&T
+#
+# 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.
+
+oxm.apiVersion=v14
+oxm.apiVersionList=v8,v9,v10,v11,v12,v13,v14 \ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-unified-search.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/application-oxm-override.properties
index a14514ce48..5c733e852b 100644
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-unified-search.xml
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/application-oxm-override.properties
@@ -1,4 +1,3 @@
-<!--
# Copyright © 2018 Amdocs, Bell Canada, AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,12 +11,6 @@
# 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.
--->
-<rests xmlns="http://camel.apache.org/schema/spring">
- <rest>
- <post uri="/search/querysearch">
- <to uri="bean:unifiedSearchProcessor?method=search"/>
- </post>
- </rest>
-</rests>
+oxm.apiVersionOverride=v14
+oxm.apiVersionList=v8,v9,v10,v11,v12,v13,v14 \ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-http-config.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/application-oxm-schema-prod.properties
index a66a67399a..98c7abd59c 100644
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-http-config.properties
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/application-oxm-schema-prod.properties
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-server.port = 9517
+oxm.schemaNodeDir=/opt/app/sparky/onap/oxm
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-filter-aggregation.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/application-resources.properties
index aec24bd654..f916da4668 100644
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-filter-aggregation.xml
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/application-resources.properties
@@ -1,4 +1,3 @@
-<!--
# Copyright © 2018 Amdocs, Bell Canada, AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,12 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
--->
-
-<rests xmlns="http://camel.apache.org/schema/spring">
- <rest>
- <post uri="/search/filterAggregation">
- <to uri="bean:aggregateSummaryProcessor?method=getFilteredAggregation"/>
- </post>
- </rest>
-</rests>
+resources.hostname=aai
+resources.port=8443
+resources.authType=SSL_BASIC
+resources.basicAuthUserName=AAI
+resources.basicAuthPassword=AAI
+resources.client-cert=client-cert-onap.p12
+resources.client-cert-password=1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+resources.trust-store=tomcat_keystore
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-ssl-config.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/application-ssl.properties
index 5652ba60f1..04a5096c0c 100644
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-ssl-config.properties
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/application-ssl.properties
@@ -12,6 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-server.port = 8000
+server.port=8000
server.ssl.key-store=file:${CONFIG_HOME}/auth/tomcat_keystore
-server.ssl.key-alias=tomcat
+server.ssl.key-store-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-application.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/application.properties
index d847791dd5..6aa64ff916 100644
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-application.properties
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/application.properties
@@ -12,14 +12,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-camel.springboot.name = SparkyCamelContext
-#camel.springboot.xmlRoutes = file:${CONFIG_HOME}/camel-routes/*.route
-camel.springboot.xmlRests = file:${CONFIG_HOME}/camel-rests/*.xml
-
-camel.component.servlet.mapping.context-path=/rest/*
-server.servlet.context-path=/services/aai/webapp/
+#
+# disable the default thyme leaf icon on web-pages
+#
+spring.mvc.favicon.enabled=false
#
-# attempt to externalize ui JS classes + resources
+# to switch to http, remove ssl and put http
+# and in the values.yaml change the internalPort to 9517
#
-spring.resources.static-locations=file:${APP_HOME}/static/
+
+spring.profiles.active=camel,http,fe-prod,oxm-schema-prod,oxm-default,resources,sync
+
+searchservice.hostname={{.Values.global.searchData.serviceName}}
+searchservice.port=9509
+searchservice.client-cert=client-cert-onap.p12
+searchservice.client-cert-password=1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+searchservice.truststore=tomcat_keystore
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-prepareSchema.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-prepareSchema.xml
deleted file mode 100644
index 446984ad5a..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-prepareSchema.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# 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.
--->
-
-<rests xmlns="http://camel.apache.org/schema/spring">
- <rest>
- <post uri="/visualization/prepareVisualization">
- <route>
- <to uri="bean:schemaVisualizationProcessor?method=processVisualizationRequest" />
- </route>
- </post>
- </rest>
-</rests>
-
-
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-subscriptionService.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-subscriptionService.xml
deleted file mode 100644
index 2b1b1ceca8..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-subscriptionService.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# 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.
--->
-
-<rests xmlns="http://camel.apache.org/schema/spring">
- <rest>
- <get uri="/subscription/getsubscription">
- <to uri="bean:subscriptionServiceProcessor?method=getSubscription"/>
- </get>
- </rest>
-</rests>
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-unifiedFilterRequest.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-unifiedFilterRequest.xml
deleted file mode 100644
index 8781834829..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-unifiedFilterRequest.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# 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.
--->
-
-<rests xmlns="http://camel.apache.org/schema/spring">
- <rest>
- <post uri="/search/unifiedFilterRequest">
- <to uri="bean:filterProcessor?method=getFiltersWithValues"/>
- </post>
- </rest>
-</rests>
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/descriptors/aaiEntityNodeDescriptors.json b/kubernetes/aai/charts/aai-sparky-be/resources/config/descriptors/aaiEntityNodeDescriptors.json
deleted file mode 100644
index 8f3480e380..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/descriptors/aaiEntityNodeDescriptors.json
+++ /dev/null
@@ -1,218 +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"
- }
- },
- {
- "type": "button",
- "name": "icon_triangle_warning",
- "class": "node-button",
- "shapeAttributes": {
- "offset": {
- "x": "46",
- "y": "-12"
- }
- },
- "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"
- }
- },
- {
- "type": "button",
- "name": "icon_triangle_warning",
- "class": "node-button",
- "shapeAttributes": {
- "offset": {
- "x": "46",
- "y": "-12"
- }
- },
- "svgAttributes": {
- "className": "node-button",
- "r": "10"
- }
- }]
- }
-} \ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/filters/aaiui_filters.json b/kubernetes/aai/charts/aai-sparky-be/resources/config/filters/aaiui_filters.json
deleted file mode 100644
index d809cd33e6..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/filters/aaiui_filters.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
- "filters": [
- {
- "filterId": "1",
- "filterName": "Orchestration-Status",
- "displayName": "Orchestration Status",
- "dataType": "dropDown",
- "multiSelect": "false",
- "watermark": "Any Orchestration Status",
- "optionsType": "options",
- "dataSource": {
- "indexName": "aggregate_generic-vnf_index",
- "docType": "default",
- "fieldName": "orchestration-status"
- }
- },
- {
- "filterId": "2",
- "filterName": "Prov-Status",
- "displayName": "Provisioning Status",
- "dataType": "dropDown",
- "multiSelect": "false",
- "watermark": "Any Provisioning Status",
- "optionsType": "options",
- "dataSource": {
- "indexName": "aggregate_generic-vnf_index",
- "docType": "default",
- "fieldName": "prov-status"
- }
- },
- {
- "filterId": "5",
- "filterName": "Date",
- "displayName": "Date",
- "dataType": "date",
- "multiSelect": "false",
- "watermark": "Choose Date Range",
- "defaultValue" : {"decode": "Today", "code": "last_0_hours"},
- "optionsType": "dynamicOptions",
- "optionsValues": [
- {"decode": "Today", "code": "last_0_hours"},
- {"decode": "Since Yesterday", "code": "last_1_days"},
- {"decode": "Since Last Week", "code": "last_1_weeks"},
- {"decode": "Since Last Month", "code": "last_1_months"},
- {"decode": "Since Last Year", "code": "last_1_years"},
- {"decode": "Custom Range", "code": "custom_range"}
- ]
- },
- {
- "filterId": "7",
- "filterName": "NF-Type",
- "displayName": "Network Function Type",
- "dataType": "dropDown",
- "multiSelect": "false",
- "watermark": "Any Network Function Type",
- "optionsType": "options",
- "dataSource": {
- "indexName": "aggregate_generic-vnf_index",
- "docType": "default",
- "fieldName": "nf-type"
- }
- },
- {
- "filterId": "8",
- "filterName": "NF-Role",
- "displayName": "Network Function Role",
- "dataType": "dropDown",
- "multiSelect": "false",
- "watermark": "Any Network Function Role",
- "optionsType": "options",
- "dataSource": {
- "indexName": "aggregate_generic-vnf_index",
- "docType": "default",
- "fieldName": "nf-role"
- }
- }
-
- ]
-} \ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/filters/aaiui_views.json b/kubernetes/aai/charts/aai-sparky-be/resources/config/filters/aaiui_views.json
deleted file mode 100644
index 963c4618e2..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/filters/aaiui_views.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "views": [
- {
- "viewName" : "vnfSearch",
- "filters" : [
- {
- "filterId": "1"
- },
- {
- "filterId": "2"
- },
- {
- "filterId": "7"
- },
- {
- "filterId": "8"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/filters/subscription_object_inspector_mapping.json b/kubernetes/aai/charts/aai-sparky-be/resources/config/filters/subscription_object_inspector_mapping.json
deleted file mode 100644
index 10fe3c05d5..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/filters/subscription_object_inspector_mapping.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "target": "",
- "origin": "",
- "messageType": "",
- "topic": "",
- "message": {
- "applicationName": "",
- "payload": {
- "action": "",
- "params": {
- "objectName": "",
- "externalClassId": ""
- }
- }
- }
-}
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/log/logback.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/log/logback.xml
deleted file mode 100644
index d844cd8618..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/log/logback.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<!--
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# 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.
--->
-
-<configuration scan="true" scanPeriod="3 seconds" debug="false">
- <!--<jmxConfigurator /> -->
- <!-- directory path for all other type logs -->
-
- <property name="logDir" value="/var/log/onap" />
-
- <!-- <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy"
- | "SDNC" | "AC" -->
- <property name="componentName" value="AAI-UI"></property>
-
- <!-- default eelf log file names -->
- <property name="generalLogName" value="error" />
- <property name="metricsLogName" value="metrics" />
- <property name="auditLogName" value="audit" />
- <property name="debugLogName" value="debug" />
-
- <property name="errorLogPattern"
- value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|AAIUI|%mdc{PartnerName}|%logger|%.-5level|%msg%n" />
- <property name="auditMetricPattern" value="%m%n" />
-
- <property name="logDirectory" value="${logDir}/${componentName}" />
-
-
- <!-- Example evaluator filter applied against console appender -->
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${errorLogPattern}</pattern>
- </encoder>
- </appender>
-
- <!-- ============================================================================ -->
- <!-- EELF Appenders -->
- <!-- ============================================================================ -->
-
- <!-- The EELFAppender is used to record events to the general application
- log -->
-
- <appender name="EELF"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/${generalLogName}.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip
- </fileNamePattern>
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${errorLogPattern}</pattern>
- </encoder>
- </appender>
- <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
- <!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <level>INFO</level>
- </filter>
- <queueSize>256</queueSize>
- <appender-ref ref="EELF" />
- </appender>
-
-
- <!-- EELF Audit Appender. This appender is used to record audit engine related
- logging events. The audit logger and appender are specializations of the
- EELF application root logger and appender. This can be used to segregate
- Policy engine events from other components, or it can be eliminated to record
- these events as part of the application root log. -->
-
- <appender name="EELFAudit"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/${auditLogName}.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip
- </fileNamePattern>
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${auditMetricPattern}</pattern>
- </encoder>
- </appender>
- <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <appender-ref ref="EELFAudit" />
- </appender>
-
- <appender name="EELFMetrics"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/${metricsLogName}.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip
- </fileNamePattern>
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n"</pattern> -->
- <pattern>${auditMetricPattern}</pattern>
- </encoder>
- </appender>
-
-
- <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <appender-ref ref="EELFMetrics" />
- </appender>
-
- <appender name="EELFDebug"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/${debugLogName}.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip
- </fileNamePattern>
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${errorLogPattern}</pattern>
- </encoder>
- </appender>
-
- <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <appender-ref ref="EELFDebug" />
- <includeCallerData>false</includeCallerData>
- </appender>
-
- <!-- ============================================================================ -->
- <!-- EELF loggers -->
- <!-- ============================================================================ -->
- <logger name="com.att.eelf" level="info" additivity="false">
- <appender-ref ref="asyncEELF" />
- <appender-ref ref="asyncEELFDebug" />
- </logger>
-
- <logger name="com.att.eelf.audit" level="info" additivity="false">
- <appender-ref ref="asyncEELFAudit" />
- </logger>
- <logger name="com.att.eelf.metrics" level="info" additivity="false">
- <appender-ref ref="asyncEELFMetrics" />
- </logger>
-
- <!-- Spring related loggers -->
- <logger name="org.springframework" level="WARN" />
- <logger name="org.springframework.beans" level="WARN" />
- <logger name="org.springframework.web" level="WARN" />
- <logger name="com.blog.spring.jms" level="WARN" />
-
- <!-- Sparky loggers -->
- <logger name="org.onap" level="INFO" />
-
- <!-- Other Loggers that may help troubleshoot -->
- <logger name="net.sf" level="WARN" />
- <logger name="org.apache.commons.httpclient" level="WARN" />
- <logger name="org.apache.commons" level="WARN" />
- <logger name="org.apache.coyote" level="WARN" />
- <logger name="org.apache.jasper" level="WARN" />
-
- <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.
- May aid in troubleshooting) -->
- <logger name="org.apache.camel" level="WARN" />
- <logger name="org.apache.cxf" level="WARN" />
- <logger name="org.apache.camel.processor.interceptor" level="WARN" />
- <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
- <logger name="org.apache.cxf.service" level="WARN" />
- <logger name="org.restlet" level="WARN" />
- <logger name="org.apache.camel.component.restlet" level="WARN" />
-
- <!-- logback internals logging -->
- <logger name="ch.qos.logback.classic" level="WARN" />
- <logger name="ch.qos.logback.core" level="WARN" />
-
- <root>
- <appender-ref ref="asyncEELF" />
- <!-- <appender-ref ref="asyncEELFDebug" /> -->
- </root>
-
-</configuration>
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/autoSuggestMappings.json b/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/autoSuggestMappings.json
deleted file mode 100644
index 8e886cd33d..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/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/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/autoSuggestSettings.json b/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/autoSuggestSettings.json
deleted file mode 100644
index 97549f09ea..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/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/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/dynamicMappings.json b/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/dynamicMappings.json
deleted file mode 100644
index 38f4ebc606..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/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/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/entityCountHistoryMappings.json b/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/entityCountHistoryMappings.json
deleted file mode 100644
index 43dc68f409..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/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/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/es_mappings.json b/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/es_mappings.json
deleted file mode 100644
index 39fecb56e4..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/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/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/es_settings.json b/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/es_settings.json
deleted file mode 100644
index 6e857681ff..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/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/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-aggregateVnfSearchProvider.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-aggregateVnfSearchProvider.xml
deleted file mode 100644
index e829773f4b..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-aggregateVnfSearchProvider.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# 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.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="aggregateVnfSearchProvider"
- class="org.onap.aai.sparky.aggregatevnf.search.AggregateVnfSearchProvider">
- <constructor-arg ref="searchServiceAdapter"/>
- <constructor-arg name="autoSuggestIndexName" value="entityautosuggestindex"/>
- <constructor-arg name="vnfSearchSuggestionRoute" value="vnfSearch"/>
- </bean>
-
- <bean id="aggregateSummaryProcessor"
- class="org.onap.aai.sparky.aggregatevnf.search.AggregateSummaryProcessor">
- <constructor-arg ref="elasticSearchAdapter"/>
- <constructor-arg ref="filtersConfig"/>
- <property name="vnfAggregationIndexName" value="aggregate_generic-vnf_index"/>
- </bean>
-
- <bean id="registerAggregateVnfSearchProvider"
- class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- <property name="targetObject" ref="searchProviderRegistry"/>
- <property name="targetMethod">
- <value>addSearchProviders</value>
- </property>
- <property name="arguments">
- <list value-type="org.onap.aai.sparky.search.api.SearchProvider">
- <ref bean="aggregateVnfSearchProvider"/>
- </list>
- </property>
- </bean>
-</beans>
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-apigw.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-apigw.xml
deleted file mode 100644
index 85b6c46d3f..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-apigw.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# 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.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="synapseRestEndpointConfig" class="org.onap.aai.sparky.dal.rest.config.RestEndpointConfig">
- <property name="endpointIpAddress" value="aai.synapse.simpledemo.openecomp.org" />
- <property name="endpointServerPort" value="9502" />
- <property name="numRequestRetries" value="5" />
- <property name="restAuthenticationMode" value="SSL_CERT" />
- <property name="connectTimeoutInMs" value="60000" />
- <property name="readTimeoutInMs" value="30000" />
- <property name="certFileName" value="/auth/client-cert-onap.p12" />
- <property name="certPassword" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10" />
- <property name="truststoreFileName" value="/auth/inventory-ui-keystore" />
- <property name="validateServerCertChain" value="false" />
- <property name="validateServerHostname" value="false" />
- <property name="resourceLoader" ref="sparkyResourceLoader" />
-
- </bean>
-
- <bean id="aaiuiProxyProcessor"
- class="org.onap.aai.sparky.dal.proxy.processor.AaiUiProxyProcessor">
- <constructor-arg ref="synapseRestEndpointConfig" />
- <constructor-arg name="apiGatewayEndpoint" value="ui-request" />
- </bean>
-
-</beans>
-
-
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-gizmo.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-gizmo.xml
deleted file mode 100644
index 4b0011613a..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-gizmo.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# 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.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="gizmoRestEndpointConfig" class="org.onap.aai.sparky.dal.rest.config.RestEndpointConfig">
- <property name="endpointIpAddress" value="{{.Values.global.gizmo.serviceName}}.{{.Release.Namespace}}" />
- <property name="endpointServerPort" value="9520" />
- <property name="numRequestRetries" value="5" />
- <property name="restAuthenticationMode" value="SSL_CERT" />
- <property name="connectTimeoutInMs" value="60000" />
- <property name="readTimeoutInMs" value="30000" />
- <property name="certFileName" value="/auth/client-cert-onap.p12" />
- <property name="certPassword" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10" />
- <property name="truststoreFileName" value="/auth/inventory-ui-keystore" />
- <property name="validateServerCertChain" value="false" />
- <property name="validateServerHostname" value="false" />
- <property name="resourceLoader" ref="sparkyResourceLoader" />
- </bean>
-
- <bean id="gizmoAdapter" class="org.onap.aai.sparky.dal.GizmoAdapter">
- <constructor-arg ref="oxmModelLoader" />
- <constructor-arg ref="gizmoRestEndpointConfig" />
- <property name="relationshipsBasePath" value="/services/inventory/relationships/v13/" />
- <property name="inventoryBasePath" value="/services/inventory/v13/" />
- </bean>
-
-</beans>
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
deleted file mode 100644
index 5b4e4fa243..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
+++ /dev/null
@@ -1,390 +0,0 @@
-<!--
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# 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.
-
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="elasticSearchSchemaFactory" class="org.onap.aai.sparky.sync.ElasticSearchSchemaFactory">
- <property name="resourceLoader" ref="sparkyResourceLoader" />
- </bean>
-
-
- <bean id="elasticSearchRestEndpointConfig" class="org.onap.aai.sparky.dal.rest.config.RestEndpointConfig">
- <property name="endpointIpAddress" value="{{.Values.global.aaiElasticsearch.serviceName}}.{{.Release.Namespace}}" />
- <property name="endpointServerPort" value="9200" />
- <property name="numRequestRetries" value="5" />
- <property name="restAuthenticationMode" value="HTTP_NOAUTH" />
- <property name="connectTimeoutInMs" value="60000" />
- <property name="readTimeoutInMs" value="30000" />
- </bean>
-
- <bean id="elasticSearchAdapter" class="org.onap.aai.sparky.dal.ElasticSearchAdapter">
- <constructor-arg ref="elasticSearchRestEndpointConfig" />
- </bean>
-
- <bean id="elasticSearchNetworkStatConfig" class="org.onap.aai.sparky.sync.config.NetworkStatisticsConfig">
- <property name="numSamplesPerThreadForRunningAverage" value="100" />
- <property name="bytesHistogramLabel" value="[Response Size In Bytes]" />
- <property name="bytesHistogramMaxYAxis" value="1000000" />
- <property name="bytesHistogramNumBins" value="20" />
- <property name="bytesHistogramNumDecimalPoints" value="2" />
- <property name="queueLengthHistogramLabel" value="[Queue Item Length]" />
- <property name="queueLengthHistogramMaxYAxis" value="20000" />
- <property name="queueLengthHistogramNumBins" value="20" />
- <property name="queueLengthHistogramNumDecimalPoints" value="2" />
- <property name="taskAgeHistogramLabel" value="[Task Age In Ms]" />
- <property name="taskAgeHistogramMaxYAxis" value="600000" />
- <property name="taskAgeHistogramNumBins" value="20" />
- <property name="taskAgeHistogramNumDecimalPoints" value="2" />
- <property name="responseTimeHistogramLabel" value="[Response Time In Ms]" />
- <property name="responseTimeHistogramMaxYAxis" value="1000" />
- <property name="responseTimeHistogramNumBins" value="20" />
- <property name="responseTimeHistogramNumDecimalPoints" value="2" />
- <property name="tpsHistogramLabel" value="[Transactions Per Second]" />
- <property name="tpsHistogramMaxYAxis" value="100" />
- <property name="tpsHistogramNumBins" value="20" />
- <property name="tpsHistogramNumDecimalPoints" value="2" />
- </bean>
-
- <bean id="aaiNetworkStatConfig" class="org.onap.aai.sparky.sync.config.NetworkStatisticsConfig">
- <property name="numSamplesPerThreadForRunningAverage" value="100" />
- <property name="bytesHistogramLabel" value="[Response Size In Bytes]" />
- <property name="bytesHistogramMaxYAxis" value="1000000" />
- <property name="bytesHistogramNumBins" value="20" />
- <property name="bytesHistogramNumDecimalPoints" value="2" />
- <property name="queueLengthHistogramLabel" value="[Queue Item Length]" />
- <property name="queueLengthHistogramMaxYAxis" value="20000" />
- <property name="queueLengthHistogramNumBins" value="20" />
- <property name="queueLengthHistogramNumDecimalPoints" value="2" />
- <property name="taskAgeHistogramLabel" value="[Task Age In Ms]" />
- <property name="taskAgeHistogramMaxYAxis" value="600000" />
- <property name="taskAgeHistogramNumBins" value="20" />
- <property name="taskAgeHistogramNumDecimalPoints" value="2" />
- <property name="responseTimeHistogramLabel" value="[Response Time In Ms]" />
- <property name="responseTimeHistogramMaxYAxis" value="10000" />
- <property name="responseTimeHistogramNumBins" value="20" />
- <property name="responseTimeHistogramNumDecimalPoints" value="2" />
- <property name="tpsHistogramLabel" value="[Transactions Per Second]" />
- <property name="tpsHistogramMaxYAxis" value="100" />
- <property name="tpsHistogramNumBins" value="20" />
- <property name="tpsHistogramNumDecimalPoints" value="2" />
- </bean>
-
- <bean id="aaiRestEndpointConfig" class="org.onap.aai.sparky.dal.rest.config.RestEndpointConfig">
- <property name="endpointIpAddress" value="{{.Values.global.aai.serviceName}}" />
- <property name="endpointServerPort" value="8443" />
- <property name="numRequestRetries" value="5" />
- <property name="restAuthenticationMode" value="SSL_BASIC" />
- <property name="connectTimeoutInMs" value="60000" />
- <property name="readTimeoutInMs" value="30000" />
- <property name="basicAuthUserName" value="AaiUI" />
- <property name="basicAuthPassword" value="OBF:1gfr1p571unz1p4j1gg7" />
- <property name="truststoreFileName" value="/auth/inventory-ui-keystore" />
- <property name="validateServerCertChain" value="false" />
- <property name="validateServerHostname" value="false" />
- <property name="resourceLoader" ref="sparkyResourceLoader" />
- </bean>
-
- <bean id="activeInventoryAdapter" class="org.onap.aai.sparky.dal.ActiveInventoryAdapter">
- <constructor-arg ref="oxmModelLoader" />
- <constructor-arg ref="oxmEntityLookup" />
- <constructor-arg ref="aaiRestEndpointConfig" />
- </bean>
-
- <bean id="syncControllerRegistry" class="org.onap.aai.sparky.sync.SyncControllerRegistry" />
-
- <bean id="elasticSearchEndpointConfig"
- class="org.onap.aai.sparky.sync.config.ElasticSearchEndpointConfig">
- <property name="esIpAddress" value="{{.Values.global.aaiElasticsearch.serviceName}}.{{.Release.Namespace}}" />
- <property name="esServerPort" value="9200" />
- <property name="scrollContextTimeToLiveInMinutes" value="5" />
- <property name="scrollContextBatchRequestSize" value="5000" />
- </bean>
-
- <bean id="aggregationSyncControllerConfig" class="org.onap.aai.sparky.sync.config.SyncControllerConfig">
- <property name="controllerName" value="Aggregation-Sync-Controller" />
- <property name="enabled" value="true" />
- <property name="syncTaskDelayInMs" value="5000" />
- <property name="syncTaskFrequencyInDays" value="1" />
- <property name="numSyncControllerWorkers" value="2" />
- <property name="runOnceSyncEnabled" value="true" />
- <property name="periodicSyncEnabled" value="false" />
- <property name="numInternalSyncWorkers" value="2" />
- <property name="numSyncElasticWorkers" value="5" />
- <property name="numSyncActiveInventoryWorkers" value="5" />
- <property name="targetSyncStartTimeStamp" value="05:00:00 UTC+00:00" />
- </bean>
-
- <bean id="aggregationSyncControllerFactory"
- class="org.onap.aai.sparky.aggregation.sync.AggregationSyncControllerFactory"
- init-method="registerController">
-
- <constructor-arg ref="elasticSearchEndpointConfig" />
- <constructor-arg ref="aggregationSyncControllerConfig" />
- <constructor-arg ref="syncControllerRegistry" />
- <constructor-arg ref="suggestionEntityLookup" />
- <constructor-arg ref="oxmEntityLookup" />
- <constructor-arg ref="elasticSearchSchemaFactory" />
-
- <property name="esAdapter" ref="elasticSearchAdapter" />
- <property name="esStatConfig" ref="elasticSearchNetworkStatConfig" />
-
- <property name="aaiAdapter" ref="activeInventoryAdapter" />
- <property name="aaiStatConfig" ref="aaiNetworkStatConfig" />
-
- <property name="aggregationEntityToIndexMap">
- <map>
- <entry key="generic-vnf" value="aggregate_generic-vnf_index" />
- </map>
- </property>
-
- <property name="indexNameToSchemaConfigMap">
- <map>
- <entry key="aggregate_generic-vnf_index">
- <bean class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="aggregate-vnf-index" />
- <property name="indexDocType" value="default" />
- <property name="indexMappingsFileName" value="/schemas/dynamicMappings.json" />
- </bean>
- </entry>
- </map>
- </property>
-
- </bean>
-
-
- <bean id="historicalEntitySyncControllerConfig" class="org.onap.aai.sparky.sync.config.SyncControllerConfig">
-
- <property name="controllerName" value="Historical-Entity-Sync-Controller" />
- <property name="enabled" value="true" />
- <property name="syncTaskDelayInMs" value="5000" />
- <property name="syncTaskFrequencyInDays" value="1" />
- <property name="numSyncControllerWorkers" value="2" />
- <property name="runOnceSyncEnabled" value="true" />
- <property name="periodicSyncEnabled" value="false" />
- <property name="numInternalSyncWorkers" value="2" />
- <property name="numSyncElasticWorkers" value="5" />
- <property name="numSyncActiveInventoryWorkers" value="5" />
- <property name="targetSyncStartTimeStamp" value="05:00:00 UTC+00:00" />
- </bean>
-
- <bean id="historicalEntitySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="entitycounthistoryindex" />
- <property name="indexDocType" value="default" />
- <property name="indexMappingsFileName" value="/schemas/entityCountHistoryMappings.json" />
- <property name="indexSettingsFileName" value="/schemas/es_settings.json" />
- </bean>
-
- <bean id="historicalEntitySyncController"
- class="org.onap.aai.sparky.aggregation.sync.HistoricalEntitySyncController"
- init-method="registerController">
-
- <constructor-arg ref="historicalEntitySyncControllerConfig" />
- <constructor-arg ref="activeInventoryAdapter" />
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg ref="historicalEntitySchemaConfig" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
- <constructor-arg value="60" />
- <constructor-arg ref="aaiNetworkStatConfig" />
- <constructor-arg ref="elasticSearchNetworkStatConfig" />
- <constructor-arg ref="searchableEntityLookup" />
- <constructor-arg ref="elasticSearchSchemaFactory" />
-
- <property name="syncControllerRegistry" ref="syncControllerRegistry" />
-
- </bean>
-
-
-
- <bean id="autoSuggestionSyncControllerConfig" class="org.onap.aai.sparky.sync.config.SyncControllerConfig">
-
- <property name="controllerName" value="Auto-Suggestion-Sync-Controller" />
- <property name="enabled" value="true" />
- <property name="syncTaskDelayInMs" value="5000" />
- <property name="syncTaskFrequencyInDays" value="1" />
- <property name="numSyncControllerWorkers" value="2" />
- <property name="runOnceSyncEnabled" value="true" />
- <property name="periodicSyncEnabled" value="false" />
- <property name="numInternalSyncWorkers" value="2" />
- <property name="numSyncElasticWorkers" value="5" />
- <property name="numSyncActiveInventoryWorkers" value="5" />
- <property name="targetSyncStartTimeStamp" value="05:00:00 UTC+00:00" />
- </bean>
-
- <bean id="autoSuggestionEntitySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="entity-autosuggest-index" />
- <property name="indexDocType" value="default" />
- <property name="indexMappingsFileName" value="/schemas/autoSuggestMappings.json" />
- <property name="indexSettingsFileName" value="/schemas/autoSuggestSettings.json" />
- </bean>
-
- <bean id="autoSuggestionEntitySyncController"
- class="org.onap.aai.sparky.autosuggestion.sync.AutoSuggestionSyncController"
- init-method="registerController">
-
- <constructor-arg ref="autoSuggestionSyncControllerConfig" />
- <constructor-arg ref="activeInventoryAdapter" />
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg ref="autoSuggestionEntitySchemaConfig" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
- <constructor-arg ref="aaiNetworkStatConfig" />
- <constructor-arg ref="elasticSearchNetworkStatConfig" />
- <constructor-arg ref="oxmEntityLookup" />
- <constructor-arg ref="suggestionEntityLookup" />
- <constructor-arg ref="filtersConfig" />
- <constructor-arg ref="elasticSearchSchemaFactory" />
-
- <property name="syncControllerRegistry" ref="syncControllerRegistry" />
-
- </bean>
-
-
-
- <bean id="vnfAliasSyncControllerConfig" class="org.onap.aai.sparky.sync.config.SyncControllerConfig">
-
- <property name="controllerName" value="Vnf-Alias-Sync-Controller" />
- <property name="enabled" value="true" />
- <property name="syncTaskDelayInMs" value="5000" />
- <property name="syncTaskFrequencyInDays" value="1" />
- <property name="numSyncControllerWorkers" value="2" />
- <property name="runOnceSyncEnabled" value="true" />
- <property name="periodicSyncEnabled" value="false" />
- <property name="numInternalSyncWorkers" value="2" />
- <property name="numSyncElasticWorkers" value="5" />
- <property name="numSyncActiveInventoryWorkers" value="5" />
- <property name="targetSyncStartTimeStamp" value="05:00:00 UTC+00:00" />
- </bean>
-
- <bean id="vnfAliasEntitySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="entityautosuggestindex" />
- <property name="indexDocType" value="default" />
- <property name="indexMappingsFileName" value="/schemas/autoSuggestMappings.json" />
- <property name="indexSettingsFileName" value="/schemas/autoSuggestSettings.json" />
- </bean>
-
- <bean id="vnfAliasSyncController"
- class="org.onap.aai.sparky.autosuggestion.sync.VnfAliasSyncController"
- init-method="registerController">
-
- <constructor-arg ref="vnfAliasSyncControllerConfig" />
- <constructor-arg ref="activeInventoryAdapter" />
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg ref="vnfAliasEntitySchemaConfig" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
- <constructor-arg ref="aaiNetworkStatConfig" />
- <constructor-arg ref="elasticSearchNetworkStatConfig" />
- <constructor-arg ref="filtersConfig" />
- <constructor-arg ref="elasticSearchSchemaFactory" />
-
- <property name="syncControllerRegistry" ref="syncControllerRegistry" />
-
- </bean>
-
- <bean id="geoSyncControllerConfig" class="org.onap.aai.sparky.sync.config.SyncControllerConfig">
-
- <property name="controllerName" value="Geo-Sync-Controller" />
- <property name="enabled" value="true" />
- <property name="syncTaskDelayInMs" value="5000" />
- <property name="syncTaskFrequencyInDays" value="1" />
- <property name="numSyncControllerWorkers" value="2" />
- <property name="runOnceSyncEnabled" value="true" />
- <property name="periodicSyncEnabled" value="false" />
- <property name="numInternalSyncWorkers" value="2" />
- <property name="numSyncElasticWorkers" value="5" />
- <property name="numSyncActiveInventoryWorkers" value="5" />
- <property name="targetSyncStartTimeStamp" value="05:00:00 UTC+00:00" />
- </bean>
-
- <bean id="geoEntitySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="topography-search-index" />
- <property name="indexDocType" value="default" />
- <property name="indexMappingsFileName" value="/schemas/dynamicMappings.json" />
- </bean>
-
- <bean id="geoSyncController"
- class="org.onap.aai.sparky.topology.sync.GeoSyncController"
- init-method="registerController">
-
- <constructor-arg ref="geoSyncControllerConfig" />
- <constructor-arg ref="activeInventoryAdapter" />
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg ref="geoEntitySchemaConfig" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
- <constructor-arg ref="aaiNetworkStatConfig" />
- <constructor-arg ref="elasticSearchNetworkStatConfig" />
- <constructor-arg ref="geoEntityLookup" />
- <constructor-arg ref="oxmEntityLookup" />
- <constructor-arg ref="elasticSearchSchemaFactory" />
-
- <property name="syncControllerRegistry" ref="syncControllerRegistry" />
-
- </bean>
-
- <bean id="viewInspectControllerConfig" class="org.onap.aai.sparky.sync.config.SyncControllerConfig">
-
- <property name="controllerName" value="View-Inspect-Sync-Controller" />
- <property name="enabled" value="true" />
- <property name="syncTaskDelayInMs" value="5000" />
- <property name="syncTaskFrequencyInDays" value="1" />
- <property name="numSyncControllerWorkers" value="2" />
- <property name="runOnceSyncEnabled" value="true" />
- <property name="periodicSyncEnabled" value="false" />
- <property name="numInternalSyncWorkers" value="2" />
- <property name="numSyncElasticWorkers" value="5" />
- <property name="numSyncActiveInventoryWorkers" value="5" />
- <property name="targetSyncStartTimeStamp" value="05:00:00 UTC+00:00" />
- </bean>
-
- <bean id="viewInspectySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="entity-search-index" />
- <property name="indexDocType" value="default" />
- <property name="indexMappingsFileName" value="/schemas/es_mappings.json" />
- <property name="indexSettingsFileName" value="/schemas/es_settings.json" />
- </bean>
-
-
- <bean id="viewInspectSyncController"
- class="org.onap.aai.sparky.viewinspect.sync.ViewInspectSyncController"
- init-method="registerController">
-
- <constructor-arg ref="viewInspectControllerConfig" />
- <constructor-arg ref="activeInventoryAdapter" />
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg ref="viewInspectySchemaConfig" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
- <constructor-arg ref="aaiNetworkStatConfig" />
- <constructor-arg ref="elasticSearchNetworkStatConfig" />
- <constructor-arg ref="crossEntityReferenceLookup" />
- <constructor-arg ref="oxmEntityLookup" />
- <constructor-arg ref="searchableEntityLookup" />
- <constructor-arg ref="elasticSearchSchemaFactory" />
-
- <property name="syncControllerRegistry" ref="syncControllerRegistry" />
-
- </bean>
-
- <bean id="syncControllerService" class="org.onap.aai.sparky.sync.SyncControllerService"
- destroy-method="shutdown">
- <constructor-arg ref="syncControllerRegistry" />
- <constructor-arg value="5" />
- <constructor-arg value="5" />
- </bean>
-
-</beans>
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-viewInspect.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-viewInspect.xml
deleted file mode 100644
index 175d130a8c..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-viewInspect.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# 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.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="visualizationConfigurations"
- class="org.onap.aai.sparky.viewandinspect.config.VisualizationConfigs">
- <property name="maxSelfLinkTraversalDepth" value="2" />
- <property name="visualizationDebugEnabled" value="false" />
- <property name="aaiEntityNodeDescriptors" value="/descriptors/aaiEntityNodeDescriptors.json" />
- <property name="generalNodeClassName" value="generalNodeClass" />
- <property name="searchNodeClassName" value="searchedNodeClass" />
- <property name="selectedSearchedNodeClassName" value="selectedSearchedNodeClass" />
- <property name="numOfThreadsToFetchNodeIntegrity" value="20" />
- <property name="makeAllNeighborsBidirectional" value="false" />
- <property name="gizmoEnabled" value="false" />
- <property name="resourceLoader" ref="sparkyResourceLoader" />
-
- <property name="shallowEntities">
- <list value-type="java.lang.String">
- <value>cloud-region</value>
- <value>complex</value>
- <value>vnf-image</value>
- <value>image</value>
- <value>flavor</value>
- <value>availability-zone</value>
- <value>tenant</value>
- <value>network-profile</value>
- <value>l-interface</value>
- </list>
- </property>
-
- </bean>
-
- <bean id="baseVisualizationService"
- class="org.onap.aai.sparky.viewandinspect.services.BaseVisualizationService">
- <constructor-arg ref="oxmModelLoader"/>
- <constructor-arg ref="visualizationConfigurations"/>
- <constructor-arg ref="activeInventoryAdapter" />
- <constructor-arg ref="gizmoAdapter" />
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
- <constructor-arg ref="viewInspectySchemaConfig" />
- <constructor-arg name="numActiveInventoryWorkers" value="50" />
- <constructor-arg ref="oxmEntityLookup" />
- <constructor-arg ref="subscriptionConfig" />
- </bean>
-
- <bean id="schemaVisualizationProcessor"
- class="org.onap.aai.sparky.viewandinspect.SchemaVisualizationProcessor">
- <property name="visualizationService" ref="baseVisualizationService" />
- </bean>
-
-</beans>
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-viewInspectSearchProvider.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-viewInspectSearchProvider.xml
deleted file mode 100644
index a67ab8cb28..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-viewInspectSearchProvider.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# 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.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="viewInspectSearchProvider"
- class="org.onap.aai.sparky.viewandinspect.search.ViewInspectSearchProvider">
- <constructor-arg ref="searchServiceAdapter" />
- <constructor-arg ref="suggestiveSearchConfigs" />
- <constructor-arg name="viewInspectIndexName" value="entitysearchindex" />
- <constructor-arg name="viewInspectSuggestionRoute" value="schema" />
- <constructor-arg ref="oxmEntityLookup" />
-
- <property name="additionalSearchSuggestionText">
- <value>Schema</value>
- </property>
-
- </bean>
-
- <bean id="registerViewInspectSearchProvider"
- class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- <property name="targetObject" ref="searchProviderRegistry" />
- <property name="targetMethod">
- <value>addSearchProviders</value>
- </property>
- <property name="arguments">
- <list value-type="org.onap.aai.sparky.search.api.SearchProvider">
- <ref bean="viewInspectSearchProvider" />
- </list>
- </property>
- </bean>
-
-</beans>
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core.xml
deleted file mode 100644
index a401d9b248..0000000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<!--
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# 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.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="searchServiceRestEndpointConfig" class="org.onap.aai.sparky.dal.rest.config.RestEndpointConfig">
- <property name="endpointIpAddress" value="{{.Values.global.searchData.serviceName}}.{{.Release.Namespace}}" />
- <property name="endpointServerPort" value="9509" />
- <property name="numRequestRetries" value="5" />
- <property name="restAuthenticationMode" value="SSL_CERT" />
- <property name="connectTimeoutInMs" value="60000" />
- <property name="readTimeoutInMs" value="30000" />
- <property name="certFileName" value="/auth/client-cert-onap.p12" />
- <property name="certPassword" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10" />
- <property name="truststoreFileName" value="/auth/inventory-ui-keystore" />
- <property name="validateServerCertChain" value="false" />
- <property name="validateServerHostname" value="false" />
- <property name="resourceLoader" ref="sparkyResourceLoader" />
- </bean>
-
- <bean id="searchServiceAdapter" class="org.onap.aai.sparky.search.SearchServiceAdapter">
- <constructor-arg ref="searchServiceRestEndpointConfig" />
- <constructor-arg name="serviceApiVersion" value="v1" />
- </bean>
-
- <bean id="filtersConfig" class="org.onap.aai.sparky.search.filters.config.FiltersConfig">
- <constructor-arg name="filtersFileName" value="/filters/aaiui_filters.json" />
- <constructor-arg name="viewsFileName" value="/filters/aaiui_views.json" />
- <constructor-arg name="resourceLoader" ref="sparkyResourceLoader" />
- </bean>
-
- <bean id="crossEntityReferenceLookup"
- class="org.onap.aai.sparky.config.oxm.CrossEntityReferenceLookup" />
-
- <bean id="geoEntityLookup" class="org.onap.aai.sparky.config.oxm.GeoEntityLookup" />
-
- <bean id="oxmEntityLookup" class="org.onap.aai.sparky.config.oxm.OxmEntityLookup" />
-
- <bean id="searchableEntityLookup" class="org.onap.aai.sparky.config.oxm.SearchableEntityLookup" />
-
- <bean id="suggestionEntityLookup" class="org.onap.aai.sparky.config.oxm.SuggestionEntityLookup">
- <constructor-arg ref="filtersConfig" />
- </bean>
-
- <bean id="oxmModelProcessorSet" class="org.springframework.beans.factory.config.SetFactoryBean">
- <property name="targetSetClass" value="java.util.HashSet" />
- <property name="sourceSet">
- <set>
- <ref bean="crossEntityReferenceLookup" />
- <ref bean="geoEntityLookup" />
- <ref bean="oxmEntityLookup" />
- <ref bean="searchableEntityLookup" />
- <ref bean="suggestionEntityLookup" />
- </set>
- </property>
- </bean>
-
- <bean id="oxmModelLoader" class="org.onap.aai.sparky.config.oxm.OxmModelLoader" init-method="loadLatestOxmModel">
- <!-- the int argument is the latestVersionOverride. -1 disables the override -->
- <constructor-arg type="int" value="-1" />
- <constructor-arg ref="oxmModelProcessorSet" />
- </bean>
-
- <bean id="searchProviderRegistry"
- class="org.onap.aai.sparky.search.registry.SearchProviderRegistry" />
-
- <bean id="sparkyResourceLoader" class="org.onap.aai.sparky.config.SparkyResourceLoader">
- <property name="configHomeEnvVar" value="CONFIG_HOME" />
- </bean>
-
- <bean id="filterElasticSearchAdapter"
- class="org.onap.aai.sparky.search.filters.FilterElasticSearchAdapter">
- <constructor-arg ref="elasticSearchAdapter" />
- </bean>
-
- <bean id="filteredSearchHelper" class="org.onap.aai.sparky.search.filters.FilteredSearchHelper" >
- <constructor-arg ref="filtersConfig" />
- <constructor-arg ref="filterElasticSearchAdapter" />
- </bean>
-
- <bean id="filterProcessor" class="org.onap.aai.sparky.search.filters.FilterProcessor" >
- <property name="filteredSearchHelper" ref="filteredSearchHelper" />
- </bean>
-
- <bean id="unifiedSearchProcessor" class="org.onap.aai.sparky.search.UnifiedSearchProcessor">
- <property name="searchProviderRegistry" ref="searchProviderRegistry" />
- </bean>
-
- <bean id="entityCountHistoryProcessor" class="org.onap.aai.sparky.search.EntityCountHistoryProcessor">
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg name="entityTypesToSummarizeDelimitedList"
- value="customer,service-instance,complex,pserver,vserver,vnf" />
- <constructor-arg name="vnfEntityTypesDelimitedList"
- value="vnf,newvce,vce,vpe" />
- <constructor-arg name="entityCountHistoryIndexName"
- value="entitycounthistoryindex" />
- </bean>
-
- <bean id="attributeUpdater"
- class="org.onap.aai.sparky.editattributes.AttributeUpdater">
- <constructor-arg ref="oxmModelLoader" />
- <constructor-arg ref="oxmEntityLookup" />
- <constructor-arg ref="activeInventoryAdapter" />
- </bean>
-
- <bean id="attributeEditProcessor"
- class="org.onap.aai.sparky.editattributes.AttributeEditProcessor">
- <constructor-arg ref="attributeUpdater" />
- </bean>
-
- <bean id="geoVisualizationProcessor" class="org.onap.aai.sparky.inventory.GeoVisualizationProcessor">
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg name="topographicalSearchIndexName"
- value="topographicalsearchindex" />
- </bean>
-
- <bean id = "pairingHashMap" class="org.springframework.beans.factory.config.MapFactoryBean">
- <property name="targetMapClass">
- <value>java.util.HashMap</value>
- </property>
- <property name="sourceMap">
- <map key-type="java.lang.String" value-type="java.lang.String" >
- <entry key="volume-group-id" value="called" />
- <entry key="volume-group-name" value="called" />
- <entry key="physical-location-id" value="called" />
- <entry key="data-center-code" value="called" />
- <entry key="complex-name" value="called" />
- <entry key="tenant-id" value="called" />
- <entry key="tenant-name" value="called" />
- <entry key="vserver-id" value="called" />
- <entry key="vserver-name" value="called" />
- <entry key="vserver-name2" value="called" />
- <entry key="hostname" value="called" />
- <entry key="pserver-name2" value="called" />
- <entry key="pserver-id" value="called" />
- <entry key="global-customer-id" value="called" />
- <entry key="subscriber-name" value="called" />
- <entry key="service-instance-id" value="called" />
- <entry key="service-instance-name" value="called" />
- <entry key="link-name" value="called" />
- <entry key="vpn-id" value="called" />
- <entry key="vpn-name" value="called" />
- <entry key="vpe-id" value="called" />
- <entry key="vnf-id" value="called" />
- <entry key="vnf-name" value="called" />
- <entry key="vnf-name2" value="called" />
- <entry key="vnfc-name" value="called" />
- <entry key="network-id" value="called" />
- <entry key="network-name" value="called" />
- <entry key="network-policy-id" value="called" />
- <entry key="vf-module-id" value="called" />
- <entry key="vf-module-name" value="called" />
- <entry key="vnf-id2" value="called" />
- <entry key="pnf-name" value="called" />
- <entry key="circuit-id" value="called" />
- <entry key="id" value="called" />
- <entry key="group-id" value="called" />
- <entry key="group-name" value="called" />
- <entry key="street1" value="at" />
- <entry key="street2" value="at" />
- <entry key="code" value="at" />
- <entry key="ipv4-oam-address" value="at" />
- <entry key="network-policy-fqdn" value="at" />
- </map>
- </property>
- </bean>
-
- <bean id="suggestiveSearchConfigs" class="org.onap.aai.sparky.search.config.SuggestionConfig">
- <property name="defaultPairingValue" value="with" />
- <property name="pairingList" ref="pairingHashMap"></property>
- <property name="stopWords">
- <list value-type="java.lang.String">
- <value>a</value>
- <value>an</value>
- <value>and</value>
- <value>are</value>
- <value>as</value>
- <value>at</value>
- <value>be</value>
- <value>but</value>
- <value>by</value>
- <value>called</value>
- <value>for</value>
- <value>if</value>
- <value>in</value>
- <value>into</value>
- <value>is</value>
- <value>it</value>
- <value>no</value>
- <value>not</value>
- <value>of</value>
- <value>on</value>
- <value>or</value>
- <value>such</value>
- <value>that</value>
- <value>the</value>
- <value>their</value>
- <value>then</value>
- <value>there</value>
- <value>these</value>
- <value>they</value>
- <value>this</value>
- <value>to</value>
- <value>was</value>
- <value>will</value>
- <value>with</value>
- </list>
- </property>
-
- </bean>
-
- <bean id="subscriptionConfig"
- class="org.onap.aai.sparky.subscription.config.SubscriptionConfig">
- <property name="subscriptionTarget" value="" />
- <property name="subscriptionOrigin" value="" />
- <property name="subscriptionMessageType" value="" />
- <property name="subscriptionTopic" value="" />
- <property name="launchOITarget" value="" />
- <property name="launchOIOrigin" value="" />
- <property name="launchOIMessageType" value="" />
- <property name="launchOITopic" value="" />
- <property name="annEntitiyTypes">
- <list value-type="java.lang.String">
- <value>pserver</value>
- <value>pnf</value>
- </list>
- </property>
- <property name="isLaunchOIEnabled" value="false" />
- </bean>
-
- <bean id="subscriptionService"
- class="org.onap.aai.sparky.subscription.services.SubscriptionService">
- <constructor-arg ref="subscriptionConfig" />
- </bean>
-
- <bean id="subscriptionServiceProcessor"
- class="org.onap.aai.sparky.subscription.SubscriptionServiceProcessor">
- <constructor-arg ref="subscriptionService" />
- </bean>
-</beans>
diff --git a/kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml
index fcda4c2f58..6a00fe740e 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml
@@ -15,72 +15,36 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-portal
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/portal/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-log
+ name: {{ include "common.fullname" . }}-prop
namespace: {{ include "common.namespace" . }}
data:
-{{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/application.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/application-resources.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/application-ssl.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/application-oxm-default.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/application-oxm-override.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/application-oxm-schema-prod.properties").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-camel-rests
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/camel-rests/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-descriptors
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/descriptors/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-filters
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/filters/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-schemas
+ name: {{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
data:
-{{ tpl (.Files.Glob "resources/config/schemas/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-spring-beans
+ name: {{ include "common.fullname" . }}-portal
namespace: {{ include "common.namespace" . }}
data:
-{{ tpl (.Files.Glob "resources/config/spring-beans/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/portal/*").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-boot-inf
+ name: {{ include "common.fullname" . }}-portal-props
namespace: {{ include "common.namespace" . }}
data:
-{{ tpl (.Files.Glob "resources/config/portal/BOOT-INF/classes/*").AsConfig . | indent 2 }}
-
+{{ tpl (.Files.Glob "resources/config/portal/BOOT-INF/classes/*").AsConfig . | indent 2 }} \ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
index 9bc055ae4c..48235bcd02 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
@@ -58,43 +58,47 @@ spec:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- env:
- - name: CONFIG_HOME
- value: /opt/app/sparky/appconfig/
- - name: KEYSTORE_ALIAS_PASSWORD
- value: {{ .Values.config.keystoreAliasPassword }}
- - name: KEYSTORE_PASSWORD
- value: {{ .Values.config.keyStorePassword }}
- - name: SPARKY_SSL_ENABLED
- value: 'false'
- - name: SPARKY_PORTAL_ENABLED
- value: 'false'
+
volumeMounts:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- - mountPath: /opt/app/sparky/appconfig/auth/
+ - mountPath: /opt/app/sparky/config/auth/
name: {{ include "common.fullname" . }}-auth-config
- - mountPath: /opt/app/sparky/appconfig/camel-rests/
- name: {{ include "common.fullname" . }}-camel-rests-config
- - mountPath: /opt/app/sparky/appconfig/descriptors/
- name: {{ include "common.fullname" . }}-descriptors-config
- - mountPath: /opt/app/sparky/appconfig/filters/
- name: {{ include "common.fullname" . }}-filters-config
- - mountPath: /opt/app/sparky/appconfig/
- name: {{ include "common.fullname" . }}-config
- - mountPath: /opt/app/sparky/appconfig/portal
+
+ - mountPath: /opt/app/sparky/config/portal/
name: {{ include "common.fullname" . }}-portal-config
- - mountPath: /opt/app/sparky/appconfig/portal/BOOT-INF/classes
- name: {{ include "common.fullname" . }}-portal-boot-inf-config
- - mountPath: /opt/app/sparky/appconfig/schemas
- name: {{ include "common.fullname" . }}-schemas-config
- - mountPath: /opt/app/sparky/appconfig/spring-beans/
- name: {{ include "common.fullname" . }}-spring-beans-config
+
+ - mountPath: /opt/app/sparky/config/portal/BOOT-INF/classes/
+ name: {{ include "common.fullname" . }}-portal-config-props
+
- mountPath: /var/log/onap
name: {{ include "common.fullname" . }}-logs
- - mountPath: /opt/app/sparky/appconfig/logging/
- name: {{ include "common.fullname" . }}-log-conf
+
+ - mountPath: /opt/app/sparky/config/application.properties
+ name: {{ include "common.fullname" . }}-properties
+ subPath: application.properties
+
+ - mountPath: /opt/app/sparky/config/application-resources.properties
+ name: {{ include "common.fullname" . }}-properties
+ subPath: application-resources.properties
+
+ - mountPath: /opt/app/sparky/config/application-ssl.properties
+ name: {{ include "common.fullname" . }}-properties
+ subPath: application-ssl.properties
+
+ - mountPath: /opt/app/sparky/config/application-oxm-default.properties
+ name: {{ include "common.fullname" . }}-properties
+ subPath: application-oxm-default.properties
+
+ - mountPath: /opt/app/sparky/config/application-oxm-override.properties
+ name: {{ include "common.fullname" . }}-properties
+ subPath: application-oxm-override.properties
+
+ - mountPath: /opt/app/sparky/config/application-oxm-schema-prod.properties
+ name: {{ include "common.fullname" . }}-properties
+ subPath: application-oxm-schema-prod.properties
+
ports:
- containerPort: {{ .Values.service.internalPort }}
- containerPort: {{ .Values.service.internalPort2 }}
@@ -140,33 +144,26 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
+
+ - name: {{ include "common.fullname" . }}-properties
+ configMap:
+ name: {{ include "common.fullname" . }}-prop
+
- name: {{ include "common.fullname" . }}-config
configMap:
name: {{ include "common.fullname" . }}
- - name: {{ include "common.fullname" . }}-auth-config
- secret:
- secretName: {{ include "common.fullname" . }}
- - name: {{ include "common.fullname" . }}-camel-rests-config
- configMap:
- name: {{ include "common.fullname" . }}-camel-rests
- - name: {{ include "common.fullname" . }}-descriptors-config
- configMap:
- name: {{ include "common.fullname" . }}-descriptors
- - name: {{ include "common.fullname" . }}-filters-config
- configMap:
- name: {{ include "common.fullname" . }}-filters
+
- name: {{ include "common.fullname" . }}-portal-config
configMap:
name: {{ include "common.fullname" . }}-portal
- - name: {{ include "common.fullname" . }}-portal-boot-inf-config
- configMap:
- name: {{ include "common.fullname" . }}-boot-inf
- - name: {{ include "common.fullname" . }}-schemas-config
- configMap:
- name: {{ include "common.fullname" . }}-schemas
- - name: {{ include "common.fullname" . }}-spring-beans-config
+
+ - name: {{ include "common.fullname" . }}-portal-config-props
configMap:
- name: {{ include "common.fullname" . }}-spring-beans
+ name: {{ include "common.fullname" . }}-portal-props
+
+ - name: {{ include "common.fullname" . }}-auth-config
+ secret:
+ secretName: {{ include "common.fullname" . }}
- name: filebeat-conf
configMap:
name: aai-filebeat
@@ -174,9 +171,8 @@ spec:
emptyDir: {}
- name: aai-sparky-filebeat
emptyDir: {}
- - name: {{ include "common.fullname" . }}-log-conf
- configMap:
- name: {{ include "common.fullname" . }}-log
+ - name: modeldir
+ emptyDir: {}
restartPolicy: {{ .Values.global.restartPolicy | default .Values.restartPolicy }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aai/charts/aai-sparky-be/values.yaml b/kubernetes/aai/charts/aai-sparky-be/values.yaml
index df3f5cfd7c..6004d6d0b4 100644
--- a/kubernetes/aai/charts/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/values.yaml
@@ -28,7 +28,7 @@ global: # global defaults
# application image
repository: nexus3.onap.org:10001
-image: onap/sparky-be:1.2.1
+image: onap/sparky-be:1.3-STAGING-latest
pullPolicy: Always
restartPolicy: Always