- COLLECTOR_IP
- DMAAPHOST - should contain an address to DMaaP, so that event publishing can work
- CBSPOLLTIMER - it should be put in here if we want to automatically fetch configuration from CBS.
-- CONSUL_HOST - used with conjunction with CBSPOLLTIMER, should be a host address (without port! e.g http://my-ip-or-host) where Consul service lies
+- CONSUL_PROTOCOL - Consul protocol by default set to **http**, if it is need to change it then that can be set to different value
+- CONSUL_HOST - used with conjunction with CBSPOLLTIMER, should be a host address (without port! e.g my-ip-or-host) where Consul service lies
+- CBS_PROTOCOL - Config Binding Service protocol by default set to **http**, if it is need to change it then that can be set to different value
- CONFIG_BINDING_SERVICE - used with conjunction with CBSPOLLTIMER, should be a name of CBS as it is registered in Consul
- HOSTNAME - used with conjunction with CBSPOLLTIMER, should be a name of VESCollector application as it is registered in CBS catalog
import java.nio.file.Paths;
import java.util.concurrent.*;
-@SpringBootApplication
-@EnableAutoConfiguration(exclude = {GsonAutoConfiguration.class, SecurityAutoConfiguration.class})
+@SpringBootApplication(exclude = {GsonAutoConfiguration.class, SecurityAutoConfiguration.class})
public class VesApplication {
private static final Logger metriclog = LoggerFactory.getLogger("com.att.ecomp.metrics");
*/
package org.onap.dcae.controller;
-import static io.vavr.API.Try;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.enhanceError;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.logError;
-import static org.onap.dcae.controller.Conversions.toList;
-
import io.vavr.CheckedRunnable;
import io.vavr.Tuple2;
import io.vavr.collection.Map;
import io.vavr.control.Try;
-import java.io.FileNotFoundException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.FileNotFoundException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static io.vavr.API.Try;
+import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.*;
+import static org.onap.dcae.controller.Conversions.toList;
+
class ConfigFilesFacade {
private static Logger log = LoggerFactory.getLogger(ConfigFilesFacade.class);
private PropertiesConfiguration readProperties() throws ConfigurationException {
PropertiesConfiguration propertiesConfiguration = new PropertiesConfiguration();
+ propertiesConfiguration.setDelimiterParsingDisabled(true);
propertiesConfiguration.load(propertiesPath.toFile());
return propertiesConfiguration;
}
PropertiesConfiguration propertiesConfiguration = new PropertiesConfiguration(propertiesPath.toFile());
propertiesConfiguration.setEncoding(null);
for (Tuple2<String, String> property : properties) {
- propertiesConfiguration.addProperty(property._1, property._2);
+ updateProperty(propertiesConfiguration, property);
}
propertiesConfiguration.save();
};
}
+ private void updateProperty(PropertiesConfiguration propertiesConfiguration, Tuple2<String, String> property) {
+ if (propertiesConfiguration.containsKey(property._1)) {
+ propertiesConfiguration.setProperty(property._1, property._2);
+ } else {
+ propertiesConfiguration.addProperty(property._1, property._2);
+ }
+ }
+
private String indentConfiguration(String configuration) {
return new JSONObject(configuration).toString(4);
}
.peek(strBody -> log.info(f("Received following CBS configuration from Consul '%s'", strBody)))
.flatMap(strBody -> toJsonArray(strBody))
.flatMap(json -> withdrawCatalog(json))
- .flatMap(json -> constructFullCBSUrl(json))
+ .flatMap(json -> constructFullCBSUrl(envProps, json))
.flatMap(cbsUrl -> callCBSForAppConfig(envProps, cbsUrl))
.flatMap(strBody -> toJson(strBody))
.peek(jsonNode -> log.info(f("Received app configuration: '%s'", jsonNode)))
}
private static Try<String> callConsulForCBSConfiguration(EnvProps envProps) {
- return executeGet(envProps.consulHost + ":" + envProps.consulPort + "/v1/catalog/service/" + envProps.cbsName)
+ return executeGet(envProps.consulProtocol + "://" + envProps.consulHost + ":" +
+ envProps.consulPort + "/v1/catalog/service/" + envProps.cbsName)
.mapFailure(enhanceError("Unable to retrieve CBS configuration from Consul"));
}
- private static Try<String> constructFullCBSUrl(JSONObject json) {
- return Try(() -> json.get("ServiceAddress").toString() + ":" + json.get("ServicePort").toString())
+ private static Try<String> constructFullCBSUrl(EnvProps envProps, JSONObject json) {
+ return Try(() -> envProps.cbsProtocol + "://" + json.get("ServiceAddress").toString() + ":" +
+ json.get("ServicePort").toString())
.mapFailure(enhanceError("ServiceAddress / ServicePort missing from CBS conf: '%s'", json));
}
*/
package org.onap.dcae.controller;
-import static io.vavr.API.List;
-import static io.vavr.API.Try;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
-
import io.vavr.collection.Map;
import io.vavr.control.Option;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static io.vavr.API.List;
+import static io.vavr.API.Try;
+import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
+
final class EnvPropertiesReader {
private final static Logger log = LoggerFactory.getLogger(EnvPropertiesReader.class);
static Option<EnvProps> readEnvProps(Map<String, String> environmentVariables) {
log.info("Loading necessary environment variables for dynamic configuration update");
int consulPort = getConsulPort(environmentVariables);
+ String consulProtocol = getConsulProtocol(environmentVariables);
+ String cbsProtocol = getCbsProtocol(environmentVariables);
Option<String> consulHost = getConsulHost(environmentVariables);
Option<String> cbsServiceName = getCBSName(environmentVariables);
Option<String> vesCollectorAppName = getAppName(environmentVariables);
return Option.sequence(List(consulHost, cbsServiceName, vesCollectorAppName))
- .map(e -> new EnvProps(e.get(0), consulPort, e.get(1), e.get(2)))
+ .map(e -> new EnvProps(consulProtocol, e.get(0), consulPort, cbsProtocol, e.get(1), e.get(2)))
.onEmpty(() -> log.warn("Some required environment variables are missing"))
.peek(props -> log.info(f("Discovered following environment variables: '%s'", props)));
}
+ "is missing from environment variables."));
}
+ private static String getConsulProtocol(Map<String, String> environmentVariables) {
+ return getProtocolFrom("CONSUL_PROTOCOL", environmentVariables);
+ }
+
+ private static String getCbsProtocol(Map<String, String> environmentVariables) {
+ return getProtocolFrom("CBS_PROTOCOL", environmentVariables);
+ }
+
+ private static String getProtocolFrom(String variableName, Map<String, String> environmentVariables) {
+ return environmentVariables.get(variableName)
+ .onEmpty(() -> log.warn("Consul protocol (env var: '" + variableName + "') is missing "
+ + "from environment variables."))
+ .getOrElse("http");
+ }
+
}
*/
final class EnvProps {
+ final String consulProtocol;
final String consulHost;
final int consulPort;
final String cbsName;
+ final String cbsProtocol;
final String appName;
- EnvProps(String consulHost, int consulPort, String cbsName, String appName) {
+ EnvProps(String consulProtocol, String consulHost, int consulPort, String cbsProtocol, String cbsName, String appName) {
+ this.consulProtocol = consulProtocol;
this.consulHost = consulHost;
this.consulPort = consulPort;
+ this.cbsProtocol = cbsProtocol;
this.cbsName = cbsName;
this.appName = appName;
}
@Override
public String toString() {
return "EnvProps{" +
- "consulHost='" + consulHost + '\'' +
+ "consulProtocol='" + consulProtocol + '\'' +
+ ", consulHost='" + consulHost + '\'' +
", consulPort=" + consulPort +
+ ", cbsProtocol='" + cbsProtocol + '\'' +
", cbsName='" + cbsName + '\'' +
", appName='" + appName + '\'' +
'}';
}
EnvProps envProps = (EnvProps) o;
return consulPort == envProps.consulPort &&
+ Objects.equals(consulProtocol, envProps.consulProtocol) &&
Objects.equals(consulHost, envProps.consulHost) &&
+ Objects.equals(cbsProtocol, envProps.cbsProtocol) &&
Objects.equals(cbsName, envProps.cbsName) &&
Objects.equals(appName, envProps.appName);
}
@Override
public int hashCode() {
- return Objects.hash(consulHost, consulPort, cbsName, appName);
+ return Objects.hash(consulProtocol, consulHost, consulPort, cbsProtocol, cbsName, appName);
}
}
\ No newline at end of file
--- /dev/null
+/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 Nokia. All rights reserved.s
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcae.restapi;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+
+@Controller
+public class HealthCheckController {
+
+ @GetMapping("/healthcheck")
+ public String healthCheck() {
+ return "hello";
+ }
+
+}
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.spi.DocumentationType;
@Configuration
@EnableSwagger2
-public class SwaggerConfig extends WebMvcConfigurationSupport {
+public class SwaggerConfig{
@Bean
public Docket api() {
return new Docket(DocumentationType.SWAGGER_2)
.build();
}
- @Override
- protected void addResourceHandlers(ResourceHandlerRegistry registry) {
- registry
- .addResourceHandler("swagger-ui.html")
- .addResourceLocations("classpath:/META-INF/resources/");
-
- registry
- .addResourceHandler("/webjars/**")
- .addResourceLocations("classpath:/META-INF/resources/webjars/");
- }
}
--- /dev/null
+/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 Nokia. All rights reserved.s
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcae.restapi;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
+
+@Configuration
+public class WebMvcConfig extends WebMvcConfigurationSupport {
+
+ @Override
+ protected void addResourceHandlers(ResourceHandlerRegistry registry) {
+ registry
+ .addResourceHandler("swagger-ui.html")
+ .addResourceLocations("classpath:/META-INF/resources/");
+
+ registry
+ .addResourceHandler("/webjars/**")
+ .addResourceLocations("classpath:/META-INF/resources/webjars/");
+
+ registry
+ .addResourceHandler("**")
+ .addResourceLocations("classpath:/templates/");
+ }
+
+ @Bean
+ public InternalResourceViewResolver jspViewResolver() {
+ InternalResourceViewResolver resolver = new InternalResourceViewResolver();
+ resolver.setPrefix("/");
+ resolver.setSuffix(".html");
+ return resolver;
+ }
+
+}
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
-import com.github.fge.jsonschema.core.report.ProcessingReport;
import com.github.fge.jsonschema.main.JsonSchema;
import io.vavr.collection.HashMap;
import io.vavr.collection.Map;
-import org.json.JSONObject;
import org.junit.Test;
import java.io.File;
@Test
public void shouldMakeApplicationSettingsOutOfCLIArgumentsAndAConfigurationFile()
- throws IOException {
+ throws IOException {
// given
File tempConfFile = File.createTempFile("doesNotMatter", "doesNotMatter");
Files.write(tempConfFile.toPath(), Arrays.asList("section.subSection1=abc", "section.subSection2=zxc"));
public void shouldReturnHTTPPort() throws IOException {
// when
int applicationPort = fromTemporaryConfiguration("collector.service.port=8090")
- .httpPort();
+ .httpPort();
// then
assertEquals(8090, applicationPort);
public void shouldReturnIfHTTPSIsEnabled() throws IOException {
// when
boolean httpsEnabled = fromTemporaryConfiguration("collector.service.secure.port=8443")
- .httpsEnabled();
+ .httpsEnabled();
// then
assertTrue(httpsEnabled);
public void shouldReturnHTTPSPort() throws IOException {
// when
int httpsPort = fromTemporaryConfiguration("collector.service.secure.port=8443")
- .httpsPort();
+ .httpsPort();
// then
assertEquals(8443, httpsPort);
public void shouldReturnConfigurationUpdateInterval() throws IOException {
// when
int updateFrequency = fromTemporaryConfiguration("collector.dynamic.config.update.frequency=10")
- .configurationUpdateFrequency();
+ .configurationUpdateFrequency();
// then
assertEquals(10, updateFrequency);
public void shouldReturnDefaultConfigurationUpdateInterval() throws IOException {
// when
int updateFrequency = fromTemporaryConfiguration()
- .configurationUpdateFrequency();
+ .configurationUpdateFrequency();
// then
assertEquals(5, updateFrequency);
@Test
public void shouldReturnLocationOfThePasswordFile() throws IOException {
// when
- String passwordFileLocation = fromTemporaryConfiguration("collector.keystore.passwordfile=/somewhere/password").keystorePasswordFileLocation();
+ String passwordFileLocation = fromTemporaryConfiguration("collector.keystore.passwordfile=/somewhere/password")
+ .keystorePasswordFileLocation();
// then
assertEquals(sanitizePath("/somewhere/password"), passwordFileLocation);
public void shouldReturnLocationOfTheKeystoreFile() throws IOException {
// when
String keystoreFileLocation = fromTemporaryConfiguration("collector.keystore.file.location=/somewhere/keystore")
- .keystoreFileLocation();
+ .keystoreFileLocation();
// then
assertEquals(sanitizePath("/somewhere/keystore"), keystoreFileLocation);
@Test
public void shouldReturnDMAAPConfigFileLocation() throws IOException {
// when
- String dmaapConfigFileLocation = fromTemporaryConfiguration("collector.dmaapfile=/somewhere/dmaapFile").dMaaPConfigurationFileLocation();
+ String dmaapConfigFileLocation = fromTemporaryConfiguration("collector.dmaapfile=/somewhere/dmaapFile")
+ .dMaaPConfigurationFileLocation();
// then
assertEquals(sanitizePath("/somewhere/dmaapFile"), dmaapConfigFileLocation);
public void shouldReturnMaximumAllowedQueuedEvents() throws IOException {
// when
int maximumAllowedQueuedEvents = fromTemporaryConfiguration("collector.inputQueue.maxPending=10000")
- .maximumAllowedQueuedEvents();
+ .maximumAllowedQueuedEvents();
// then
assertEquals(10000, maximumAllowedQueuedEvents);
public void shouldTellIfSchemaValidationIsEnabled() throws IOException {
// when
boolean jsonSchemaValidationEnabled = fromTemporaryConfiguration("collector.schema.checkflag=1")
- .jsonSchemaValidationEnabled();
+ .jsonSchemaValidationEnabled();
// then
assertTrue(jsonSchemaValidationEnabled);
public void shouldReturnJSONSchema() throws IOException, ProcessingException {
// when
String sampleJsonSchema = "{" +
- " \"type\": \"object\"," +
- " \"properties\": {" +
- " \"state\": { \"type\": \"string\" }" +
- " }" +
- "}";
+ " \"type\": \"object\"," +
+ " \"properties\": {" +
+ " \"state\": { \"type\": \"string\" }" +
+ " }" +
+ "}";
Path temporarySchemaFile = createTemporaryFile(sampleJsonSchema);
// when
- JsonSchema schema = fromTemporaryConfiguration(String.format("collector.schema.file={\"v1\": \"%s\"}", temporarySchemaFile))
- .jsonSchema("v1");
+ JsonSchema schema = fromTemporaryConfiguration(
+ String.format("collector.schema.file={\"v1\": \"%s\"}", temporarySchemaFile))
+ .jsonSchema("v1");
// then
JsonNode incorrectTestObject = new ObjectMapper().readTree("{ \"state\": 1 }");
public void shouldReturnExceptionConfigFileLocation() throws IOException {
// when
String exceptionConfigFileLocation = fromTemporaryConfiguration("exceptionConfig=/somewhere/exceptionFile")
- .exceptionConfigFileLocation();
+ .exceptionConfigFileLocation();
// then
assertEquals("/somewhere/exceptionFile", exceptionConfigFileLocation);
public void shouldReturnDMAAPStreamId() throws IOException {
// given
Map<String, String[]> expected = HashMap.of(
- "s", new String[]{"something", "something2"},
- "s2", new String[]{"something3"}
+ "s", new String[]{"something", "something2"},
+ "s2", new String[]{"something3"}
);
// when
- Map<String, String[]> dmaapStreamID = fromTemporaryConfiguration("collector.dmaap.streamid=s=something,something2|s2=something3")
- .dMaaPStreamsMapping();
+ Map<String, String[]> dmaapStreamID = fromTemporaryConfiguration(
+ "collector.dmaap.streamid=s=something,something2|s2=something3")
+ .dMaaPStreamsMapping();
// then
assertArrayEquals(expected.get("s").get(), Objects.requireNonNull(dmaapStreamID).get("s").get());
public void shouldReturnIfAuthorizationIsEnabled() throws IOException {
// when
boolean authorizationEnabled = fromTemporaryConfiguration("header.authflag=1")
- .authorizationEnabled();
+ .authorizationEnabled();
// then
assertTrue(authorizationEnabled);
public void shouldReturnValidCredentials() throws IOException {
// when
Map<String, String> allowedUsers = fromTemporaryConfiguration(
- "header.authlist=pasza,c2ltcGxlcGFzc3dvcmQNCg==|someoneelse,c2ltcGxlcGFzc3dvcmQNCg=="
+ "header.authlist=pasza,c2ltcGxlcGFzc3dvcmQNCg==|someoneelse,c2ltcGxlcGFzc3dvcmQNCg=="
).validAuthorizationCredentials();
// then
public void shouldbyDefaultThereShouldBeNoValidCredentials() throws IOException {
// when
Map<String, String> userToBase64PasswordDelimitedByCommaSeparatedByPipes = fromTemporaryConfiguration().
- validAuthorizationCredentials();
+ validAuthorizationCredentials();
// then
assertTrue(userToBase64PasswordDelimitedByCommaSeparatedByPipes.isEmpty());
public void shouldReturnIfEventTransformingIsEnabled() throws IOException {
// when
boolean isEventTransformingEnabled = fromTemporaryConfiguration("event.transform.flag=0")
- .eventTransformingEnabled();
+ .eventTransformingEnabled();
// then
assertFalse(isEventTransformingEnabled);
@Test
public void shouldReturnCambriaConfigurationFileLocation() throws IOException {
// when
- String cambriaConfigurationFileLocation = fromTemporaryConfiguration("collector.dmaapfile=/somewhere/dmaapConfig")
- .dMaaPConfigurationFileLocation();
+ String cambriaConfigurationFileLocation = fromTemporaryConfiguration(
+ "collector.dmaapfile=/somewhere/dmaapConfig")
+ .dMaaPConfigurationFileLocation();
// then
assertEquals(sanitizePath("/somewhere/dmaapConfig"), cambriaConfigurationFileLocation);
public void shouldReturnDefaultCambriaConfigurationFileLocation() throws IOException {
// when
String cambriaConfigurationFileLocation = fromTemporaryConfiguration()
- .dMaaPConfigurationFileLocation();
+ .dMaaPConfigurationFileLocation();
// then
assertEquals(sanitizePath("etc/DmaapConfig.json"), cambriaConfigurationFileLocation);
}
private static ApplicationSettings fromTemporaryConfiguration(String... fileLines)
- throws IOException {
+ throws IOException {
File tempConfFile = File.createTempFile("doesNotMatter", "doesNotMatter");
Files.write(tempConfFile.toPath(), Arrays.asList(fileLines));
tempConfFile.deleteOnExit();
*/
package org.onap.dcae;
-import static java.nio.file.Files.readAllBytes;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
import io.vavr.control.Try;
+import org.assertj.core.api.AbstractThrowableAssert;
+import org.assertj.core.api.Java6Assertions;
+import org.json.JSONObject;
+
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import org.assertj.core.api.AbstractThrowableAssert;
-import org.assertj.core.api.Java6Assertions;
-import org.json.JSONObject;
+
+import static java.nio.file.Files.readAllBytes;
+import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Pawel Szalapski (pawel.szalapski@nokia.com)
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-package org.onap.dcae;
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
-import static io.vavr.API.Map;
+package org.onap.dcae;
import com.github.tomakehurst.wiremock.junit.WireMockRule;
import io.vavr.collection.Map;
import org.junit.Rule;
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static io.vavr.API.Map;
+
/**
* @author Pawel Szalapski (pawel.szalapski@nokia.com)
*/
protected Map<String, String> wiremockBasedEnvProps() {
return Map(
- "CONSUL_HOST", "http://localhost",
+ "CONSUL_HOST", "localhost",
"CONSUL_PORT", "" + wireMockRule.port(),
"HOSTNAME", "VESCollector",
"CONFIG_BINDING_SERVICE", "CBSName"
protected String validLocalCBSConf() {
return ""
+ "[{ "
- + "\"ServiceAddress\": \"http://localhost\","
+ + "\"ServiceAddress\": \"localhost\","
+ "\"ServicePort\":" + wireMockRule.port()
+ "}]";
}
public class EventProcessorTest {
- private final String ev = "{\"event\": {\"commonEventHeader\": { \"reportingEntityName\": \"VM name will be provided by ECOMP\", \"startEpochMicrosec\": 1477012779802988,\"lastEpochMicrosec\": 1477012789802988,\"eventId\": \"83\",\"sourceName\": \"Dummy VM name - No Metadata available\",\"sequence\": 83,\"priority\": \"Normal\",\"functionalRole\": \"vFirewall\",\"domain\": \"measurementsForVfScaling\",\"reportingEntityId\": \"VM UUID will be provided by ECOMP\",\"sourceId\": \"Dummy VM UUID - No Metadata available\",\"version\": 1.1},\"measurementsForVfScalingFields\": {\"measurementInterval\": 10,\"measurementsForVfScalingVersion\": 1.1,\"vNicUsageArray\": [{\"multicastPacketsIn\": 0,\"bytesIn\": 3896,\"unicastPacketsIn\": 0, \"multicastPacketsOut\": 0,\"broadcastPacketsOut\": 0, \"packetsOut\": 28,\"bytesOut\": 12178,\"broadcastPacketsIn\": 0,\"packetsIn\": 58,\"unicastPacketsOut\": 0,\"vNicIdentifier\": \"eth0\"}]}}}";
+ private final String ev = "{\"event\": {\"commonEventHeader\": { \"reportingEntityName\": "
+ + "\"VM name will be provided by ECOMP\", \"startEpochMicrosec\": 1477012779802988,\"lastEpochMicrosec\": "
+ + "1477012789802988,\"eventId\": \"83\",\"sourceName\": \"Dummy VM name - No Metadata available\","
+ + "\"sequence\": 83,\"priority\": \"Normal\",\"functionalRole\": \"vFirewall\",\"domain\": "
+ + "\"measurementsForVfScaling\",\"reportingEntityId\": \"VM UUID will be provided by ECOMP\","
+ + "\"sourceId\": \"Dummy VM UUID - No Metadata available\",\"version\": 1.1},\"measurementsForVfScalingFields\":"
+ + " {\"measurementInterval\": 10,\"measurementsForVfScalingVersion\": 1.1,\"vNicUsageArray\": "
+ + "[{\"multicastPacketsIn\": 0,\"bytesIn\": 3896,\"unicastPacketsIn\": 0, "
+ + "\"multicastPacketsOut\": 0,\"broadcastPacketsOut\": 0, "
+ + "\"packetsOut\": 28,\"bytesOut\": 12178,\"broadcastPacketsIn\": "
+ + "0,\"packetsIn\": 58,\"unicastPacketsOut\": 0,\"vNicIdentifier\": \"eth0\"}]}}}";
- private Map<String, String[]> streamID;
private ApplicationSettings properties;
@Before
public void setUp() {
properties = new ApplicationSettings(new String[]{}, CLIUtils::processCmdLine);
- streamID = properties.dMaaPStreamsMapping();
}
@Test
public void shouldParseJsonEvents() throws ReflectiveOperationException {
//given
EventProcessor eventProcessor = new EventProcessor(mock(EventPublisher.class), properties);
- String event_json = "[{ \"filter\": {\"event.commonEventHeader.domain\":\"heartbeat\",\"VESversion\":\"v4\"},\"processors\":[" +
- "{\"functionName\": \"concatenateValue\",\"args\":{\"field\":\"event.commonEventHeader.eventName\",\"concatenate\": [\"$event.commonEventHeader.domain\",\"$event.commonEventHeader.eventType\",\"$event.faultFields.alarmCondition\"], \"delimiter\":\"_\"}}" +
- ",{\"functionName\": \"addAttribute\",\"args\":{\"field\": \"event.heartbeatFields.heartbeatFieldsVersion\",\"value\": \"1.0\",\"fieldType\": \"number\"}}" +
- ",{\"functionName\": \"map\",\"args\":{\"field\": \"event.commonEventHeader.nfNamingCode\",\"oldField\": \"event.commonEventHeader.functionalRole\"}}]}]";
+ String event_json =
+ "[{ \"filter\": {\"event.commonEventHeader.domain\":\"heartbeat\",\"VESversion\":\"v4\"},\"processors\":["
+ + "{\"functionName\": \"concatenateValue\",\"args\":{\"field\":\"event.commonEventHeader.eventName\","
+ + "\"concatenate\": [\"$event.commonEventHeader.domain\",\"$event.commonEventHeader.eventType\","
+ + "\"$event.faultFields.alarmCondition\"], \"delimiter\":\"_\"}}"
+ + ",{\"functionName\": \"addAttribute\",\"args\":{\"field\": "
+ + "\"event.heartbeatFields.heartbeatFieldsVersion\",\"value\": \"1.0\",\"fieldType\": \"number\"}}"
+ + ",{\"functionName\": \"map\",\"args\":{\"field\": \"event.commonEventHeader.nfNamingCode\","
+ + "\"oldField\": \"event.commonEventHeader.functionalRole\"}}]}]";
List<Event> events = new Gson().fromJson(event_json, EVENT_LIST_TYPE);
EventProcessor.ConfigProcessorAdapter configProcessorAdapter = mock(EventProcessor.ConfigProcessorAdapter.class);
*/
package org.onap.dcae.controller;
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.onap.dcae.TestingUtilities.assertFailureHasInfo;
-import static org.onap.dcae.controller.ConfigSource.getAppConfig;
-
import io.vavr.control.Try;
import org.json.JSONObject;
import org.junit.Test;
import org.onap.dcae.WiremockBasedTest;
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.onap.dcae.TestingUtilities.assertFailureHasInfo;
+import static org.onap.dcae.controller.ConfigSource.getAppConfig;
+
public class ConfigCBSSourceTest extends WiremockBasedTest {
@Test
// given
String notAListCatalog = ""
+ "{"
- + "\"ServiceAddress\":\"http://localhost\","
+ + "\"ServiceAddress\":\"localhost\","
+ "\"ServicePort\":" + wireMockRule.port()
+ "}";
}
private Try<JSONObject> tryToGetConfig() {
- return getAppConfig(new EnvProps("http://localhost", wireMockRule.port(), "CBSName", "VESCollector"));
+ return getAppConfig(new EnvProps("http", "localhost", wireMockRule.port(), "http", "CBSName", "VESCollector"));
}
}
import static org.junit.Assert.assertEquals;\r
import static org.junit.Assert.assertNotEquals;\r
\r
+import com.google.gson.JsonParser;\r
+import com.google.gson.JsonObject;\r
import java.io.FileReader;\r
import java.io.IOException;\r
import org.json.JSONObject;\r
-import com.google.gson.JsonParser;\r
-import com.google.gson.JsonObject;\r
import org.junit.Test;\r
\r
import org.onap.dcae.commonFunction.ConfigProcessors;\r
System.out.println("event==" + jsonObject.toString());\r
System.out.println("alarmAdditionalInformation==" + alarmAdditionalInformation);\r
final JSONObject jsonArgs = new JSONObject(\r
- "{\"field\": \"event.faultFields.eventAdditionalInformation\",\"oldField\": \"event.faultFields.alarmAdditionalInformation\"}");\r
+ "{\"field\": \"event.faultFields.eventAdditionalInformation\",\"oldField\": "\r
+ + "\"event.faultFields.alarmAdditionalInformation\"}");\r
ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);\r
cpEvent.map(jsonArgs);\r
final String responseData = cpEvent.getEventObjectVal("event.faultFields.eventAdditionalInformation")\r
public void testJSONObjectMapToArray() {\r
\r
final JSONObject jsonObject = getFileAsJsonObject();\r
- //final String receiveDiscards = (((jsonObject.getJSONObject("event")).getJSONObject("faultFields")).get("errors")).get("receiveDiscards").toString();\r
System.out.println("event==" + jsonObject.toString());\r
- //System.out.println("alarmAdditionalInformation==" + alarmAdditionalInformation);\r
final JSONObject jsonArgs = new JSONObject(\r
- "{\"field\": \"event.faultFields.vNicPerformanceArray[]\",\"oldField\": \"event.faultFields.errors\",\"attrMap\":{\"receiveDiscards\":\"receivedDiscardedPacketsAccumulated\"}}");\r
+ "{\"field\": \"event.faultFields.vNicPerformanceArray[]\",\"oldField\": "\r
+ + "\"event.faultFields.errors\",\"attrMap\":{\"receiveDiscards\":\"receivedDiscardedPacketsAccumulated\"}}");\r
ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);\r
final String receiveDiscards = cpEvent.getEventObjectVal("event.faultFields.errors.receiveDiscards").toString();\r
System.out.println("receiveDiscards==" + receiveDiscards);\r
public void testMapRenameObject() {\r
\r
final JSONObject jsonObject = getFileAsJsonObject();\r
- //final String receiveDiscards = (((jsonObject.getJSONObject("event")).getJSONObject("faultFields")).get("errors")).get("receiveDiscards").toString();\r
System.out.println("event==" + jsonObject.toString());\r
- //System.out.println("alarmAdditionalInformation==" + alarmAdditionalInformation);\r
final JSONObject jsonArgs = new JSONObject(\r
"{\"field\": \"event.faultFields.faultVFScalingFields\",\"oldField\": \"event.faultFields.errors\",\"mapType\":\"renameObject\"}");\r
ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);\r
public void testMapHashmapToNameValueArray() {\r
\r
final JSONObject jsonObject = getFileAsJsonObject();\r
- //final String receiveDiscards = (((jsonObject.getJSONObject("event")).getJSONObject("faultFields")).get("errors")).get("receiveDiscards").toString();\r
System.out.println("event==" + jsonObject.toString());\r
- //System.out.println("alarmAdditionalInformation==" + alarmAdditionalInformation);\r
final JSONObject jsonArgs = new JSONObject(\r
"{\"field\": \"event.faultFields.errors\",\"mapType\":\"hashmapToNameValueArray\"}");\r
ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);\r
public void testMapNameValueArrayToHashmap() {\r
\r
final JSONObject jsonObject = getFileAsJsonObject();\r
- //final String receiveDiscards = (((jsonObject.getJSONObject("event")).getJSONObject("faultFields")).get("errors")).get("receiveDiscards").toString();\r
System.out.println("event==" + jsonObject.toString());\r
- //System.out.println("alarmAdditionalInformation==" + alarmAdditionalInformation);\r
final JSONObject jsonArgs = new JSONObject(\r
"{\"field\": \"event.faultFields.alarmAdditionalInformation\",\"mapType\":\"nameValueArrayToHashmap\"}");\r
ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);\r
public void testAttrAdd() {\r
\r
final JSONObject jsonObject = getFileAsJsonObject();\r
- //final String functionRole = (jsonObject.getJSONObject("event")).getJSONObject("commonEventHeader").get("functionalRole").toString();\r
System.out.println("event==" + jsonObject.toString());\r
- //System.out.println("functionRole==" + functionRole);\r
final JSONObject jsonArgs = new JSONObject(\r
"{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}");\r
ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);\r
public void testAttrUpdate() {\r
\r
final JSONObject jsonObject = getFileAsJsonObject();\r
- //final String functionRole = (jsonObject.getJSONObject("event")).getJSONObject("commonEventHeader").get("functionalRole").toString();\r
System.out.println("event==" + jsonObject.toString());\r
- //System.out.println("functionRole==" + functionRole);\r
final JSONObject jsonArgs = new JSONObject(\r
"{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}");\r
ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);\r
final JSONObject jsonObject = getFileAsJsonObject();\r
System.out.println("event==" + jsonObject.toString());\r
System.out.println("Testing SetEventObjectVal");\r
- //final JSONObject jsonArgs = new JSONObject ( "{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}" );\r
ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);\r
cpEvent.setEventObjectVal("event.faultFields.version", "2.0", "number");\r
final String responseData = cpEvent.getEventObjectVal("event.faultFields.version").toString();\r
final JSONObject jsonObject = getFileAsJsonObject();\r
System.out.println("event==" + jsonObject.toString());\r
System.out.println("Testing GetEventObjectVal");\r
- //final JSONObject jsonArgs = new JSONObject ( "{\"field\": \"event.faultFields.eventSeverity\"}" );\r
ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);\r
cpEvent.getEventObjectVal("event.faultFields.eventSeverity");\r
final String responseData = cpEvent.getEventObjectVal("event.faultFields.eventSeverity").toString();\r
*/
package org.onap.dcae.vestest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.onap.dcae.commonFunction.VESLogger.REQUEST_ID;
-
import com.att.nsa.logging.LoggingContext;
import com.att.nsa.logging.log4j.EcompFields;
-import java.util.UUID;
import org.junit.Test;
import org.onap.dcae.commonFunction.VESLogger;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
+import static org.onap.dcae.commonFunction.VESLogger.REQUEST_ID;
+
public class TestVESLogger {
- @Test
- public void shouldOnLoggingContextInitializationPutRandomUUIDAsRequestID() {
- LoggingContext commonLoggingContext = VESLogger.getCommonLoggingContext();
- String requestId = commonLoggingContext.get(REQUEST_ID, "default");
+ @Test
+ public void shouldOnLoggingContextInitializationPutRandomUuidAsRequestId() {
+ LoggingContext commonLoggingContext = VESLogger.getCommonLoggingContext();
+ String requestId = commonLoggingContext.get(REQUEST_ID, "default");
- assertNotNull(requestId);
- assertNotSame(requestId, "default");
+ assertNotNull(requestId);
+ assertNotSame(requestId, "default");
- }
+ }
- @Test
- public void shouldOnLoggingContextInitializationPutGivenUUIDAsRequestIDAndSupplyEndTimestamp() {
- final UUID uuid = UUID.randomUUID();
- LoggingContext loggingContextForThread = VESLogger.getLoggingContextForThread(uuid);
- String requestId = loggingContextForThread.get(REQUEST_ID, "default");
- String endTimestamp = loggingContextForThread.get(EcompFields.kEndTimestamp, "default");
+ @Test
+ public void shouldOnLoggingContextInitializationPutGivenUuuidAsRequestIdAndSupplyEndTimestamp() {
+ final UUID uuid = UUID.randomUUID();
+ LoggingContext loggingContextForThread = VESLogger.getLoggingContextForThread(uuid);
+ String requestId = loggingContextForThread.get(REQUEST_ID, "default");
+ String endTimestamp = loggingContextForThread.get(EcompFields.kEndTimestamp, "default");
- assertNotNull(requestId);
- assertNotNull(endTimestamp);
- assertNotSame(endTimestamp, "default");
- assertEquals(requestId, uuid.toString());
- }
+ assertNotNull(requestId);
+ assertNotNull(endTimestamp);
+ assertNotSame(endTimestamp, "default");
+ assertEquals(requestId, uuid.toString());
+ }
- @Test
- public void shouldOnLoggingContextInitializationPutGivenUUIDAsRequestIDAndSupplyEndTimestampAndCompleteStatusCode() {
- final UUID uuid = UUID.randomUUID();
- LoggingContext loggingContextForThread = VESLogger.getLoggingContextForThread(uuid.toString());
- String requestId = loggingContextForThread.get(REQUEST_ID, "default");
- String statusCode = loggingContextForThread.get("statusCode", "default");
- String endTimestamp = loggingContextForThread.get(EcompFields.kEndTimestamp, "default");
+ @Test
+ public void shouldOnLoggingContextInitializationPutGivenUuidAsRequestIdAndSupplyEndTimestampAndCompleteStatusCode() {
+ final UUID uuid = UUID.randomUUID();
+ LoggingContext loggingContextForThread = VESLogger.getLoggingContextForThread(uuid.toString());
+ String requestId = loggingContextForThread.get(REQUEST_ID, "default");
+ String statusCode = loggingContextForThread.get("statusCode", "default");
+ String endTimestamp = loggingContextForThread.get(EcompFields.kEndTimestamp, "default");
- assertNotNull(requestId);
- assertNotNull(endTimestamp);
- assertNotNull(statusCode);
- assertNotSame(endTimestamp, "default");
- assertEquals(requestId, uuid.toString());
- assertEquals(statusCode, "COMPLETE");
- }
+ assertNotNull(requestId);
+ assertNotNull(endTimestamp);
+ assertNotNull(statusCode);
+ assertNotSame(endTimestamp, "default");
+ assertEquals(requestId, uuid.toString());
+ assertEquals(statusCode, "COMPLETE");
+ }
}
Code Review / dcaegen2 / collectors / ves.git / commitdiff