From 3bf047e64a1121208719e7603bf91c69d532ecf8 Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Mon, 21 Jan 2019 12:12:39 -0500 Subject: Squashed commit of the following: commit 1b4af2baa406841631ef7c3bf6917be654f793e1 Author: Marco Platania Date: Mon Jan 21 11:21:08 2019 -0500 Correct style issues Change-Id: Icadd241369437b6c1e868285f79b31be2d730871 Issue-ID: INT-824 Signed-off-by: Marco Platania commit 1b019bf2fcdddeae852f465e56255bb00c5c19d7 Author: Marco Platania 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 commit e51da00e8208fad91ca3be8808b0e7b590d64627 Author: Marco Platania 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 Change-Id: Iefbfce87b4f98a35b81585c2346975256ae988a4 Signed-off-by: Marco Platania --- .../sample_plugin/parent-pom/pom.xml | 255 --------------------- .../sample_plugin/sample-distribution/pom.xml | 97 -------- .../main/java/io/fd/honeycomb/tutorial/Main.java | 41 ---- 3 files changed, 393 deletions(-) delete mode 100644 vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml delete mode 100755 vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml delete mode 100755 vnfs/honeycomb_plugin/sample_plugin/sample-distribution/src/main/java/io/fd/honeycomb/tutorial/Main.java (limited to 'vnfs/honeycomb_plugin/sample_plugin') 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 @@ - - - - - - - - - - org.onap.demo.vnf - demo-aggregator - 1.4.0-SNAPSHOT - ../../../../pom.xml - - - - http://nexus.fd.io/content - -#!/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 - - -Xms32m -Xmx128m -XX:MetaspaceSize=32m -XX:MaxMetaspaceSize=128m - -client -Xms20m -Xmx32m -XX:MetaspaceSize=5m -XX:MaxMetaspaceSize=32m -XX:MaxMetaspaceExpansion=1m -Xss512k -XX:+UseSerialGC -Djava.compiler=NONE -Xverify:none -noverify - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 - 4.1.0 - 1.2.0 - 1.3.2-Beryllium-SR2 - 1.0.2-Beryllium-SR2 - 1.19.1 - 9.3.11.v20160721 - 3.1.0 - 0.8.2-Beryllium-SR2 - 1.3.2-Beryllium-SR2 - - 5.0.0 - - - 4.0.0 - hc-onap - pom - - - - ../sample-plugin-api - ../sample-plugin-impl - ../sample-distribution - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - - javac-with-errorprone - true - true - 1.8 - 1.8 - - - - org.codehaus.plexus - plexus-compiler-javac-errorprone - 2.5 - - - - com.google.errorprone - error_prone_core - 2.0.9 - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - - ${main.class} - true - lib/ - false - true - - - config/ cert/ - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory}/lib - true - true - yang-jmx-generator - - - - unpack-configuration - prepare-package - - unpack-dependencies - - - **/honeycomb-minimal-resources/ - ${project.build.outputDirectory}/ - - - - - - - - org.codehaus.gmaven - groovy-maven-plugin - 2.0 - - - package - - execute - - - - - - - - - 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 &" - 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) - - - - - - - - - maven-assembly-plugin - 2.5.3 - - - io.fd.honeycomb.common - minimal-assembly-descriptor - 1.16.9 - - - - - create-archive - package - - single - - - - honeycomb-minimal - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - none - - - - true - - - - - - - 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 @@ - - - - - - - - org.onap.demo.vnf - hc-onap - 1.4.0-SNAPSHOT - ../parent-pom/pom.xml - - - 4.0.0 - sample-distribution - - - io.fd.honeycomb.vpp.integration.distro.Main - 1.16.9 - 1.16.9 - 1.16.9 - 1.16.9 - 1.16.9 - - - - - - maven-compiler-plugin - - - org.codehaus.gmaven - groovy-maven-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.maven.plugins - maven-dependency-plugin - - - maven-assembly-plugin - - - - org.apache.maven.plugins - maven-deploy-plugin - - false - - - - - org.apache.maven.plugins - maven-install-plugin - - false - - - - - - - - - io.fd.honeycomb.vpp - minimal-distribution - ${vpp.common.min.distro.version} - - - io.fd.honeycomb.v3po - v3po2vpp - ${v3po.version} - - - io.fd.honeycomb.lisp - lisp2vpp - ${lisp.version} - - - io.fd.honeycomb.vppnsh - vppnsh-impl - ${vppnsh.version} - - - io.fd.honeycomb.common - sample-plugin-impl - ${honeycomb.infra.version} - - - - 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 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); - } -} -- cgit 1.2.3-korg