diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/aai.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/aai.properties
deleted file mode 100644
index 813a263..0000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/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.{{.Release.Namespace}}
-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
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/csp-cookie-filter.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/csp-cookie-filter.properties
new file mode 100644
index 0000000..2315b9f
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/csp-cookie-filter.properties
@@ -0,0 +1,12 @@
+global.login.url=aaiportal.onap.org
+
+# MOTS ID of the application
+application.id=12345
+
+# valid domains for open redirect
+redirect-domain=domain.com
+
+# Required by esGateKeeper. Valid values are:
+# DEVL - used during development
+# PROD - used in production
+gatekeeper.environment=TEST
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/inventory-ui-keystore b/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/inventory-ui-keystore
deleted file mode 100644
index efa01f8..0000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/inventory-ui-keystore
+++ /dev/null
Binary files differ
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/tomcat_keystore b/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/tomcat_keystore
new file mode 100644
index 0000000..9eec841
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/tomcat_keystore
Binary files differ
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/camel-rests/sparky-core-filter-aggregation.xml
new file mode 100644
index 0000000..e4e02ba
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-filter-aggregation.xml
@@ -0,0 +1,7 @@
+<rests xmlns="http://camel.apache.org/schema/spring">
+   <rest>
+      <post uri="/search/filterAggregation">
+         <to uri="bean:aggregateSummaryProcessor?method=getFilteredAggregation"/>
+      </post>
+   </rest>
+</rests>
\ No newline at end of file
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
new file mode 100644
index 0000000..20dba6f
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-prepareSchema.xml
@@ -0,0 +1,11 @@
+<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
new file mode 100644
index 0000000..f6a2953
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-subscriptionService.xml
@@ -0,0 +1,7 @@
+<rests xmlns="http://camel.apache.org/schema/spring">
+   <rest>
+      <get uri="/subscription/getsubscription">
+         <to uri="bean:subscriptionServiceProcessor?method=getSubscription"/>
+      </get>
+   </rest>
+</rests>
\ 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/camel-rests/sparky-core-unified-search.xml
new file mode 100644
index 0000000..61fd9ad
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-unified-search.xml
@@ -0,0 +1,7 @@
+<rests xmlns="http://camel.apache.org/schema/spring">
+   <rest>
+      <post uri="/search/querysearch">
+         <to uri="bean:unifiedSearchProcessor?method=search"/>
+      </post>
+   </rest>
+</rests>
\ No newline at end of file
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
new file mode 100644
index 0000000..1b975e9
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/camel-rests/sparky-core-unifiedFilterRequest.xml
@@ -0,0 +1,7 @@
+<rests xmlns="http://camel.apache.org/schema/spring">
+   <rest>
+      <post uri="/search/unifiedFilterRequest">
+         <to uri="bean:filterProcessor?method=getFiltersWithValues"/>
+      </post>
+   </rest>
+</rests>
\ No newline at end of file
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
new file mode 100644
index 0000000..e72bab0
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/descriptors/aaiEntityNodeDescriptors.json
@@ -0,0 +1,218 @@
+{
+	"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/elasticsearch.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/elasticsearch.properties
deleted file mode 100644
index 082744b..0000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/elasticsearch.properties
+++ /dev/null
@@ -1,72 +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.{{.Release.Namespace}}
-elasticsearch.httpPort={{ .Values.config.elasticsearchHttpPort }}
-elasticsearch.javaApiPort=8443
-
-############################## Indexes ##############################
-#
-# Index names for various searches.
-#
-elasticsearch.indexName=entitysearchindex
-elasticsearch.topographicalIndexName=topographicalsearchindex
-elasticsearch.entityCountHistoryIndexName=entitycounthistoryindex
-elasticsearch.autosuggestIndexname=entityautosuggestindex
-
-# 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
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
new file mode 100644
index 0000000..62b6811
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/filters/aaiui_filters.json
@@ -0,0 +1,79 @@
+{
+	"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
new file mode 100644
index 0000000..9ca0119
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/filters/aaiui_views.json
@@ -0,0 +1,21 @@
+{
+    "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
new file mode 100644
index 0000000..ad2ab7a
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/filters/subscription_object_inspector_mapping.json
@@ -0,0 +1,16 @@
+{
+    "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
index c1b99c1..3f96497 100644
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/log/logback.xml
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/log/logback.xml
@@ -1,200 +1,172 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="3 seconds" debug="false">
-   <!--<jmxConfigurator /> -->
-   <!-- directory path for all other type logs -->
-   <property name="logDir" value="/var/log/onap" />
-   <property name="componentName" value="AAI-UI" />
-   <property name="logDirectory" value="${logDir}/${componentName}" />
-   <!--  default eelf log file names -->
-   <property name="generalLogName" value="application" />
-   <property name="errorLogName" value="error" />
-   <property name="metricsLogName" value="metrics" />
-   <property name="auditLogName" value="audit" />
-   <property name="debugLogName" value="debug" />
-   <property name="queueSize" value="256" />
-   <property name="maxFileSize" value="50MB" />
-   <property name="maxHistory" value="30" />
-   <property name="totalSizeCap" value="10GB" />
-   <property name="pattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />
+	<!--<jmxConfigurator /> -->
+	<!-- directory path for all other type logs -->
 
-   <!-- Example evaluator filter applied against console appender -->
-   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-      <encoder>
-         <pattern>${pattern}</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}.%i.log</fileNamePattern>
-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-            <maxFileSize>${maxFileSize}</maxFileSize>
-         </timeBasedFileNamingAndTriggeringPolicy>
-         <maxHistory>${maxHistory}</maxHistory>
-         <totalSizeCap>${totalSizeCap}</totalSizeCap>
-      </rollingPolicy>
-      <encoder>
-         <pattern>${pattern}</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>${queueSize}</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}.%i.log</fileNamePattern>
-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-            <maxFileSize>${maxFileSize}</maxFileSize>
-         </timeBasedFileNamingAndTriggeringPolicy>
-         <maxHistory>${maxHistory}</maxHistory>
-         <totalSizeCap>${totalSizeCap}</totalSizeCap>
-      </rollingPolicy>
-      <encoder>
-         <pattern>${pattern}</pattern>
-      </encoder>
-   </appender>
-   <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
-      <queueSize>${queueSize}</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}.%i.log</fileNamePattern>
-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-            <maxFileSize>${maxFileSize}</maxFileSize>
-         </timeBasedFileNamingAndTriggeringPolicy>
-         <maxHistory>${maxHistory}</maxHistory>
-         <totalSizeCap>${totalSizeCap}</totalSizeCap>
-      </rollingPolicy>
-      <encoder>
-         <pattern>${pattern}</pattern>
-      </encoder>
-   </appender>
-   <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
-      <queueSize>${queueSize}</queueSize>
-      <appender-ref ref="EELFMetrics" />
-   </appender>
-   
-      <appender name="EELFError" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <file>${logDirectory}/${errorLogName}.log</file>
-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-         <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-            <maxFileSize>${maxFileSize}</maxFileSize>
-         </timeBasedFileNamingAndTriggeringPolicy>
-         <maxHistory>${maxHistory}</maxHistory>
-         <totalSizeCap>${totalSizeCap}</totalSizeCap>
-      </rollingPolicy>
-      <encoder>
-         <pattern>${pattern}</pattern>
-      </encoder>
-      <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-         <level>INFO</level>
-      </filter>
-   </appender>
-   <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
-      <queueSize>${queueSize}</queueSize>
-      <appender-ref ref="EELFError" />
-   </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}.%i.log</fileNamePattern>
-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-            <maxFileSize>${maxFileSize}</maxFileSize>
-         </timeBasedFileNamingAndTriggeringPolicy>
-         <maxHistory>${maxHistory}</maxHistory>
-         <totalSizeCap>${totalSizeCap}</totalSizeCap>
-      </rollingPolicy>
-      <encoder>
-         <pattern>${pattern}</pattern>
-      </encoder>
-   </appender>
-   <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
-      <queueSize>${queueSize}</queueSize>
-      <appender-ref ref="EELFDebug" />
-      <includeCallerData>false</includeCallerData>
-   </appender>
-   <!-- ============================================================================ -->
-   <!--  EELF loggers -->
-   <!-- ============================================================================ -->
-   <logger name="com.att.eelf" level="INFO" additivity="false" />
-   <logger name="org.elasticsearch.plugins" level="WARN" />
-   <logger name="com.att.eelf.debug" level="debug" additivity="false">
-      <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>
-   <logger name="com.att.eelf.error" level="info" additivity="false">
-      <appender-ref ref="asyncEELFError" />
-   </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" />
-   <!-- AJSC Services (bootstrap services) -->
-   <logger name="ajsc" level="WARN" />
-   <logger name="ajsc.RouteMgmtService" level="WARN" />
-   <logger name="ajsc.ComputeService" level="WARN" />
-   <logger name="ajsc.VandelayService" level="WARN" />
-   <logger name="ajsc.FilePersistenceService" level="WARN" />
-   <logger name="ajsc.UserDefinedJarService" level="WARN" />
-   <logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
-   <logger name="ajsc.LoggingConfigurationService" level="WARN" />
-   <logger name="ajsc.ErrorMessageLookupService" level="WARN" />
-   <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet
-            logging) -->
-   <logger name="ajsc.utils" level="WARN" />
-   <logger name="ajsc.utils.DME2Helper" level="WARN" />
-   <logger name="ajsc.filters" level="WARN" />
-   <logger name="ajsc.beans.interceptors" level="WARN" />
-   <logger name="ajsc.restlet" level="WARN" />
-   <logger name="ajsc.servlet" level="WARN" />
-   <logger name="com.att" level="WARN" />
-   <logger name="com.att.ajsc.csi.logging" level="WARN" />
-   <logger name="com.att.ajsc.filemonitor" level="WARN" />
-   <!-- 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="INFO" />
-   <logger name="ch.qos.logback.core" level="INFO" />
-   <root level="INFO">
-      <appender-ref ref="asyncEELFDebug" />
-   </root>
-</configuration>
\ No newline at end of file
+	<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/portal/portal.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties
similarity index 74%
rename from kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal.properties
rename to kubernetes/aai/charts/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties
index 04a1955..3d4ec09 100644
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal.properties
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties
@@ -1,9 +1,9 @@
-######################################################################################
-############################## eCOMP Portal properties ###############################
-######################################################################################
+################################################################################
+############################## Portal properties ###############################
+################################################################################
 
 # Java class that implements the ECOMP role and user mgt API
