From 3168c3d7509bceff43648d4eb40c163dcbc6b3ad Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Wed, 9 May 2018 10:49:30 -0400 Subject: Update POM files for vLB manual scaling - Change version number of HC artifacts to 1.2.0 - Create a deploy script template in POM file - Change HC version number in install scripts Change-Id: If437d5c719a8a5edfa54dc48abfbc34253c5728d Issue-ID: INT-447 Signed-off-by: Marco Platania --- vnfs/vLBMS/apis/health-vnf-onap-plugin/pom.xml | 2 +- .../apis/vlb-business-vnf-onap-plugin/pom.xml | 2 +- vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml | 105 +++++++++++++++++++-- vnfs/vLBMS/scripts/run_streams_dns.sh | 2 +- vnfs/vLBMS/scripts/v_dns_init.sh | 2 +- vnfs/vLBMS/scripts/v_lb_init.sh | 8 +- vnfs/vLBMS/scripts/v_lb_install.sh | 12 +-- vnfs/vLBMS/scripts/v_packetgen_init.sh | 2 +- 8 files changed, 110 insertions(+), 25 deletions(-) (limited to 'vnfs/vLBMS') diff --git a/vnfs/vLBMS/apis/health-vnf-onap-plugin/pom.xml b/vnfs/vLBMS/apis/health-vnf-onap-plugin/pom.xml index 7dbc6641..4b45d684 100755 --- a/vnfs/vLBMS/apis/health-vnf-onap-plugin/pom.xml +++ b/vnfs/vLBMS/apis/health-vnf-onap-plugin/pom.xml @@ -23,7 +23,7 @@ org.onap.demo.vnf.health health-vnf-onap-plugin-aggregator - 1.2.0-SNAPSHOT + 1.2.0 health-vnf-onap-plugin-aggregator pom 4.0.0 diff --git a/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/pom.xml b/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/pom.xml index 08223d76..a522cdb4 100644 --- a/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/pom.xml +++ b/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/pom.xml @@ -23,7 +23,7 @@ org.onap.demo.vnf.vlb vlb-business-vnf-onap-plugin-aggregator - 1.2.0-SNAPSHOT + 1.2.0 vlb-business-vnf-onap-plugin-aggregator pom 4.0.0 diff --git a/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml b/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml index 90f5770b..1e2d1c03 100644 --- a/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml +++ b/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml @@ -2,18 +2,23 @@ - demo-aggregator - 1.2.0-SNAPSHOT - org.onap.demo.vnf - ../../../../pom.xml + io.fd.honeycomb.common + minimal-distribution-parent + 1.17.07 4.0.0 org.onap.demo.vnf.vlb vlb-vnf-onap-distribution - 1.2.0-SNAPSHOT + 1.2.0 + http://nexus.fd.io/content + +#!/bin/sh - +%s + + -Xms128m -Xmx128m io.fd.honeycomb.infra.distro.Main 1.17.07 @@ -35,15 +40,49 @@ + org.apache.maven.plugins maven-compiler-plugin - - - org.codehaus.gmaven - groovy-maven-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 + + + + ${main.class} + true + lib/ + false + true + + + config/ cert/ modules/ yang-mapping/ + + + org.apache.maven.plugins @@ -75,6 +114,53 @@ + + + + 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 @@ -152,6 +238,5 @@ minimal-distribution ${honeycomb.min.distro.version} - diff --git a/vnfs/vLBMS/scripts/run_streams_dns.sh b/vnfs/vLBMS/scripts/run_streams_dns.sh index 86f97b2e..c25c2b57 100644 --- a/vnfs/vLBMS/scripts/run_streams_dns.sh +++ b/vnfs/vLBMS/scripts/run_streams_dns.sh @@ -7,7 +7,7 @@ vppctl packet-gen disable vppctl packet-gen enable-stream dns1 vppctl packet-gen enable-stream dns2 -sleep 180 +sleep 60 #Rehash port numbers and re-run five streams every minute while true; do diff --git a/vnfs/vLBMS/scripts/v_dns_init.sh b/vnfs/vLBMS/scripts/v_dns_init.sh index f891eb6e..4ae98746 100644 --- a/vnfs/vLBMS/scripts/v_dns_init.sh +++ b/vnfs/vLBMS/scripts/v_dns_init.sh @@ -1,5 +1,5 @@ #!/bin/bash cd /opt -./vlb-vnf-onap-distribution-$(cat /opt/config/demo_artifacts_version.txt)-SNAPSHOT/honeycomb &>/var/log/honeycomb.log &disown +./vlb-vnf-onap-distribution-$(cat /opt/config/demo_artifacts_version.txt)/honeycomb &>/var/log/honeycomb.log &disown ./set_gre_tunnel.sh diff --git a/vnfs/vLBMS/scripts/v_lb_init.sh b/vnfs/vLBMS/scripts/v_lb_init.sh index 26d88c08..4300c553 100644 --- a/vnfs/vLBMS/scripts/v_lb_init.sh +++ b/vnfs/vLBMS/scripts/v_lb_init.sh @@ -77,7 +77,7 @@ vppctl set ip arp tap-0 $PKTGEN_IPADDR $PKTGEN_MAC # Start Honeycomb and initialize the vLB with information about vDNS cd /opt -./vlb-vnf-onap-distribution-$(cat /opt/config/demo_artifacts_version.txt)-SNAPSHOT/honeycomb &>/var/log/honeycomb.log &disown +./vlb-vnf-onap-distribution-$(cat /opt/config/demo_artifacts_version.txt)/honeycomb &>/var/log/honeycomb.log &disown sleep 10 OAM_VDNS_IP=$(cat /opt/config/oam_vdns_ip.txt) @@ -85,6 +85,6 @@ VDNS_IPADDR=$(cat /opt/config/vdns_ipaddr.txt) curl -X PUT http://localhost:8183/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin/vdns-instances/vdns-instance/$VDNS_IPADDR -H 'Accept: application/json' -H 'Cache-Control: no-cache' -H 'Content-Type: application/json' -H 'Postman-Token: 8bfe8815-3efb-4c9b-8974-7b8d7b6da4c6' -H "Authorization: Basic YWRtaW46YWRtaW4=" -d '{"vdns-instance": [{ "ip-addr": "'$VDNS_IPADDR'", "oam-ip-addr": "'$OAM_VDNS_IP'", "enabled": true }]}' # Start VES agent -cd /opt/VES/evel/evel-library/code/VESreporting/ -echo 0 > active_dns.txt -./go-client.sh &>/dev/null &disown +#cd /opt/VES/evel/evel-library/code/VESreporting/ +#echo 0 > active_dns.txt +#./go-client.sh &>/dev/null &disown diff --git a/vnfs/vLBMS/scripts/v_lb_install.sh b/vnfs/vLBMS/scripts/v_lb_install.sh index aafa56da..e8392e0a 100644 --- a/vnfs/vLBMS/scripts/v_lb_install.sh +++ b/vnfs/vLBMS/scripts/v_lb_install.sh @@ -68,8 +68,8 @@ wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlbms/$INSTALL_SCRIPT_VERSION/add_dns.sh wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlbms/$INSTALL_SCRIPT_VERSION/remove_dns.sh wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlbms/$INSTALL_SCRIPT_VERSION/properties.conf -O /opt/config/properties.conf wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlbms/$INSTALL_SCRIPT_VERSION/run_health.sh -wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz -wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves_vlb_reporting/$DEMO_ARTIFACTS_VERSION/ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz +#wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz +#wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves_vlb_reporting/$DEMO_ARTIFACTS_VERSION/ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz tar -zmxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz mv ves-$DEMO_ARTIFACTS_VERSION VES @@ -103,10 +103,10 @@ apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev sleep 1 # Install VES -cd /opt/VES/evel/evel-library/bldjobs/ -make clean -make -sleep 1 +#cd /opt/VES/evel/evel-library/bldjobs/ +#make clean +#make +#sleep 1 # Run instantiation script cd /opt diff --git a/vnfs/vLBMS/scripts/v_packetgen_init.sh b/vnfs/vLBMS/scripts/v_packetgen_init.sh index 30707f0a..fe956efc 100644 --- a/vnfs/vLBMS/scripts/v_packetgen_init.sh +++ b/vnfs/vLBMS/scripts/v_packetgen_init.sh @@ -96,7 +96,7 @@ sleep 1 # Start Honeycomb and enable traffic flows cd /opt -./vlb-vnf-onap-distribution-$(cat /opt/config/demo_artifacts_version.txt)-SNAPSHOT/honeycomb &>/var/log/honeycomb.log &disown +./vlb-vnf-onap-distribution-$(cat /opt/config/demo_artifacts_version.txt)/honeycomb &>/var/log/honeycomb.log &disown chmod +x run_streams_dns.sh ./run_streams_dns.sh &>/dev/null &disown -- cgit 1.2.3-korg