summaryrefslogtreecommitdiffstats
path: root/sparkybe-onap-application/config
diff options
context:
space:
mode:
authorda490c <dave.adams@amdocs.com>2018-08-25 02:19:05 -0400
committerda490c <dave.adams@amdocs.com>2018-08-25 02:19:12 -0400
commitb889beb825c82c38d96b74bed2d6c98cb4e0cb53 (patch)
treea26d6148e5d894e81b5e4257af2281fbbacc7d8d /sparkybe-onap-application/config
parent70bc6523efb4736362497ee32d37fa29f0aa50f7 (diff)
implemented sparky graph extensibility
Add additional interface abstraction points to make it easier to extend and customize the graph logic, and made it easier to interwork with resources and gizmo via spring-bean wiring changes only. Issue-ID: AAI-1503 Change-Id: I5a3dcc81ecc49db89d71f0db27cffbb04c89fbd1 Signed-off-by: da490c <dave.adams@amdocs.com>
Diffstat (limited to 'sparkybe-onap-application/config')
-rw-r--r--sparkybe-onap-application/config/application-gizmo.properties6
-rw-r--r--sparkybe-onap-application/config/application.properties14
-rw-r--r--sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml27
-rw-r--r--sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml28
4 files changed, 44 insertions, 31 deletions
diff --git a/sparkybe-onap-application/config/application-gizmo.properties b/sparkybe-onap-application/config/application-gizmo.properties
index 69750c7..cd01a73 100644
--- a/sparkybe-onap-application/config/application-gizmo.properties
+++ b/sparkybe-onap-application/config/application-gizmo.properties
@@ -1,8 +1,8 @@
gizmo.hostname=127.0.0.1
-gizmo.port=9520
+gizmo.port=30266
gizmo.authType=SSL_CERT
gizmo.client-cert=client-cert-onap.p12
gizmo.client-cert-password=1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
gizmo.trust-store=tomcat_keystore
-gizmo.apiVersion=v12
-gizmo.maxSelfLinkTraversalDepth=2
+gizmo.apiVersion=v13
+gizmo.maxSelfLinkTraversalDepth=10
diff --git a/sparkybe-onap-application/config/application.properties b/sparkybe-onap-application/config/application.properties
index 4c6b1c0..8dbb190 100644
--- a/sparkybe-onap-application/config/application.properties
+++ b/sparkybe-onap-application/config/application.properties
@@ -5,10 +5,20 @@ spring.mvc.favicon.enabled=false
#possible values: camel,http,ssl,portal,fe-dev,fe-prod,oxm-default,oxm-override,[resources|gizmo],sync,oxm-schema-dev,oxm-schema-prod
#For oxm loading there needs to be a combo of [oxm-default OR oxm-override] AND [oxm-schema-dev OR oxm-schema-prod]
-spring.profiles.active=camel,ssl,fe-dev,oxm-schema-dev,resources,sync,oxm-override
+
+#
+# Gizmo profile
+#
+spring.profiles.active=camel,http,fe-dev,oxm-schema-dev,gizmo,oxm-override
+
+#
+# Resources profile
+#
+#spring.profiles.active=camel,http,fe-dev,oxm-schema-dev,resources,sync,oxm-override
+
searchservice.hostname=127.0.0.1
-searchservice.port=9502
+searchservice.port=30262
searchservice.client-cert=client-cert-onap.p12
searchservice.client-cert-password=1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
searchservice.truststore=tomcat_keystore
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml b/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml
index 9afd8a3..17cfc38 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml
@@ -14,7 +14,6 @@
<property name="selectedSearchedNodeClassName" value="selectedSearchedNodeClass" />
<property name="numOfThreadsToFetchNodeIntegrity" value="20" />
<property name="makeAllNeighborsBidirectional" value="false" />
- <property name="gizmoEnabled" value="true" />
<property name="resourceLoader" ref="sparkyResourceLoader" />
<property name="shallowEntities">
@@ -39,20 +38,24 @@
<property name="indexDocType" value="default" />
<property name="indexMappingsFileName" value="/schemas/es_mappings.json" />
<property name="indexSettingsFileName" value="/schemas/es_settings.json" />
- </bean>
+ </bean>
+
+ <bean id="gizmoVisualizationContextBuilder"
+ class="org.onap.aai.sparky.viewandinspect.context.BaseGizmoVisualizationContextBuilder">
+ <constructor-arg name="gizmoAdapter" ref="gizmoAdapter" />
+ <constructor-arg name="numWorkers" value="50" />
+ <constructor-arg name="visualizationConfig" ref="visualizationConfigurations" />
+ <constructor-arg name="oxmEntityType" ref="oxmEntityLookup" />
+ </bean>
<bean id="baseVisualizationService"
class="org.onap.aai.sparky.viewandinspect.services.BaseVisualizationService">
- <constructor-arg ref="oxmModelLoader" />
- <constructor-arg ref="visualizationConfigurations" />
- <constructor-arg name="aaiAdapter"><null/></constructor-arg>
- <constructor-arg ref="gizmoAdapter" />
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
- <constructor-arg ref="viewInspectSchemaConfig" />
- <constructor-arg name="numActiveInventoryWorkers" value="50" />
- <constructor-arg ref="oxmEntityLookup" />
- <constructor-arg ref="subscriptionConfig" />
+ <constructor-arg name="contextBuilder" ref="gizmoVisualizationContextBuilder" />
+ <constructor-arg name="visualizationConfigs" ref="visualizationConfigurations" />
+ <constructor-arg name="searchServiceAdapter" ref="searchServiceAdapter" />
+ <constructor-arg name="endpointConfig" ref="searchServiceRestEndpointConfig" />
+ <constructor-arg name="schemaConfig" ref="viewInspectSchemaConfig" />
+ <constructor-arg name="subscriptionConfig" ref="subscriptionConfig" />
</bean>
<bean id="schemaVisualizationProcessor"
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml b/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml
index b0d5471..6869b70 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml
@@ -14,7 +14,6 @@
<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">
@@ -41,21 +40,22 @@
<property name="indexSettingsFileName" value="/schemas/es_settings.json" />
</bean>
+ <bean id="resourcesVisualizationContextBuilder"
+ class="org.onap.aai.sparky.viewandinspect.context.BaseVisualizationContextBuilder">
+ <constructor-arg name="activeInventoryAdapter" ref="activeInventoryAdapter" />
+ <constructor-arg name="numWorkers" value="50" />
+ <constructor-arg name="visualizationConfig" ref="visualizationConfigurations" />
+ <constructor-arg name="oxmEntityType" ref="oxmEntityLookup" />
+ </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 name="gizmoAdapter">
- <null />
- </constructor-arg>
- <constructor-arg ref="searchServiceAdapter" />
- <constructor-arg ref="searchServiceRestEndpointConfig" />
- <constructor-arg ref="viewInspectSchemaConfig" />
- <constructor-arg name="numActiveInventoryWorkers"
- value="50" />
- <constructor-arg ref="oxmEntityLookup" />
- <constructor-arg ref="subscriptionConfig" />
+ <constructor-arg name="contextBuilder" ref="resourcesVisualizationContextBuilder" />
+ <constructor-arg name="visualizationConfigs" ref="visualizationConfigurations" />
+ <constructor-arg name="searchServiceAdapter" ref="searchServiceAdapter" />
+ <constructor-arg name="endpointConfig" ref="searchServiceRestEndpointConfig" />
+ <constructor-arg name="schemaConfig" ref="viewInspectSchemaConfig" />
+ <constructor-arg name="subscriptionConfig" ref="subscriptionConfig" />
</bean>
<bean id="schemaVisualizationProcessor"