From cd5da806dad48bfabd2de5ae56018483dab6106f Mon Sep 17 00:00:00 2001 From: Piotr Darosz Date: Mon, 8 Apr 2019 14:35:40 +0200 Subject: Refactor hardcoded column config Move hardcoded GAB columns configuration to configuration.yaml file Change-Id: Ie70a1d44c9a04a37c3ba0d3b5f64ad2989b11166 Issue-ID: SDC-2225 Signed-off-by: Piotr Darosz --- .../templates/default/BE-configuration.yaml.erb | 16 ++++++++++++++++ .../org/openecomp/sdc/be/servlets/ElementServlet.java | 2 ++ catalog-be/src/main/resources/config/configuration.yaml | 16 ++++++++++++++++ 3 files changed, 34 insertions(+) (limited to 'catalog-be') diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index df8b898318..37e3d936d1 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -738,6 +738,22 @@ environmentContext: - Useful_Non-Revenue - General_Non-Revenue +gabConfig: + - artifactType: 'VES_EVENTS' + pathsAndNamesDefinitions: + - + friendlyName: "Action" + path: "event.action[2]" + searchable: "true" + - + friendlyName: "Comment" + path: "event.comment" + searchable: "true" + - + friendlyName: "Alarm Additional Information" + path: "event.structure.faultFields.structure.alarmAdditionalInformation.comment" + searchable: "true" + dmaapConsumerConfiguration: active: <%= @dmaap_active %> hosts: localhost:3905 diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ElementServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ElementServlet.java index eda9a61883..081c9cad1a 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ElementServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ElementServlet.java @@ -455,6 +455,8 @@ public class ElementServlet extends BeGenericServlet { configuration.put("roles", elementBL.getAllSupportedRoles()); configuration.put("resourceTypes", resourceTypesMap.left().value()); configuration.put("environmentContext", ConfigurationManager.getConfigurationManager().getConfiguration().getEnvironmentContext()); + configuration.put("gab", ConfigurationManager.getConfigurationManager().getConfiguration().getGabConfig()); + return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), configuration); } diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index 1d9a51e6b3..d23f87eb96 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -737,6 +737,22 @@ environmentContext: - Useful_Non-Revenue - General_Non-Revenue +gabConfig: + - artifactType: 'VES_EVENTS' + pathsandnames: + - + friendlyName: "Action" + path: "event.action[2]" + searchable: "true" + - + friendlyName: "Comment" + path: "event.comment" + searchable: "true" + - + friendlyName: "Alarm Additional Information" + path: "event.structure.faultFields.structure.alarmAdditionalInformation.comment" + searchable: "true" + dmaapConsumerConfiguration: active: true hosts: olsd004.wnsnet.ws.com:3905 -- cgit 1.2.3-korg