Updated AAI to latest images - sparky

- sparky configuration files are separated from image,
and are in the aai/test-config project.
AAI and OOM teams agreed that minimal configuration
will be added to the image eventually, but until then all files are mapped.
- a change in logback.xml was made to match the logback for
aai/test-config project file for search-data, in order to get the pod up and
running with minimal changes to app files.

Issue-ID: OOM-947

Change-Id: Ife863ccd50615f40c21a9c72e666d4ab14c6011e
Signed-off-by: Keren Joseph <keren.joseph@amdocs.com>
Signed-off-by: Karen Joseph <keren.joseph@amdocs.com>
Signed-off-by: Keren Joseph <keren.joseph@amdocs.com>

7 files changed, 796 insertions, 0 deletions

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 0000000000..694ea1bf0f
--- /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 0000000000..8b5f27727d
--- /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 0000000000..dedd7e2d16
--- /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 0000000000..0763f94cd1
--- /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 0000000000..c146e6ef2b
--- /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 0000000000..072c935574
--- /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 0000000000..8f5d42d25a
--- /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>