Squashed commit of the following:

commit 1b4af2baa406841631ef7c3bf6917be654f793e1
Author: Marco Platania <platania@research.att.com>
Date:   Mon Jan 21 11:21:08 2019 -0500

    Correct style issues

    Change-Id: Icadd241369437b6c1e868285f79b31be2d730871
    Issue-ID: INT-824
    Signed-off-by: Marco Platania <platania@research.att.com>

commit 1b019bf2fcdddeae852f465e56255bb00c5c19d7
Author: Marco Platania <platania@research.att.com>
Date:   Mon Jan 21 10:36:52 2019 -0500

    Correct path to POM files

    Change-Id: Ie98617eaab6ae65c982bb15e71f72b090f45e553
    Issue-ID: INT-824
    Signed-off-by: Marco Platania <platania@research.att.com>

commit e51da00e8208fad91ca3be8808b0e7b590d64627
Author: Marco Platania <platania@research.att.com>
Date:   Mon Jan 21 10:24:19 2019 -0500

    Add new API to vPacketGen

    - Add new API to modify the number of active streams
    - Change POM structure accordingly

    Change-Id: Iba45ce2ff5fa9fb418e3dd0dffb75c785dc20f70
    Issue-ID: INT-824
    Signed-off-by: Marco Platania <platania@research.att.com>

Change-Id: Iefbfce87b4f98a35b81585c2346975256ae988a4
Signed-off-by: Marco Platania <platania@research.att.com>

3 files changed, 0 insertions, 393 deletions

diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
deleted file mode 100644
index bd1d2ac7..00000000
--- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2016 Cisco and/or its affiliates.
-  ~
-  ~ 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.
-  -->
-
-<!--
-    Modifications copyright © 2017 AT&T Intellectual Property
--->
-
-<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">
-
-
-<parent>
-    <groupId>org.onap.demo.vnf</groupId>
-    <artifactId>demo-aggregator</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-    <relativePath>../../../../pom.xml</relativePath>
-</parent>
-
-    <properties>
-        <nexusproxy>http://nexus.fd.io/content</nexusproxy>
-        <start.script.template>
-#!/bin/sh -
-STATUS=100
-
-while [ $STATUS -eq 100 ]
-do
-  %s
-  STATUS=$?
-  echo "Honeycomb exited with status: $STATUS"
-  if [ $STATUS -eq 100 ]
-  then
-    echo "Restarting..."
-  fi
-done
-        </start.script.template>
-        <exec.parameters>-Xms32m -Xmx128m -XX:MetaspaceSize=32m -XX:MaxMetaspaceSize=128m</exec.parameters>
-        <exec.parameters.minimal>-client -Xms20m -Xmx32m -XX:MetaspaceSize=5m -XX:MaxMetaspaceSize=32m -XX:MaxMetaspaceExpansion=1m -Xss512k -XX:+UseSerialGC -Djava.compiler=NONE -Xverify:none -noverify</exec.parameters.minimal>
-        <debug.parameters>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005</debug.parameters>
-        <guice.version>4.1.0</guice.version>
-        <guice.config.version>1.2.0</guice.config.version>
-        <restconf.version>1.3.2-Beryllium-SR2</restconf.version>
-        <netconf.version>1.0.2-Beryllium-SR2</netconf.version>
-        <jersey.version>1.19.1</jersey.version>
-        <jetty.version>9.3.11.v20160721</jetty.version>
-        <servlet.version>3.1.0</servlet.version>
-        <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
-        <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
-        <!-- Used by mdsal as provided/runtime dependency-->
-        <osgi.core.version>5.0.0</osgi.core.version>
-    </properties>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>hc-onap</artifactId>
-    <packaging>pom</packaging>
-
-    <!-- Generate executable shell script -->
-  <modules>
-    <module>../sample-plugin-api</module>
-    <module>../sample-plugin-impl</module>
-    <module>../sample-distribution</module>
-  </modules>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.3</version>
-                    <configuration>
-                        <!-- Use google's error-prone static analysis-->
-                        <compilerId>javac-with-errorprone</compilerId>
-                        <forceJavacCompilerUse>true</forceJavacCompilerUse>
-                        <showWarnings>true</showWarnings>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                    </configuration>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.codehaus.plexus</groupId>
-                            <artifactId>plexus-compiler-javac-errorprone</artifactId>
-                            <version>2.5</version>
-                        </dependency>
-                        <!-- override plexus-compiler-javac-errorprone's dependency on
-                             Error Prone with the latest version -->
-                        <dependency>
-                            <groupId>com.google.errorprone</groupId>
-                            <artifactId>error_prone_core</artifactId>
-                            <version>2.0.9</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.6</version>
-                    <configuration>
-                        <archive>
-                            <manifest>
-                                <mainClass>${main.class}</mainClass>
-                                <addClasspath>true</addClasspath>
-                                <classpathPrefix>lib/</classpathPrefix>
-                                <useUniqueVersions>false</useUniqueVersions>
-                                <classpathMavenRepositoryLayout>true</classpathMavenRepositoryLayout>
-                            </manifest>
-                            <manifestEntries>
-                                <Class-Path>config/ cert/</Class-Path>
-                            </manifestEntries>
-                        </archive>
-                    </configuration>
-                </plugin>
-
-                <!-- Copy all dependencies -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.10</version>
-                    <executions>
-                        <execution>
-                            <id>copy-dependencies</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>copy-dependencies</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                                <useBaseVersion>true</useBaseVersion>
-                                <useRepositoryLayout>true</useRepositoryLayout>
-                                <excludeArtifactIds>yang-jmx-generator</excludeArtifactIds>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>unpack-configuration</id>
-                            <phase>prepare-package</phase>
-                            <goals>
-                                <goal>unpack-dependencies</goal>
-                            </goals>
-                            <configuration>
-                                <includes>**/honeycomb-minimal-resources/</includes>
-                                <outputDirectory>${project.build.outputDirectory}/</outputDirectory>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <!-- Generate shell script -->
-                <plugin>
-                    <groupId>org.codehaus.gmaven</groupId>
-                    <artifactId>groovy-maven-plugin</artifactId>
-                    <version>2.0</version>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>execute</goal>
-                            </goals>
-                            <configuration>
-                                <!-- TODO add remote debug option -->
-                                <!-- TODO add clean option -->
-                                <!-- TODO add shutdown script -->
-                                <!-- TODO add restart script -->
-                                <!-- TODO pass options to JVM? -->
-                                <source>
-                                    import java.nio.file.Paths
-
-                                    log.info "Generating shell exec script"
-                                    def scriptTemplate = properties.getOrDefault("start.script.template", "")
-                                    def args = properties.getOrDefault("exec.parameters", "")
-                                    log.debug "Additional shell exec script properties: ${args}"
-                                    def javaArgs = "${args} -jar \$(dirname \$0)/${project.artifactId}-${project.version}.jar"
-                                    def scriptParent = Paths.get(project.build.outputDirectory, "honeycomb-minimal-resources")
-                                    scriptParent.toFile().mkdirs()
-                                    def scriptContent = "java " + javaArgs
-                                    log.info "Generating shell exec script as ${scriptContent}"
-                                    def scriptPath = Paths.get(scriptParent.toString(), "honeycomb")
-                                    log.info "Writing shell exec script to ${scriptPath}"
-                                    scriptPath.toFile().text = String.format(scriptTemplate, scriptContent)
-                                    scriptPath.toFile().setExecutable(true)
-
-                                    scriptPath = Paths.get(scriptParent.toString(), "honeycomb-start")
-                                    log.info "Writing shell exec script to ${scriptPath}"
-                                    scriptPath.toFile().text = "\$(dirname \$0)/honeycomb &amp;"
-                                    scriptPath.toFile().setExecutable(true)
-
-                                    def debug_args = properties.getOrDefault("debug.parameters", "")
-                                    def debugScriptContent = "java" + " ${debug_args} " + javaArgs
-                                    log.info "Generating shell debug script as ${debugScriptContent}"
-                                    scriptPath = Paths.get(scriptParent.toString(), "honeycomb-debug")
-                                    log.info "Writing shell debug script to ${scriptPath}"
-                                    scriptPath.toFile().text = String.format(scriptTemplate, debugScriptContent)
-                                    scriptPath.toFile().setExecutable(true)
-                                </source>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <!-- Build archives -->
-                <plugin>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.5.3</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>io.fd.honeycomb.common</groupId>
-                            <artifactId>minimal-assembly-descriptor</artifactId>
-                            <version>1.16.9</version>
-                        </dependency>
-                    </dependencies>
-                    <executions>
-                        <execution>
-                            <id>create-archive</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>single</goal>
-                            </goals>
-                            <configuration>
-                                <descriptorRefs>
-                                    <descriptorRef>honeycomb-minimal</descriptorRef>
-                                </descriptorRefs>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <phase>none</phase>
-                        </execution>
-                    </executions>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-</project>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
deleted file mode 100755
index fa79f4cb..00000000
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Modifications copyright © 2017 AT&T Intellectual Property
--->
-
-<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">
-
-<parent>
-    <groupId>org.onap.demo.vnf</groupId>
-    <artifactId>hc-onap</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-    <relativePath>../parent-pom/pom.xml</relativePath>
-</parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>sample-distribution</artifactId>
-
-  <properties>
-      <main.class>io.fd.honeycomb.vpp.integration.distro.Main</main.class>
-      <v3po.version>1.16.9</v3po.version>
-      <lisp.version>1.16.9</lisp.version>
-      <vpp.common.min.distro.version>1.16.9</vpp.common.min.distro.version>
-      <vppnsh.version>1.16.9</vppnsh.version>
-      <honeycomb.infra.version>1.16.9</honeycomb.infra.version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>groovy-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-      </plugin>
-
-<plugin>
-  <groupId>org.apache.maven.plugins</groupId>
-  <artifactId>maven-deploy-plugin</artifactId>
-  <configuration>
-    <skip>false</skip>
-  </configuration>
-</plugin>
-
-<plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>false</skip>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
-      <artifactId>minimal-distribution</artifactId>
-      <version>${vpp.common.min.distro.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb.v3po</groupId>
-      <artifactId>v3po2vpp</artifactId>
-      <version>${v3po.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb.lisp</groupId>
-      <artifactId>lisp2vpp</artifactId>
-      <version>${lisp.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb.vppnsh</groupId>
-      <artifactId>vppnsh-impl</artifactId>
-      <version>${vppnsh.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb.common</groupId>
-      <artifactId>sample-plugin-impl</artifactId>
-      <version>${honeycomb.infra.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/src/main/java/io/fd/honeycomb/tutorial/Main.java b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/src/main/java/io/fd/honeycomb/tutorial/Main.java
deleted file mode 100755
index d16c4221..00000000
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/src/main/java/io/fd/honeycomb/tutorial/Main.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * 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.
- */
-
-package io.fd.honeycomb.vpp.integration.distro;
-
-import com.google.common.collect.Lists;
-import com.google.inject.Module;
-import io.fd.honeycomb.lisp.LispModule;
-import io.fd.honeycomb.translate.v3po.V3poModule;
-import io.fd.honeycomb.vpp.distro.VppCommonModule;
-import io.fd.honeycomb.vppnsh.impl.VppNshModule;
-import java.util.List;
-
-public class Main {
-
-    public static void main(String[] args) {
-        final List<Module> sampleModules = Lists.newArrayList(io.fd.honeycomb.infra.distro.Main.BASE_MODULES);
-
-        // All the plugins should be listed here
-        sampleModules.add(new VppCommonModule());
-        sampleModules.add(new V3poModule());
-        sampleModules.add(new LispModule());
-        sampleModules.add(new VppNshModule());
-        sampleModules.add(new io.fd.honeycomb.tutorial.Module());
-
-        io.fd.honeycomb.infra.distro.Main.init(sampleModules);
-    }
-}