diff options
46 files changed, 972 insertions, 402 deletions
diff --git a/sparky/appconfig/auth/csp-cookie-filter.properties b/sparky/appconfig/auth/csp-cookie-filter.properties new file mode 100644 index 0000000..2315b9f --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/auth/inventory-ui-keystore b/sparky/appconfig/auth/inventory-ui-keystore Binary files differindex efa01f8..3319e63 100644 --- a/sparky/appconfig/auth/inventory-ui-keystore +++ b/sparky/appconfig/auth/inventory-ui-keystore diff --git a/sparky/appconfig/camel-rests/sparky-core-filter-aggregation.xml b/sparky/appconfig/camel-rests/sparky-core-filter-aggregation.xml new file mode 100644 index 0000000..e4e02ba --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/camel-rests/sparky-core-prepareSchema.xml b/sparky/appconfig/camel-rests/sparky-core-prepareSchema.xml new file mode 100644 index 0000000..20dba6f --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/camel-rests/sparky-core-subscriptionService.xml b/sparky/appconfig/camel-rests/sparky-core-subscriptionService.xml new file mode 100644 index 0000000..f6a2953 --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/camel-rests/sparky-core-unified-search.xml b/sparky/appconfig/camel-rests/sparky-core-unified-search.xml new file mode 100644 index 0000000..61fd9ad --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/camel-rests/sparky-core-unifiedFilterRequest.xml b/sparky/appconfig/camel-rests/sparky-core-unifiedFilterRequest.xml new file mode 100644 index 0000000..1b975e9 --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/descriptors/aaiEntityNodeDescriptors.json b/sparky/appconfig/descriptors/aaiEntityNodeDescriptors.json new file mode 100644 index 0000000..e72bab0 --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/filters/aaiui_views.json b/sparky/appconfig/filters/aaiui_views.json index 987637b..9ca0119 100644 --- a/sparky/appconfig/filters/aaiui_views.json +++ b/sparky/appconfig/filters/aaiui_views.json @@ -18,4 +18,4 @@ ] } ] -} +}
\ No newline at end of file diff --git a/sparky/appconfig/filters/subscription_object_inspector_mapping.json b/sparky/appconfig/filters/subscription_object_inspector_mapping.json index 858bc3f..ad2ab7a 100644 --- a/sparky/appconfig/filters/subscription_object_inspector_mapping.json +++ b/sparky/appconfig/filters/subscription_object_inspector_mapping.json @@ -13,4 +13,4 @@ } } } -}
\ No newline at end of file +} diff --git a/sparky/appconfig/logging/logback.xml b/sparky/appconfig/logging/logback.xml new file mode 100644 index 0000000..68b9451 --- /dev/null +++ b/sparky/appconfig/logging/logback.xml @@ -0,0 +1,172 @@ +<configuration scan="true" scanPeriod="3 seconds" debug="false"> + <!--<jmxConfigurator /> --> + <!-- directory path for all other type logs --> + + <property name="logDir" value="${APP_HOME}/logs" /> + + <!-- <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>
\ No newline at end of file diff --git a/sparky/appconfig/portal/portal-authentication.properties b/sparky/appconfig/portal/portal-authentication.properties index d87e34a..358ff89 100644 --- a/sparky/appconfig/portal/portal-authentication.properties +++ b/sparky/appconfig/portal/portal-authentication.properties @@ -1,6 +1,6 @@ -##########################################################################################
-############################## eCOMP Portal Auth Properties ##############################
-##########################################################################################
+#####################################################################################
+############################## Portal Auth Properties ##############################
+#####################################################################################
############################## Auth ##############################
username=aaiui
@@ -11,4 +11,4 @@ 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 +onap_enabled=true
diff --git a/sparky/appconfig/portal/portal.properties b/sparky/appconfig/portal/portal.properties index 4efa0aa..3b947c4 100644 --- a/sparky/appconfig/portal/portal.properties +++ b/sparky/appconfig/portal/portal.properties @@ -1,6 +1,6 @@ -######################################################################################
-############################## eCOMP Portal properties ###############################
-######################################################################################
+################################################################################
+############################## Portal properties ###############################
+################################################################################
# Java class that implements the ECOMP role and user mgt API
portal.api.impl.class = org.onap.aai.sparky.security.portal.PortalRestAPIServiceImpl
@@ -20,4 +20,4 @@ csp_gate_keeper_prod_key = PROD # Toggles use of UEB
ueb_listeners_enable = false
# IDs application withing UEB flow
-ueb_app_key = qFKles9N8gDTV0Zc
+ueb_app_key = qFKles9N8gDTV0Zc
\ No newline at end of file diff --git a/sparky/appconfig/portal/roles.config b/sparky/appconfig/portal/roles.config new file mode 100644 index 0000000..b8313bd --- /dev/null +++ b/sparky/appconfig/portal/roles.config @@ -0,0 +1,6 @@ +[ + { + "id":1, + "name":"View" + } +]
\ No newline at end of file diff --git a/sparky/appconfig/schemas/autoSuggestMappings.json b/sparky/appconfig/schemas/autoSuggestMappings.json new file mode 100644 index 0000000..7857617 --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/schemas/autoSuggestSettings.json b/sparky/appconfig/schemas/autoSuggestSettings.json new file mode 100644 index 0000000..4525be1 --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/schemas/dynamicMappings.json b/sparky/appconfig/schemas/dynamicMappings.json new file mode 100644 index 0000000..09a00ac --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/schemas/entityCountHistoryMappings.json b/sparky/appconfig/schemas/entityCountHistoryMappings.json new file mode 100644 index 0000000..84e3aec --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/schemas/es_mappings.json b/sparky/appconfig/schemas/es_mappings.json new file mode 100644 index 0000000..216e3d9 --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/schemas/es_settings.json b/sparky/appconfig/schemas/es_settings.json new file mode 100644 index 0000000..21a357c --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/sparky-application.properties b/sparky/appconfig/sparky-application.properties new file mode 100644 index 0000000..b246676 --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/sparky-http-config.properties b/sparky/appconfig/sparky-http-config.properties new file mode 100644 index 0000000..f81a597 --- /dev/null +++ b/sparky/appconfig/sparky-http-config.properties @@ -0,0 +1 @@ +server.port = 9517
\ No newline at end of file diff --git a/sparky/appconfig/sparky-ssl-config.properties b/sparky/appconfig/sparky-ssl-config.properties new file mode 100644 index 0000000..2c28336 --- /dev/null +++ b/sparky/appconfig/sparky-ssl-config.properties @@ -0,0 +1,3 @@ +server.port = 8000 +server.ssl.key-store=file:${CONFIG_HOME}/auth/inventory-ui-keystore +server.ssl.key-alias=1
\ No newline at end of file diff --git a/sparky/appconfig/spring-beans/sparky-core-aggregateVnfSearchProvider.xml b/sparky/appconfig/spring-beans/sparky-core-aggregateVnfSearchProvider.xml new file mode 100644 index 0000000..92c4c7b --- /dev/null +++ b/sparky/appconfig/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/sparky/dynamic/conf/sparky-core-apigw.xml b/sparky/appconfig/spring-beans/sparky-core-apigw.xml index b8cbfdb..8b5f277 100644 --- a/sparky/dynamic/conf/sparky-core-apigw.xml +++ b/sparky/appconfig/spring-beans/sparky-core-apigw.xml @@ -11,11 +11,13 @@ <property name="restAuthenticationMode" value="SSL_CERT" /> <property name="connectTimeoutInMs" value="60000" /> <property name="readTimeoutInMs" value="30000" /> - <property name="certFileName" value="client-cert-onap.p12" /> + <property name="certFileName" value="/auth/client-cert-onap.p12" /> <property name="certPassword" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10" /> - <property name="truststoreFileName" value="tomcat_keystore" /> + <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" diff --git a/sparky/appconfig/spring-beans/sparky-core-gizmo.xml b/sparky/appconfig/spring-beans/sparky-core-gizmo.xml new file mode 100644 index 0000000..b32c625 --- /dev/null +++ b/sparky/appconfig/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="aai.gizmo.simpledemo.openecomp.org" /> + <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/sparky/dynamic/conf/sparky-core-sync.xml b/sparky/appconfig/spring-beans/sparky-core-sync.xml index 4c172b7..09b13fd 100644 --- a/sparky/dynamic/conf/sparky-core-sync.xml +++ b/sparky/appconfig/spring-beans/sparky-core-sync.xml @@ -4,6 +4,11 @@ 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="aai.elasticsearch.simpledemo.openecomp.org" /> <property name="endpointServerPort" value="9200" /> @@ -74,9 +79,10 @@ <property name="readTimeoutInMs" value="30000" /> <property name="basicAuthUserName" value="AaiUI" /> <property name="basicAuthPassword" value="OBF:1gfr1p571unz1p4j1gg7" /> - <property name="truststoreFileName" value="synchronizer.jks" /> + <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"> @@ -118,6 +124,7 @@ <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" /> @@ -127,17 +134,17 @@ <property name="aggregationEntityToIndexMap"> <map> - <entry key="generic-vnf" value="aggegation_generic_vnf_index" /> + <entry key="generic-vnf" value="aggregate_generic-vnf_index" /> </map> </property> <property name="indexNameToSchemaConfigMap"> <map> - <entry key="aggegation_generic_vnf_index"> + <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="/etc/dynamicMappings.json" /> + <property name="indexMappingsFileName" value="/schemas/dynamicMappings.json" /> </bean> </entry> </map> @@ -164,8 +171,8 @@ <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="/etc/entityCountHistoryMappings.json" /> - <property name="indexSettingsFileName" value="/etc/es_settings.json" /> + <property name="indexMappingsFileName" value="/schemas/entityCountHistoryMappings.json" /> + <property name="indexSettingsFileName" value="/schemas/es_settings.json" /> </bean> <bean id="historicalEntitySyncController" @@ -181,6 +188,7 @@ <constructor-arg ref="aaiNetworkStatConfig" /> <constructor-arg ref="elasticSearchNetworkStatConfig" /> <constructor-arg ref="searchableEntityLookup" /> + <constructor-arg ref="elasticSearchSchemaFactory" /> <property name="syncControllerRegistry" ref="syncControllerRegistry" /> @@ -206,8 +214,8 @@ <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="/etc/autoSuggestMappings.json" /> - <property name="indexSettingsFileName" value="/etc/autoSuggestSettings.json" /> + <property name="indexMappingsFileName" value="/schemas/autoSuggestMappings.json" /> + <property name="indexSettingsFileName" value="/schemas/autoSuggestSettings.json" /> </bean> <bean id="autoSuggestionEntitySyncController" @@ -224,6 +232,7 @@ <constructor-arg ref="oxmEntityLookup" /> <constructor-arg ref="suggestionEntityLookup" /> <constructor-arg ref="filtersConfig" /> + <constructor-arg ref="elasticSearchSchemaFactory" /> <property name="syncControllerRegistry" ref="syncControllerRegistry" /> @@ -249,8 +258,8 @@ <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="/etc/autoSuggestMappings.json" /> - <property name="indexSettingsFileName" value="/etc/autoSuggestSettings.json" /> + <property name="indexMappingsFileName" value="/schemas/autoSuggestMappings.json" /> + <property name="indexSettingsFileName" value="/schemas/autoSuggestSettings.json" /> </bean> <bean id="vnfAliasSyncController" @@ -265,6 +274,7 @@ <constructor-arg ref="aaiNetworkStatConfig" /> <constructor-arg ref="elasticSearchNetworkStatConfig" /> <constructor-arg ref="filtersConfig" /> + <constructor-arg ref="elasticSearchSchemaFactory" /> <property name="syncControllerRegistry" ref="syncControllerRegistry" /> @@ -288,7 +298,7 @@ <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="/etc/dynamicMappings.json" /> + <property name="indexMappingsFileName" value="/schemas/dynamicMappings.json" /> </bean> <bean id="geoSyncController" @@ -304,6 +314,7 @@ <constructor-arg ref="elasticSearchNetworkStatConfig" /> <constructor-arg ref="geoEntityLookup" /> <constructor-arg ref="oxmEntityLookup" /> + <constructor-arg ref="elasticSearchSchemaFactory" /> <property name="syncControllerRegistry" ref="syncControllerRegistry" /> @@ -327,8 +338,8 @@ <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="/etc/es_mappings.json" /> - <property name="indexSettingsFileName" value="/etc/es_settings.json" /> + <property name="indexMappingsFileName" value="/schemas/es_mappings.json" /> + <property name="indexSettingsFileName" value="/schemas/es_settings.json" /> </bean> @@ -346,6 +357,7 @@ <constructor-arg ref="crossEntityReferenceLookup" /> <constructor-arg ref="oxmEntityLookup" /> <constructor-arg ref="searchableEntityLookup" /> + <constructor-arg ref="elasticSearchSchemaFactory" /> <property name="syncControllerRegistry" ref="syncControllerRegistry" /> diff --git a/sparky/dynamic/conf/sparky-core-viewInspect.xml b/sparky/appconfig/spring-beans/sparky-core-viewInspect.xml index 569b418..c146e6e 100644 --- a/sparky/dynamic/conf/sparky-core-viewInspect.xml +++ b/sparky/appconfig/spring-beans/sparky-core-viewInspect.xml @@ -8,14 +8,14 @@ class="org.onap.aai.sparky.viewandinspect.config.VisualizationConfigs"> <property name="maxSelfLinkTraversalDepth" value="2" /> <property name="visualizationDebugEnabled" value="false" /> - <property name="aaiEntityNodeDescriptors" value="/etc/aaiEntityNodeDescriptors.json" /> + <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"> @@ -36,13 +36,13 @@ <bean id="baseVisualizationService" class="org.onap.aai.sparky.viewandinspect.services.BaseVisualizationService"> <constructor-arg ref="oxmModelLoader"/> - <constructor-arg ref="visualizationConfigurations"/> + <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="5" /> + <constructor-arg name="numActiveInventoryWorkers" value="50" /> <constructor-arg ref="oxmEntityLookup" /> <constructor-arg ref="subscriptionConfig" /> </bean> @@ -52,4 +52,4 @@ <property name="visualizationService" ref="baseVisualizationService" /> </bean> -</beans> +</beans> diff --git a/sparky/appconfig/spring-beans/sparky-core-viewInspectSearchProvider.xml b/sparky/appconfig/spring-beans/sparky-core-viewInspectSearchProvider.xml new file mode 100644 index 0000000..072c935 --- /dev/null +++ b/sparky/appconfig/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/sparky/appconfig/spring-beans/sparky-core.xml b/sparky/appconfig/spring-beans/sparky-core.xml new file mode 100644 index 0000000..7e9bb27 --- /dev/null +++ b/sparky/appconfig/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="aai.search.simpledemo.openecomp.org" /> + <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/sparky/dynamic/conf/sparky-core-aggregateVnfSearchProvider.xml b/sparky/dynamic/conf/sparky-core-aggregateVnfSearchProvider.xml deleted file mode 100644 index c176dcd..0000000 --- a/sparky/dynamic/conf/sparky-core-aggregateVnfSearchProvider.xml +++ /dev/null @@ -1,34 +0,0 @@ -<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="elasticSearchAdapter"/> - <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/sparky/dynamic/conf/sparky-core-gizmo.xml b/sparky/dynamic/conf/sparky-core-gizmo.xml deleted file mode 100644 index 52fd436..0000000 --- a/sparky/dynamic/conf/sparky-core-gizmo.xml +++ /dev/null @@ -1,28 +0,0 @@ -<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="aai.gizmo.simpledemo.openecomp.org" /> - <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="client-cert-onap.p12" /> - <property name="certPassword" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10" /> - <property name="truststoreFileName" value="tomcat_keystore" /> - <property name="validateServerCertChain" value="false" /> - <property name="validateServerHostname" value="false" /> - </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/v12/" /> - <property name="inventoryBasePath" value="/services/inventory/v12/" /> - </bean> - -</beans> diff --git a/sparky/dynamic/conf/sparky-core-viewInspectSearchProvider.xml b/sparky/dynamic/conf/sparky-core-viewInspectSearchProvider.xml deleted file mode 100644 index 44a7a8f..0000000 --- a/sparky/dynamic/conf/sparky-core-viewInspectSearchProvider.xml +++ /dev/null @@ -1,34 +0,0 @@ -<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/sparky/dynamic/conf/sparky-core.xml b/sparky/dynamic/conf/sparky-core.xml deleted file mode 100644 index 473d967..0000000 --- a/sparky/dynamic/conf/sparky-core.xml +++ /dev/null @@ -1,227 +0,0 @@ -<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="aai.searchservice.simpledemo.openecomp.org" /> - <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="client-cert-onap.p12" /> - <property name="certPassword" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10" /> - <property name="truststoreFileName" value="tomcat_keystore" /> - <property name="validateServerCertChain" value="false" /> - <property name="validateServerHostname" value="false" /> - </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"/> - - <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="11" /> - <constructor-arg ref="oxmModelProcessorSet" /> - </bean> - - <bean id="searchProviderRegistry" - class="org.onap.aai.sparky.search.registry.SearchProviderRegistry" /> - - <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="" /> - </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/sparky/dynamic/routes/sparky-core-apigw.route b/sparky/dynamic/routes/sparky-core-apigw.route deleted file mode 100644 index 2552920..0000000 --- a/sparky/dynamic/routes/sparky-core-apigw.route +++ /dev/null @@ -1,4 +0,0 @@ -<route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="servlet:/routerService?matchOnUriPrefix=true" /> - <to uri="bean:aaiuiProxyProcessor?method=proxyMessage"/> -</route>
\ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-attributeEditRequest.route b/sparky/dynamic/routes/sparky-core-attributeEditRequest.route deleted file mode 100644 index b395f80..0000000 --- a/sparky/dynamic/routes/sparky-core-attributeEditRequest.route +++ /dev/null @@ -1,4 +0,0 @@ -<route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="restlet:/editEntity?restletMethods=get,post" /> - <to uri="bean:attributeEditProcessor?method=editAttribute"/> -</route>
\ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-entityCountHistory.route b/sparky/dynamic/routes/sparky-core-entityCountHistory.route deleted file mode 100644 index 2505d78..0000000 --- a/sparky/dynamic/routes/sparky-core-entityCountHistory.route +++ /dev/null @@ -1,4 +0,0 @@ -<route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="restlet:/visualization/entityCountHistory?restletMethods=get,post" /> - <to uri="bean:entityCountHistoryProcessor?method=process" /> -</route>
\ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-filter-aggregation.route b/sparky/dynamic/routes/sparky-core-filter-aggregation.route deleted file mode 100644 index 38e2735..0000000 --- a/sparky/dynamic/routes/sparky-core-filter-aggregation.route +++ /dev/null @@ -1,4 +0,0 @@ -<route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="restlet:/search/filterAggregation?restletMethods=get,post" /> - <to uri="bean:aggregateSummaryProcessor?method=getFilteredAggregation"/> -</route>
\ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-prepareGeoVisualization.route b/sparky/dynamic/routes/sparky-core-prepareGeoVisualization.route deleted file mode 100644 index 072bd34..0000000 --- a/sparky/dynamic/routes/sparky-core-prepareGeoVisualization.route +++ /dev/null @@ -1,4 +0,0 @@ -<route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="restlet:/search/visualization/geovisualization?restletMethods=get,post" /> - <to uri="bean:geoVisualizationProcessor?method=getGeoVisualizationResults"/> -</route>
\ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-prepareSchema.route b/sparky/dynamic/routes/sparky-core-prepareSchema.route deleted file mode 100644 index 0d31bfb..0000000 --- a/sparky/dynamic/routes/sparky-core-prepareSchema.route +++ /dev/null @@ -1,4 +0,0 @@ -<route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="restlet:/visualization/prepareVisualization?restletMethods=get,post" /> - <to uri="bean:schemaVisualizationProcessor?method=processVisualizationRequest"/> -</route> diff --git a/sparky/dynamic/routes/sparky-core-subscriptionService.route b/sparky/dynamic/routes/sparky-core-subscriptionService.route deleted file mode 100644 index d0c78e6..0000000 --- a/sparky/dynamic/routes/sparky-core-subscriptionService.route +++ /dev/null @@ -1,4 +0,0 @@ -<route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="restlet:/subscription/getsubscription?restletMethods=get,post" /> - <to uri="bean:subscriptionServiceProcessor?method=getSubscription"/> -</route>
\ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-summaryByEntityType.route b/sparky/dynamic/routes/sparky-core-summaryByEntityType.route deleted file mode 100644 index 627469f..0000000 --- a/sparky/dynamic/routes/sparky-core-summaryByEntityType.route +++ /dev/null @@ -1,4 +0,0 @@ -<route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="restlet:/search/summarybyentitytype?restletMethods=get,post" /> - <to uri="bean:aggregateSummaryProcessor?method=getSummaryByEntityType"/> -</route>
\ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-summaryByEntityTypeCount.route b/sparky/dynamic/routes/sparky-core-summaryByEntityTypeCount.route deleted file mode 100644 index bf43bcc..0000000 --- a/sparky/dynamic/routes/sparky-core-summaryByEntityTypeCount.route +++ /dev/null @@ -1,4 +0,0 @@ -<route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="restlet:/search/summarybyentitytype/count?restletMethods=get,post" /> - <to uri="bean:aggregateSummaryProcessor?method=getEntityTypeAggregationCount"/> -</route>
\ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-ui.route b/sparky/dynamic/routes/sparky-core-ui.route deleted file mode 100644 index bf221c6..0000000 --- a/sparky/dynamic/routes/sparky-core-ui.route +++ /dev/null @@ -1,4 +0,0 @@ -<route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="att-dme2-servlet:/aai/webapp/?matchOnUriPrefix=true" /> - <to uri="att-static-content://{{AJSC_HOME}}/staticContent/aai/webapp" /> -</route>
\ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-unified-search.route b/sparky/dynamic/routes/sparky-core-unified-search.route deleted file mode 100644 index 1e20d00..0000000 --- a/sparky/dynamic/routes/sparky-core-unified-search.route +++ /dev/null @@ -1,5 +0,0 @@ -<route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="restlet:/search/querysearch?restletMethods=get,post" /> - <from uri="restlet:/search/querysearch/?restletMethods=get,post" /> - <to uri="bean:unifiedSearchProcessor?method=search"/> -</route>
\ No newline at end of file diff --git a/sparky/dynamic/routes/sparky-core-unifiedFilterRequest.route b/sparky/dynamic/routes/sparky-core-unifiedFilterRequest.route deleted file mode 100644 index 36cf518..0000000 --- a/sparky/dynamic/routes/sparky-core-unifiedFilterRequest.route +++ /dev/null @@ -1,4 +0,0 @@ -<route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="restlet:/search/unifiedFilterRequest?restletMethods=get,post" /> - <to uri="bean:filterProcessor?method=getFiltersWithValues"/> -</route>
\ No newline at end of file |