-portal.api.impl.class = org.openecomp.sparky.security.portal.PortalRestAPIServiceImpl
+portal.api.impl.class = org.onap.aai.sparky.security.portal.PortalRestAPIServiceImpl
 
 # Instance of ECOMP Portal where the app has been on-boarded
 # use insecure http for dev purposes to avoid self-signed certificate
@@ -20,4 +20,4 @@
 # Toggles use of UEB
 ueb_listeners_enable = false
 # IDs application withing UEB flow
-ueb_app_key = qFKles9N8gDTV0Zc	
+ueb_app_key = qFKles9N8gDTV0Zc
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal-authentication.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal-authentication.properties
index 0873fc1..a0e3308 100644
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal-authentication.properties
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal-authentication.properties
@@ -1,14 +1,14 @@
-##########################################################################################
-############################## eCOMP Portal Auth Properties ##############################
-##########################################################################################
-
-############################## Auth ##############################
-username=aaiui
-password=1t2v1vfv1unz1vgz1t3b
-
-##############################  ##############################
-#
-# ONAP Cookie Processing - During initial development, this flag, if true, will
-# prevent the portal interface's login processing from searching for a user
-# specific cookie, and will instead allow passage if a valid session cookie is discovered.
-onap_enabled=true
\ No newline at end of file
+#####################################################################################
+##############################  Portal Auth Properties ##############################
+#####################################################################################
+
+############################## Auth ##############################
+username={{.Values.config.portalUsername}}
+password={{.Values.config.portalPassword}}
+
+##############################  ##############################
+#
+# ONAP Cookie Processing - During initial development, this flag, if true, will
+# prevent the portal interface's login processing from searching for a user
+# specific cookie, and will instead allow passage if a valid session cookie is discovered.
+onap_enabled={{.Values.config.portalOnapEnabled}}
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/roles.config b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/roles.config
new file mode 100644
index 0000000..b8313bd
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/roles.config
@@ -0,0 +1,6 @@
+[
+  {
+    "id":1,
+    "name":"View"
+  }
+]
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/roles.config b/kubernetes/aai/charts/aai-sparky-be/resources/config/roles.config
index b8313bd..4d5d43e 100644
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/roles.config
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/roles.config
@@ -1,6 +1,6 @@
-[
-  {
-    "id":1,
-    "name":"View"
-  }
+[
+  {
+    "id":1,
+    "name":"View"
+  }
 ]
\ No newline at end of file
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
new file mode 100644
index 0000000..7857617
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/autoSuggestMappings.json
@@ -0,0 +1,10 @@
+{
+	"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
new file mode 100644
index 0000000..4525be1
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/autoSuggestSettings.json
@@ -0,0 +1,21 @@
+{
+        "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
new file mode 100644
index 0000000..09a00ac
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/dynamicMappings.json
@@ -0,0 +1,14 @@
+{
+  "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
new file mode 100644
index 0000000..84e3aec
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/entityCountHistoryMappings.json
@@ -0,0 +1,16 @@
+{
+    "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
new file mode 100644
index 0000000..216e3d9
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/es_mappings.json
@@ -0,0 +1,32 @@
+{
+    "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
new file mode 100644
index 0000000..21a357c
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/schemas/es_settings.json
@@ -0,0 +1,36 @@
+{
+    "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/search-service.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/search-service.properties
deleted file mode 100644
index f280473..0000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/search-service.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-########################################################################################
-############################## Search Data Service Config ##############################
-########################################################################################
-
-############################## Networking ##############################
-#
-# The ip address/hostname and port to the desired Search Data Service instance
-#
-search-service.ipAddress=aai-search-data.{{.Release.Namespace}}
-search-service.httpPort=9509
-
-############################## Indexes ##############################
-#
-# Index values that will be associated with searches
-#
-# Searchable entities
-search-service.indexName=entitysearchindex
-# Inventory searches
-search-service.topographicalIndexName=topographicalsearchindex
-search-service.entityCountHistoryIndexName=entitycounthistoryindex
-
-############################## 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
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-application.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-application.properties
new file mode 100644
index 0000000..b246676
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-application.properties
@@ -0,0 +1,11 @@
+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/
+
+#
+#  attempt to externalize ui JS classes + resources
+#
+spring.resources.static-locations=file:${APP_HOME}/static/
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-http-config.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-http-config.properties
new file mode 100644
index 0000000..f81a597
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-http-config.properties
@@ -0,0 +1 @@
+server.port = 9517
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-ssl-config.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-ssl-config.properties
new file mode 100644
index 0000000..b9e5d16
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/sparky-ssl-config.properties
@@ -0,0 +1,3 @@
+server.port = 8000
+server.ssl.key-store=file:${CONFIG_HOME}/auth/tomcat_keystore
+server.ssl.key-alias=tomcat
\ 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
new file mode 100644
index 0000000..694ea1b
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-aggregateVnfSearchProvider.xml
@@ -0,0 +1,33 @@
+<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
new file mode 100644
index 0000000..8b5f277
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-apigw.xml
@@ -0,0 +1,31 @@
+<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
new file mode 100644
index 0000000..dedd7e2
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-gizmo.xml
@@ -0,0 +1,29 @@
+<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
new file mode 100644
index 0000000..0763f94
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
@@ -0,0 +1,373 @@
+<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_generic-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="entityautosuggestindex" />
+		<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="topographicalsearchindex" />
+		<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="entitysearchindex" />
+		<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
new file mode 100644
index 0000000..c146e6e
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-viewInspect.xml
@@ -0,0 +1,55 @@
+<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
new file mode 100644
index 0000000..072c935
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-viewInspectSearchProvider.xml
@@ -0,0 +1,34 @@
+<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
new file mode 100644
index 0000000..8f5d42d
--- /dev/null
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core.xml
@@ -0,0 +1,241 @@
+<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/resources/config/suggestive-search.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/suggestive-search.properties
deleted file mode 100644
index b82baff..0000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/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/kubernetes/aai/charts/aai-sparky-be/resources/config/synchronizer.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/synchronizer.properties
deleted file mode 100644
index 0b84f06..0000000
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/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/kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml
index d827c4e..1f6ed74 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml
@@ -20,4 +20,53 @@
   name: {{ include "common.fullname" . }}-log
   namespace: {{ include "common.namespace" . }}
 data:
-{{ tpl (.Files.Glob "resources/config/log/logback.xml").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/log/*").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
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/schemas/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-spring-beans
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/spring-beans/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-boot-inf
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/portal/BOOT-INF/classes/*").AsConfig . | indent 2 }}
+
diff --git a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
index 05a808e..424cf11 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
@@ -34,77 +34,62 @@
         release: {{ .Release.Name }}
       name: {{ include "common.name" . }}
     spec:
-      initContainers:
-      - name: {{ include "common.name" . }}-inject-models
-        command:
-        - /bin/bash
-        - "-c"
-        - |
-          git clone -b {{ .Values.config.gerritBranch }} --single-branch {{ .Values.config.gerritProject }} /tmp/gerrit
-          cp -rp /tmp/gerrit/data-router/appconfig/model/* /model-dir
-        image: "{{ .Values.global.repository | default .Values.dockerHubRepository }}/{{ .Values.ubuntuInitImage }}"
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        volumeMounts:
-        - name: modeldir
-          mountPath: "/model-dir"
       containers:
       - name: {{ include "common.name" . }}
         image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: CONFIG_HOME
-          value: /opt/app/sparky/config/
-        - name: KEY_MANAGER_PASSWORD
-          value: {{ .Values.config.keyManagerPassword }}
-        - name: KEY_STORE_PASSWORD
+          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: 'true'
+        - name: SPARKY_PORTAL_ENABLED
+          value: 'false'
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /opt/app/sparky/config/auth/
+        - mountPath: /opt/app/sparky/appconfig/auth/
           name: {{ include "common.fullname" . }}-auth-config
-        - mountPath: /opt/app/sparky/config/synchronizer.properties
-          subPath: synchronizer.properties
+        - 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/config/suggestive-search.properties
-          subPath: suggestive-search.properties
-          name: {{ include "common.fullname" . }}-config
-        - mountPath: /opt/app/sparky/config/search-service.properties
-          subPath: search-service.properties
-          name: {{ include "common.fullname" . }}-config
-        - mountPath: /opt/app/sparky/config/roles.config
-          subPath: roles.config
-          name: {{ include "common.fullname" . }}-config
-        - mountPath: /opt/app/sparky/config/elasticsearch.properties
-          subPath: elasticsearch.properties
-          name: {{ include "common.fullname" . }}-config
-        - mountPath: /opt/app/sparky/config/aai.properties
-          subPath: aai.properties
-          name: {{ include "common.fullname" . }}-config
-        - mountPath: /opt/app/sparky/config/portal/
+        - mountPath: /opt/app/sparky/appconfig/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: /var/log/onap
           name: {{ include "common.fullname" . }}-logs
-        - mountPath: /opt/app/sparky/bundleconfig/etc/logback.xml
+        - mountPath: /opt/app/sparky/appconfig/logging/
           name: {{ include "common.fullname" . }}-log-conf
-          subPath: logback.xml
-        - name: modeldir
-          mountPath: /opt/app/sparky/config/model
         ports:
         - containerPort: {{ .Values.service.internalPort }}
+        - containerPort: {{ .Values.service.internalPort2 }}
         # disable liveness probe when breakpoints set in debugger
         # so K8s doesn't restart unresponsive container
         {{- if eq .Values.liveness.enabled true }}
         livenessProbe:
           tcpSocket:
-            port: {{ .Values.service.internalPort }}
+            port: {{ .Values.service.internalPort2 }}
           initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{ end -}}
         readinessProbe:
           tcpSocket:
-            port: {{ .Values.service.internalPort }}
+            port: {{ .Values.service.internalPort2 }}
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
         resources:
@@ -138,12 +123,30 @@
       - name: {{ include "common.fullname" . }}-config
         configMap:
           name: {{ include "common.fullname" . }}
-      - name: {{ include "common.fullname" . }}-portal-config
-        configMap:
-          name: {{ include "common.fullname" . }}-portal
       - 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
+        configMap:
+          name: {{ include "common.fullname" . }}-spring-beans
       - name: filebeat-conf
         configMap:
           name: aai-filebeat
@@ -153,9 +156,7 @@
         emptyDir: {}
       - name: {{ include "common.fullname" . }}-log-conf
         configMap:
-         name: {{ include "common.fullname" . }}-log
-      - name: modeldir
-        emptyDir: {}
+          name: {{ include "common.fullname" . }}-log
       restartPolicy: {{ .Values.global.restartPolicy | default .Values.restartPolicy }}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aai/charts/aai-sparky-be/templates/service.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/service.yaml
index 41bc163..e97935a 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/service.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "common.name" . }}
+  name: {{ include "common.servicename" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
diff --git a/kubernetes/aai/charts/aai-sparky-be/values.yaml b/kubernetes/aai/charts/aai-sparky-be/values.yaml
index df058a4..5c97bdb 100644
--- a/kubernetes/aai/charts/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/values.yaml
@@ -4,11 +4,18 @@
 global: # global defaults
   nodePortPrefix: 302
   repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
-
+  aai:
+    serviceName: aai-aai
+  aaiElasticsearch:
+    serviceName: aai-elasticsearch
+  gizmo:
+    serviceName: aai-gizmo
+  searchData:
+    serviceName: aai-search-data
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sparky-be:v1.1.0
+image: onap/sparky-be:1.2-STAGING-latest
 pullPolicy: Always
 restartPolicy: Always
 
@@ -18,10 +25,17 @@
 config:
   elasticsearchHttpPort: 9200
   keyStorePassword: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-  keyManagerPassword: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
+  keystoreAliasPassword: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
   gerritBranch: master
   gerritProject: http://gerrit.onap.org/r/aai/test-config
+  portalUsername: aaiui
+  portalPassword: 1t2v1vfv1unz1vgz1t3b
 
+# ONAP Cookie Processing - During initial development, the following flag, if true, will
+# prevent the portal interface's login processing from searching for a user
+# specific cookie, and will instead allow passage if a valid session cookie is discovered.
+  portalOnapEnabled: true
+#
 
 # override chart name (sparky-be) to share a common namespace
 # suffix with parent chart (aai)
@@ -51,6 +65,7 @@
   type: ClusterIP
   name: aai-sparky-be
   internalPort: 9517
+  internalPort2: 8000
 
 ingress:
   enabled: false