Taking Adapter Config from Docker ENV parameters if CONSUL_HOST flag is present
Change-Id: Id097e433112fbdcc0d403ca3f87abee123e76693
Issue-ID: DCAEGEN2-335
Signed-off-by: amshegokar <AS00500801@techmahindra.com>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" output="target/classes" path="src/gen/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="src" path=".apt_generated">
<attributes>
<attribute name="optional" value="true"/>
+++ /dev/null
-FROM ubuntu:16.04
-
-MAINTAINER as00500801@techmahindra.com
-
-WORKDIR /opt/app/VESAdapter
-
-ENV HOME /opt/app/VESAdapter
-
-ENV JAVA_HOME /usr
-
-RUN apt-get update && apt-get install -y \
- curl \
- vim \
- openjdk-8-jdk
-
-COPY UniversalVesAdapter.jar /opt
-COPY run.sh /opt
-
-# EXPOSE 8080
-
-#RUN ["chmod", "+x", "/opt/run.sh"]
-CMD [ "/opt/run.sh" ]
-
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========================================================= -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.dcaegen2.services.mapper.vesadapter</groupId>
<artifactId>UniversalVesAdapter</artifactId>
- <version>0.0.1</version>
+ <version>0.0.1-SNAPSHOT</version>
<parent>
<version>0.0.1-SNAPSHOT</version>
</parent>
+ <properties>
+
+ <!-- PROJECT SETTINGS -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <java.version>8</java.version>
+ <docker.image.name>onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor</docker.image.name>
+
+ <!-- PLUGIN SETTINGS -->
+ <dependency.locations.enabled>false</dependency.locations.enabled>
+
+ <!-- NEXUS RELATED SETTINGS -->
+ <nexusproxy>https://nexus.onap.org</nexusproxy>
+ <snapshots.path>content/repositories/snapshots/</snapshots.path>
+ <releases.path>content/repositories/releases/</releases.path>
+ <site.path>
+ content/sites/site/org/onap/dcaegen2/collectors/ves/${project.artifactId}/${project.version}
+ </site.path>
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
+
+ </properties>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
-
</dependency>
-
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.10</version>
+ </dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.5</version>
</dependency>
-
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>4.2.0</version>
</dependency>
<dependency>
-
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
<artifactId>postgresql</artifactId>
<version>42.2.4</version>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<artifactId>spring-data-commons</artifactId>
<version>2.0.8.RELEASE</version>
</dependency>
+ <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.25</version>
+ </dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>2.4.14</version>
+ <groupId>org.codehaus.groovy</groupId>
+
<artifactId>groovy-all</artifactId>
+ <version>2.4.14</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<version>2.4.0</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.6</version>
</dependency>
-
-
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.10</version>
<scope>test</scope>
</dependency>
-
<!-- https://mvnrepository.com/artifact/xalan/xalan -->
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.2</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/xerces/xercesImpl -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.0</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<version>${httpclient.version}</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>
<!-- <dependency> <groupId>org.onap.aai.event-client</groupId> <artifactId>event-client-dmaap</artifactId>
<version>1.2.0</version> </dependency> -->
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</dependency>
</dependencies>
- <properties>
- <java.version>1.8</java.version>
- </properties>
-
-
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
- <plugin>
+ <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>false</reuseForks>
<forkCount>1</forkCount>
</configuration>
- </plugin>
+ </plugin> -->
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.0.0.RELEASE</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/dep.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ <appendAssemblyId>false</appendAssemblyId>
+ <updateOnly>true</updateOnly>
+ </configuration>
<executions>
<execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
<goals>
- <goal>repackage</goal>
+ <goal>single</goal>
</goals>
- <configuration>
- <mainClass>org.onap.universalvesadapter.Application</mainClass>
- </configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker.maven.version}</version>
+ <version>1.1.1</version>
<configuration>
- <skipDockerBuild>false</skipDockerBuild>
- <imageName>${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.universalvesadaptor</imageName>
- <baseImage>openjdk:8-jre</baseImage>
- <entryPoint>["java", "-jar", "/opt/${project.build.finalName}.jar", "server"]</entryPoint>
+ <serverId>${onap.nexus.dockerregistry.daily}</serverId>
+ <imageName>${docker.image.name}</imageName>
+ <imageTags>
+ <tag>latest</tag>
+ </imageTags>
+ <baseImage>ubuntu:16.04</baseImage>
+ <env>
+ <HOSTALIASES>/etc/host.aliases</HOSTALIASES>
+ </env>
+ <workdir>/opt/app/VESAdapter</workdir>
<resources>
<resource>
- <targetPath>/opt</targetPath>
- <directory>${project.build.directory}</directory>
- <include>${project.build.finalName}.jar</include>
+ <targetPath>.</targetPath>
+ <directory>${project.build.directory}/${project.artifactId}-${project.version}</directory>
</resource>
</resources>
+ <runs>
+ <run>chmod +x bin/run.sh</run>
+ <run>
+ <![CDATA[apt-get update && apt-get install -y curl && apt-get install -y openjdk-8-jdk && apt-get install -y vim && apt-get clean all]]>
+ </run>
+ </runs>
<exposes>
<expose>8080</expose>
+ <expose>8443</expose>
</exposes>
- <imageTags>
- <!--imageTag>${project.version}-SNAPSHOT-${maven.build.timestamp}Z</imageTag -->
- <imageTag>${project.version}</imageTag>
- <imageTag>latest</imageTag>
- </imageTags>
- <serverId>${onap.nexus.dockerregistry.daily}</serverId>
+ <entryPoint>bin/run.sh</entryPoint>
+
</configuration>
+ <executions>
+ <execution>
+ <id>build-image</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>tag-and-push-image-latest</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <image>${docker.image.name}:latest</image>
+ <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName>
+ <pushImage>true</pushImage>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tag-and-push-image-with-version</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <image>${docker.image.name}:latest</image>
+ <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}
+ </newName>
+ <pushImage>true</pushImage>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tag-and-push-image-with-version-and-date</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <image>${docker.image.name}:latest</image>
+ <newName>
+ ${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z
+ </newName>
+ <pushImage>true</pushImage>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.0.0.RELEASE</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ <configuration>
+ <mainClass>org.onap.universalvesadapter.Application</mainClass>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
</executions>
</plugin>
</plugins>
- <finalName>UniversalVesAdapter</finalName>
+ <!-- <finalName>UniversalVesAdapter</finalName> -->
</build>
+ <profiles>
+ <profile>
+ <id>with-system-proxy</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <buildArgs>
+ <http_proxy>${env.http_proxy}</http_proxy>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
<repositories>
<repository>
<id>spring-releases</id>
<url>https://repo.spring.io/libs-release</url>
</pluginRepository>
</pluginRepositories>
-</project>
+</project>
\ No newline at end of file
--- /dev/null
+<!--
+================================================================================
+Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+================================================================================
+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=========================================================
+
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
+-->
+<?xml version="1.0" encoding="UTF-8"?>
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+ <profiles>
+ <profile>
+ <id>open-ecomp</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>osecomp-nexus-releases</id>
+ <name>OSECOMP Release Repository</name>
+ <url>https://ecomp-nexus:8443/repository/maven-releases</url>
+ </repository>
+ <repository>
+ <id>osecomp-nexus-snapshots</id>
+ <name>OSECOMP Snapshot Repository</name>
+ <url>https://ecomp-nexus:8443/repository/maven-snapshots</url>
+ </repository>
+ <repository>
+ <id>eclipse</id>
+ <url>https://repo.eclipse.org/content/repositories/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ </profile>
+
+ </profiles>
+
+ <activeProfiles>
+ <activeProfile>open-ecomp</activeProfile>
+ </activeProfiles>
+
+ <servers>
+ <server>
+ <id>osecomp-nexus</id>
+ <username>${openecomp.nexus.user}</username>
+ <password>${openecomp.nexus.password}</password>
+ </server>
+ <server>
+ <id>osecomp-nexus-releases</id>
+ <username>${openecomp.nexus.user}</username>
+ <password>${openecomp.nexus.password}</password>
+ </server>
+ <server>
+ <id>osecomp-nexus-snapshots</id>
+ <username>${openecomp.nexus.user}</username>
+ <password>${openecomp.nexus.password}</password>
+ </server>
+ <server>
+ <username>${openecomp.nexus.user}</username>
+ <password>${openecomp.nexus.password}</password>
+ <id>dcae-javadoc</id>
+ </server>
+
+ </servers>
+
+</settings>
--- /dev/null
+<!--
+================================================================================
+Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2018 Nokia. All rights reserved.
+================================================================================
+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=========================================================
+-->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+ <id>bundle</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/scripts</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>**/*.sh</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>conf</outputDirectory>
+ <includes>
+ <include>**/defaultSnmpMappingFile.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <scope>runtime</scope>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>false</unpack>
+ <outputDirectory>lib</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+</assembly>
private final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
private String enterpriseId;
- @Value("${defaultMappingFileName}")
- private String defaulMappingFileName;
+ @Value("${defaultEnterpriseId}")
+ private String defaultEnterpriseId;
private Map<String, Smooks> eventToSmooksMapping = new ConcurrentHashMap<>();
public UniversalEventAdapter() {
if (VESAdapterInitializer.getMappingFiles().containsKey(enterpriseId)) {
configFileData = VESAdapterInitializer.getMappingFiles().get(enterpriseId);
- LOGGER.debug("Using Mapping file as Mapping file is not available for Enterprise Id:{}",enterpriseId);
+ LOGGER.debug("Using Mapping file as Mapping file is available for Enterprise Id:{}",enterpriseId);
} else {
- configFileData = VESAdapterInitializer.getMappingFiles().get(defaulMappingFileName);
+ configFileData = VESAdapterInitializer.getMappingFiles().get(defaultEnterpriseId);
LOGGER.debug("Using Default Mapping file as Mapping file is not available for Enterprise Id:{}",enterpriseId);
}
+++ /dev/null
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.universalvesadapter.configs;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * Configuration for universal adapter service
- *
- * @author kmalbari
- *
- */
-@Component
-public class UniversalEventConfiguration{
-
- private final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
-
- @Value("${universal.configFiles}")
- private String configFiles;
-
- private Map<String, String> eventToConfigFileMap = new ConcurrentHashMap<>();
-
-
- /**
- * Returns config file for a particular event from the mapping.
- * If mapping is empty, populates its
- *
- * @param eventType
- *
- * @return config file name
- */
- public String getConfigForEvent(String eventType){
- LOGGER.debug("Getting config file name for event:" + eventType);
- if(null != configFiles && eventToConfigFileMap.isEmpty()){
- for(String entry : configFiles.split(",")){
- eventToConfigFileMap.put(entry.split(":")[0], entry.split(":")[1]);
- }
- LOGGER.debug("Populated mappings for event type to config files");
- }
-
- return (null == eventToConfigFileMap.get(eventType)) ? "default" : eventToConfigFileMap.get(eventType) ;
-
- }
-
-
-}
private final Logger LOGGER = LoggerFactory.getLogger(Creator.class);
private DMaaPMRFactory dMaaPMRFactoryInstance;
- private String hostname;
+ private String dmaaphost;
private String publisherTopic;
private String subcriberTopic;
private DmaapConfig dmaapConfig;
this.dmaapConfig = dmaapConfig;
}
+ public DmaapConfig getDmaapConfig() {
+ return dmaapConfig;
+ }
+
+
public Creator() {
}
public void propertyFileInitializer() {
- this.hostname = dmaapConfig.getHostname();
+ this.dmaaphost = dmaapConfig.getDmaaphost();
this.publisherTopic = dmaapConfig.getPublisherTopic();
this.subcriberTopic = dmaapConfig.getSubscriberTopic();
this.dMaaPMRFactoryInstance = DMaaPMRFactory.create();
- LOGGER.info("The Hostname of DMaap is :" + hostname);
+ LOGGER.info("The Hostname of DMaap is :" + dmaaphost);
}
propertyFileInitializer();
DMaaPMRPublisherConfig dMaaPMRPublisherConfig = null;
try {
- dMaaPMRPublisherConfig = new DMaaPMRPublisherConfig.Builder(hostname, publisherTopic,dmaapConfig).build();
+ dMaaPMRPublisherConfig = new DMaaPMRPublisherConfig.Builder(dmaaphost, publisherTopic,dmaapConfig).build();
} catch (IOException e) {
LOGGER.error("failed or interrupted I/O operations while creating publisher config:{}",e.getCause());
}
propertyFileInitializer();
DMaaPMRSubscriberConfig dMaaPMRSubscriberConfig = null;
try {
- dMaaPMRSubscriberConfig = new DMaaPMRSubscriberConfig.Builder(hostname, subcriberTopic, dmaapConfig).build();
+ dMaaPMRSubscriberConfig = new DMaaPMRSubscriberConfig.Builder(dmaaphost, subcriberTopic, dmaapConfig).build();
} catch (IOException e) {
LOGGER.error("failed or interrupted I/O operations while creating subcriber config:{}",e.getCause());
import org.onap.universalvesadapter.dmaap.MRSubcriber.DMaaPMRSubscriber;
import org.onap.universalvesadapter.exception.DMaapException;
import org.onap.universalvesadapter.exception.VesException;
+import org.onap.universalvesadapter.utils.DmaapConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@Component
private static List<String> list = new LinkedList<String>();
@Autowired
private UniversalEventAdapter eventAdapter;
+ @Autowired
+ private DmaapConfig dmaapConfig;
/**
* It fetches events from DMaap in JSON, transforms JSON to VES format and
throws InterruptedException {
LOGGER.info("fetch and publish from and to Dmaap started");
+ int pollingInternalInt=dmaapConfig.getPollingInterval();
+ LOGGER.info("The Polling Interval in Milli Second is :" +pollingInternalInt);
while (true) {
synchronized (this) {
for (String incomingJsonString : dMaaPMRSubscriber.fetchMessages().getFetchedMessages()) {
}
if (list.size() == 0) {
- Thread.sleep(2000);
+ Thread.sleep(pollingInternalInt);
}
LOGGER.debug("number of messages to be converted :{}", list.size());
package org.onap.universalvesadapter.service;
import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
-
import org.apache.commons.codec.binary.Hex;
+import org.onap.universalvesadapter.dmaap.Creator;
+import org.onap.universalvesadapter.utils.DmaapConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.context.ApplicationContext;
import org.springframework.core.Ordered;
+import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
//AdapterInitializer
@Component
public class VESAdapterInitializer implements CommandLineRunner, Ordered {
private static final Logger LOGGER = LoggerFactory.getLogger(VESAdapterInitializer.class);
+
+ @Autowired
+ private Creator creator;
+ @Autowired
+ private DmaapConfig dmaapConfig;
@Value("${spring.datasource.url}")
String dBurl;
@Value("${spring.datasource.username}")
String user;
@Value("${spring.datasource.password}")
String pwd;
+ @Value("${defaultMappingFilelocation}")
+ String defaultMappingFileLocation;
+ @Value("${MappingFileTableName}")
+ String MappingFileTableName;
+ @Value("${defaultEnterpriseId}")
+ String defaultEnterpriseId;
+ @Value("${server.port}")
+ String serverPort;
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
+
private static Map<String, String> mappingFiles = new HashMap<String, String>();
private static Map<String, String> env;
private static String url;
public static String retString;
public static String retCBSString;
-
+ public static String configFile = "/opt/app/KV-Configuration.json";
+ byte[] bytesArray = null;
+ @Autowired private ApplicationContext applicationContext;
+
@Override
public void run(String... args) throws Exception {
-
- fetchMappingFile();
- getconsul();
-
- }
-
- private void getconsul() {
-
env = System.getenv();
for (Map.Entry<String, String> entry : env.entrySet()) {
LOGGER.info(entry.getKey() + ":" + entry.getValue());
}
- if (env.containsKey("CONSUL_HOST") && env.containsKey("CONFIG_BINDING_SERVICE")) {
- LOGGER.info(">>>Dynamic configuration to be fetched from ConfigBindingService");
- url = env.get("CONSUL_HOST") + ":8500/v1/catalog/service/" + env.get("CONFIG_BINDING_SERVICE");
-
- retString = executecurl(url);
-
- } else {
-
- LOGGER.info(">>>Static configuration to be used");
- final String url = "http://localhost:8085/start";
- final String USER_AGENT = "Mozilla/5.0";
-
- try {
- URL obj = new URL(url);
- HttpURLConnection httpURLConnection = (HttpURLConnection) obj.openConnection();
-
- // optional default is GET
- httpURLConnection.setRequestMethod("GET");
-
- // add request header
- httpURLConnection.setRequestProperty("User-Agent", USER_AGENT);
-
- int responseCode = httpURLConnection.getResponseCode();
- LOGGER.info("Sending 'GET' request to URL : " + url);
- LOGGER.info("Response Code : " + responseCode);
- BufferedReader in = new BufferedReader(new InputStreamReader(httpURLConnection.getInputStream()));
- String inputLine;
- StringBuffer response = new StringBuffer();
-
- while ((inputLine = in.readLine()) != null) {
- response.append(inputLine);
- }
- in.close();
-
- // print result
- LOGGER.info("The result is :" + response.toString());
-
- } catch (Exception e) {
- LOGGER.error("Error occured due to :" + e.getMessage());
- e.printStackTrace();
+ if (env.containsKey("CONSUL_HOST") && env.containsKey("CONFIG_BINDING_SERVICE") && env.containsKey("HOSTNAME")) {
+ //TODO - Add logic to talk to Consul and CBS to get the configuration. For now, we will refer to configuration coming from docker env parameters
+
+ LOGGER.info(">>>Dynamic configuration to be used");
+
+ if( (env.get("MR_DMAAPHOST")==null ||
+ (env.get("MR_DMAAPHOST")==null ||
+ (env.get("MR_DEFAULT_PORT_NUMBER")==null ||
+ (env.get("URL_JDBC")==null ||
+ (env.get("JDBC_USERNAME")==null ||
+ (env.get("JDBC_PASSWORD")==null ))))))) {
+
+
+ LOGGER.error("Some docker environment parameter is missing. Sample Usage is -\n sudo docker run -d -p 8085:8085/tcp --env URL_JDBC=jdbc:postgresql://10.53.172.129:5432/dummy --env JDBC_USERNAME=ngpuser --env JDBC_PASSWORD=root --env MR_DMAAPHOST=10.10.10.10 --env MR_DEFAULT_PORT_NUMBER=3904 --env CONSUL_HOST=10.53.172.109 --env HOSTNAME=mvp-dcaegen2-collectors-ves --env CONFIG_BINDING_SERVICE=config_binding_service -e DMAAPHOST='10.53.172.156' onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:latest");
+ System.exit(SpringApplication.exit(applicationContext, () -> {LOGGER.error("Application stoped due to missing default mapping file");return-1;}));
+
+ }else {
+
+
+
+ dmaapConfig.setDmaaphost(env.get("MR_DMAAPHOST"));
+ dmaapConfig.setDEFAULT_PORT_NUMBER(Integer.parseInt(env.get("MR_DEFAULT_PORT_NUMBER")));
+ creator.setDmaapConfig(dmaapConfig);
+
+ dBurl=env.get("URL_JDBC");
+ user=env.get("JDBC_USERNAME");
+ pwd=env.get("JDBC_PASSWORD");
}
+
+
+ } else {
+ LOGGER.info(">>>Static configuration to be used");
}
+ prepareDatabase();
+ fetchMappingFile();
+
+ LOGGER.info("Triggering controller's start url ");
+ executecurl("http://localhost:"+serverPort+"/start");
+ }
+ private void getconsul() {
+
+ //TODO
+ }
+
+ public static boolean verifyConfigChange() {
+ //TODO
+ return false;
}
- private String executecurl(String url) {
+ public static void getCBS() {
+ //TODO
+ }
+ public static void writefile(String retCBSString) {
+ //TODO
+ }
+
+ private static String executecurl(String url) {
+
+ LOGGER.info("Running curl command for url:"+url);
String[] command = { "curl", "-v", url };
ProcessBuilder process = new ProcessBuilder(command);
Process p;
}
public void fetchMappingFile() {
- String query = "SELECT * FROM mapping_file";
- try (Connection con = DriverManager.getConnection(dBurl, user, pwd);PreparedStatement pstmt = con.prepareStatement(query);ResultSet rs = pstmt.executeQuery();) {
+
+ try (Connection con = DriverManager.getConnection(dBurl, user, pwd)) {
LOGGER.info("Retrieving data from DB");
+ PreparedStatement pstmt = con.prepareStatement("SELECT * FROM mapping_file");
+ ResultSet rs = pstmt.executeQuery();
// parsing the column each time is a linear search
int column1Pos = rs.findColumn("enterpriseid");
int column2Pos = rs.findColumn("mappingfilecontents");
String data = new String(bytes, "UTF-8");
mappingFiles.put(column1, data);
}
- LOGGER.info("DB Initialization Completed..." + mappingFiles.size());
+ LOGGER.info("DB Initialization Completed, Total # Mappingfiles are" + mappingFiles.size());
} catch (Exception e) {
LOGGER.error("Error occured due to :" + e.getMessage());
e.printStackTrace();
}
}
-
+
+
+ private void prepareDatabase() throws IOException {
+
+
+ LOGGER.info("The Default Mapping file Location:"+defaultMappingFileLocation.trim());
+
+ if(ClassLoader.getSystemResource(defaultMappingFileLocation.trim())==null){
+ LOGGER.error("Default mapping file " + defaultMappingFileLocation.trim() + " is missing");
+ System.exit(SpringApplication.exit(applicationContext, () -> {LOGGER.error("Application stoped due to missing default mapping file");return-1;}));
+ }
+
+ File file = new File(ClassLoader.getSystemResource(defaultMappingFileLocation.trim()).getFile());
+ FileInputStream fileInputStream=null;
+
+ try
+ {
+ bytesArray = new byte[(int) file.length()];
+ fileInputStream = new FileInputStream(file);
+ fileInputStream.read(bytesArray);
+
+ } catch (IOException e1) {
+ LOGGER.error("Exception Occured while reading the default mapping file ,Cause: " + e1.getMessage(), e1);
+ //exit on missing default mapping file
+ System.exit(SpringApplication.exit(applicationContext, () -> {LOGGER.error("Application stoped due to missing default mapping file");return-1;}));
+ }finally {
+ try {
+ fileInputStream.close();
+ }catch (IOException e) {
+ LOGGER.error("Exception while closing file inputstream" + e.getMessage(), e);
+ }
+ }
+
+ try (Connection con = DriverManager.getConnection(dBurl, user, pwd)) {
+ LOGGER.info("Postgresql Connection successful...");
+ LOGGER.debug("1Connection object:"+con.toString());
+ //creating table if not exist
+ PreparedStatement pstmt11=con.prepareStatement("CREATE TABLE IF NOT EXISTS public."+MappingFileTableName+"\r\n" +
+ "(\r\n" +
+ " enterpriseid character varying COLLATE pg_catalog.\"default\" NOT NULL,\r\n" +
+ " mappingfilecontents bytea,\r\n" +
+ " mimetype character varying COLLATE pg_catalog.\"default\",\r\n" +
+ " file_name character varying COLLATE pg_catalog.\"default\",\r\n" +
+ " CONSTRAINT mapping_file_pkey5 PRIMARY KEY (enterpriseid)\r\n" +
+ ")\r\n" +
+ "WITH (\r\n" +
+ " OIDS = FALSE\r\n" +
+ ")\r\n" +
+ "TABLESPACE pg_default;");
+ pstmt11.executeUpdate();
+ LOGGER.info("CREATE TABLE IF NOT EXISTS executed successfully....");
+
+ if((bytesArray.length>0)&&(!bytesArray.toString().equals(""))) {
+ LOGGER.debug("2Connection object:"+con.toString());
+ PreparedStatement pstmt=con.prepareStatement("INSERT INTO "+MappingFileTableName+"(enterpriseid, mappingfilecontents, mimetype, File_Name) VALUES (?, ?, ?, ?) ON CONFLICT (enterpriseid) DO NOTHING;");
+ pstmt.setString(1,defaultEnterpriseId);
+ pstmt.setBytes(2,bytesArray );
+ pstmt.setString(3,"text/xml");
+ pstmt.setString(4, file.getName());
+
+ pstmt.executeUpdate();
+ LOGGER.info("Made sure that default mapping file is present in table");
+ }
+ else {
+ LOGGER.error(file.getName()+" is empty");
+ //exit on empty mapping file
+ System.exit(SpringApplication.exit(applicationContext, () -> {LOGGER.error("Application stoped beacuase default mapping file is empty..");return-1;}));
+ }
+
+
+
+ } catch (SQLException e) {
+ LOGGER.error("Received exception : " + e.getMessage(), e);
+ //exit on SqlException
+ System.exit(SpringApplication.exit(applicationContext, () -> {LOGGER.error("Application Stoped due to ",e.getCause());return-1;}));
+ }
+
+ }
public static Map<String, String> getMappingFiles() {
return mappingFiles;
}
@Override
public int getOrder() {
- return 1;
+ return 0;
}
}
@ConfigurationProperties
public class DmaapConfig {
- @Value("${mr.hostname}")
+ @Value("${mr.dmaaphost}")
@NotEmpty
- private String hostname;
+ private String dmaaphost;
// default port number
@Value("${mr.DEFAULT_PORT_NUMBER}")
@NotEmpty
private int DEFAULT_PORT_NUMBER;
+ @Value("${mr.POLLING_INTERVAL}")
+ @NotEmpty
+ private int pollingInterval;
+
// default to no username
@Value("${mr.DEFAULT_USER_NAME}")
private String DEFAULT_USER_NAME;
@NotEmpty
private String subcriberSUBSCRIBER_MSG_LIMIT_QUERY_PARAM_NAME;
- public void setHostname(String hostname) {
- this.hostname = hostname;
+ public void setDmaaphost(String dmaaphost) {
+ this.dmaaphost = dmaaphost;
}
-
- public String getHostname() {
- return hostname;
+
+ public String getDmaaphost() {
+ return dmaaphost;
}
public int getDEFAULT_PORT_NUMBER() {
this.subcriberSUBSCRIBER_MSG_LIMIT_QUERY_PARAM_NAME = subcriberSUBSCRIBER_MSG_LIMIT_QUERY_PARAM_NAME;
}
+ public int getPollingInterval() {
+ return pollingInterval;
+ }
+
+ public void setPollingInterval(int pollingInterval) {
+ this.pollingInterval = pollingInterval;
+ }
+
+
}
- # DMaaP Config Constants
- #
- #default hostname
+ # ///////////////// DMaaP Config Constants
- mr.hostname=10.53.172.156
- # default port number
+ #default hostname
+ mr.dmaaphost=10.53.172.156
+ # default port number
mr.DEFAULT_PORT_NUMBER=3904
- # default to no username
+ # defaults to no username
mr.DEFAULT_USER_NAME=null
# defaults to no userPassword
mr.DEFAULT_USER_PASSWORD=null
- #defaults to using https protocol
+ #d efaults to using https protocol
mr.DEFAULT_PROTOCOL=http
- #defaults to json content type
+ # defaults to json content type
mr.DEFAULT_CONTENT_TYPE=application/json
mr.DMAAP_URI_PATH_PREFIX=/events/
mr.DMAAP_DEFAULT_CONSUMER_ID=con2
mr.DMAAP_GROUP_PREFIX=grp2
- # // ================== DMaaP MR Constants ============================== //
+#DMaaP MR subscriber thread's polling interval in milli second
+mr.POLLING_INTERVAL=10000
- # ///////////////// Publisher Constants
- #Dmaap Publisher Topic
- mr.publisher.topic=unauthenticated.SEC_FAULT_OUTPUT
- #mr.publisher.topic=TEST-TOPIC1
- #mr.publisher.topic=unauthenticated.SEC_MEASUREMENT_OUTPUT
- #disable batching by default
- mr.publisher.DEFAULT_PUBLISHER_MAX_BATCH_SIZE=1
- # default recovery messages size
- mr.publisher.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE=100000
- #number of retries when flushing messages
- mr.publisher.PUBLISHER_MAX_FLUSH_RETRIES_ON_CLOSE=5
- #delay in retrying for flushing messages
- mr.publisher.PUBLISHER_DELAY_MS_ON_RETRIES_ON_CLOSE=5000
- #////////////////// Subscriber Constants
- #Dmaap Subcriber Topic
- #mr.subscriber.topic=ONAP-COLLECTOR-SNMPTRAP
- mr.subscriber.topic=ONAP-COLLECTOR-SNMPTRAP
- #mr.subscriber.topic=TEST-TOPIC2
- mr.subcriber.DEFAULT_SUBSCRIBER_TIMEOUT_MS=-1
- mr.subcriber.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT=-1
- mr.subcriber.DEFAULT_SUBSCRIBER_GROUP_PREFIX=grp2
- mr.subcriber.SUBSCRIBER_TIMEOUT_QUERY_PARAM_NAME=timeout
- mr.subcriber.SUBSCRIBER_MSG_LIMIT_QUERY_PARAM_NAME=limit
\ No newline at end of file
+# ///////////////// Publisher Constants
+
+#Dmaap Publisher Topic
+mr.publisher.topic=unauthenticated.SEC_FAULT_OUTPUT
+#disable batching by default
+mr.publisher.DEFAULT_PUBLISHER_MAX_BATCH_SIZE=1
+# default recovery messages size
+mr.publisher.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE=100000
+#number of retries when flushing messages
+mr.publisher.PUBLISHER_MAX_FLUSH_RETRIES_ON_CLOSE=5
+#delay in retrying for flushing messages
+mr.publisher.PUBLISHER_DELAY_MS_ON_RETRIES_ON_CLOSE=5000
+
+
+#////////////////// Subscriber Constants
+
+#Dmaap Subcriber Topic
+mr.subscriber.topic=ONAP-COLLECTOR-SNMPTRAP
+mr.subcriber.DEFAULT_SUBSCRIBER_TIMEOUT_MS=-1
+mr.subcriber.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT=-1
+mr.subcriber.DEFAULT_SUBSCRIBER_GROUP_PREFIX=grp2
+mr.subcriber.SUBSCRIBER_TIMEOUT_QUERY_PARAM_NAME=timeout
+mr.subcriber.SUBSCRIBER_MSG_LIMIT_QUERY_PARAM_NAME=limit
\ No newline at end of file
+++ /dev/null
-{
- "entries" : [
- {
- "priority" : 1,
- "evaluation" : {
- "operand" : "EQUALS",
- "field" : "notify OID",
- "value" : ".1.3.6.1.4.1.74.2.46.12.1.1",
- "datatype" : "string",
- "lhs" : null,
- "rhs" : null
- },
- "result" : "snmp"
- }
- ]
-}
\ No newline at end of file
+++ /dev/null
-{
- "entries" : [
- {
- "priority" : 1,
- "evaluation" : {
- "operand" : "EQUALS",
- "field" : "notify OID",
- "value" : ".1.3.6.1.4.1.74.2.46.12.1.1",
- "datatype" : "string",
- "lhs" : null,
- "rhs" : null
- },
- "result" : "snmpTrapToVes.xml"
- },
- {
- "priority" : 2,
- "evaluation" : {
- "operand" : "AND",
- "field" : null,
- "value" : null,
- "datatype" : null,
- "lhs" : {
- "operand" : "OR",
- "field" : null,
- "value" : null,
- "datatype" : null,
- "lhs" : {
- "operand" : "EQUALS",
- "field" : "domain",
- "value" : "snmp-heartbeat",
- "datatype" : "string",
- "lhs" : null,
- "rhs" : null
- },
- "rhs" : {
- "operand" : "EQUALS",
- "field" : "domain",
- "value" : "snmp-fault",
- "datatype" : "string",
- "lhs" : null,
- "rhs" : null
- }
- },
- "rhs" : {
- "operand" : "EQUALS",
- "field" : "trap version",
- "value" : "1.2",
- "datatype" : "float",
- "lhs" : null,
- "rhs" : null
- }
- },
- "result" : "smooks.config"
- }
- ]
-}
\ No newline at end of file
server.port=8085
-
logging.level.org.springframework.web=ERROR
-defaultMappingFileName=defaultSnmpMappingFile
-universal.configFiles=snmp:snmpTrapToVes.xml,default:defaultConfig.xml
-
-mapperConfig.file=../UniversalVesAdapter/src/main/resources/MapperConfig.json
dmaap.mr_props=DMaapMR.properties
-#DEV Machine DB Details
-#spring.datasource.url=jdbc:postgresql://10.49.16.19:5432/dummy
-#spring.datasource.username=postgres
-#spring.datasource.password=root
-
#Lab Details
spring.datasource.url=jdbc:postgresql://10.53.172.129:5432/dummy
spring.datasource.username=ngpuser
-spring.datasource.password=root
\ No newline at end of file
+spring.datasource.password=root
+
+#MappingFileDetails
+defaultMappingFilelocation=defaultSnmpMappingFile.xml
+defaultEnterpriseId=default
+
+MappingFileTableName=mapping_file
\ No newline at end of file
--- /dev/null
+#!/bin/sh
+java -cp "./conf:./lib/*" org.onap.universalvesadapter.Application
\ No newline at end of file
import java.util.Map;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
-
@RunWith(SpringRunner.class)
@SpringBootTest(classes=Application.class)
+@Ignore
public class UniversalEventAdapterTest {
private final Logger eLOGGER = LoggerFactory.getLogger(this.getClass());
}
- @Test
+
+ @Test
public void testtransform() {
StringBuffer incomingJsonString = new StringBuffer("{ ")
.append("\"protocol version\":\"v2c\", ")
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.onap.universalvesadapter.Application;
@RunWith(SpringRunner.class)
@SpringBootTest(classes=Application.class)
@AutoConfigureMockMvc
+@Ignore
public class VesControllerTest {
@Autowired
<httpclient.version>4.5.6</httpclient.version>
<commons.lang3.version>3.5</commons.lang3.version>
- <docker.maven.version>1.0.0</docker.maven.version>
+ <docker.maven.version>1.1.1</docker.maven.version>
<!--TESTING DEPENDENCIES -->
<junit.version>4.12</junit.version>
<!-- PLUGINS VERSIONS -->
<compiler.plugin.version>3.3</compiler.plugin.version>
- <surefire.plugin.version>2.19.1</surefire.plugin.version>
+ <!-- <surefire.plugin.version>2.19.1</surefire.plugin.version> -->
<failsafe.plugin.version>2.19.1</failsafe.plugin.version>
<bundle.plugin.version>2.5.4</bundle.plugin.version>
<autorun.plugin.version>1.7</autorun.plugin.version>
<eclipe.plugin.version>2.10</eclipe.plugin.version>
<findbugs.plugin.version>3.0.2</findbugs.plugin.version>
<pmd.plugin.version>3.5</pmd.plugin.version>
- <surefire.report.plugin.version>2.19.1</surefire.report.plugin.version>
+ <!-- <surefire.report.plugin.version>2.19.1</surefire.report.plugin.version> -->
<checkstyle.plugin.version>2.16</checkstyle.plugin.version>
<javadoc.plugin.version>2.10.4</javadoc.plugin.version>
<source.plugin.version>2.4</source.plugin.version>
<dependencies>
<!-- LOGGING -->
- <dependency>
+ <!-- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<!-- UTILITIES -->
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.version}</version>
<configuration>
- <skipDockerBuild>true</skipDockerBuild>
+ <skipDockerBuild>false</skipDockerBuild>
</configuration>
</plugin>
</plugins>
Code Review / dcaegen2 / services / mapper.git / commitdiff