From 1aa9cf752e6a9a19ace912f3c1fed3482229c061 Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Mon, 25 Sep 2017 14:19:00 -0400 Subject: [PATCH] Upgrade vFW and vLB to VES 5.x Change-Id: I5a9904d34dd1fbca2ab62b2f909b693553b2b61c Issue-ID: INT-228 Signed-off-by: Marco Platania --- vnfs/VES/bldjobs/Makefile | 2 +- vnfs/VES5.0/evel/evel-library/bldjobs/Makefile | 18 ++++++++++++++++-- vnfs/VESreporting_vFW5.0/Makefile | 3 +-- vnfs/VESreporting_vLB5.0/Makefile | 3 +-- vnfs/vFW/scripts/v_firewall_init.sh | 2 +- vnfs/vFW/scripts/v_firewall_install.sh | 11 +++++++---- vnfs/vLB/scripts/add_dns.sh | 2 +- vnfs/vLB/scripts/remove_dns.sh | 2 +- vnfs/vLB/scripts/v_lb_init.sh | 2 +- vnfs/vLB/scripts/v_lb_install.sh | 10 +++++----- 10 files changed, 35 insertions(+), 20 deletions(-) diff --git a/vnfs/VES/bldjobs/Makefile b/vnfs/VES/bldjobs/Makefile index 6c0aaada..659f02fb 100644 --- a/vnfs/VES/bldjobs/Makefile +++ b/vnfs/VES/bldjobs/Makefile @@ -82,7 +82,7 @@ DOCS_SERVER_PATH=/var/www/html/evel #****************************************************************************** # Implicit rule to make dependency files. Recipe copied from Gnu docs at: * -# https://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html * +# https://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html* #****************************************************************************** %.d: %.c @echo Making dependency file $(notdir $@) for $(notdir $<) diff --git a/vnfs/VES5.0/evel/evel-library/bldjobs/Makefile b/vnfs/VES5.0/evel/evel-library/bldjobs/Makefile index d37d0e4b..ec0e73cf 100644 --- a/vnfs/VES5.0/evel/evel-library/bldjobs/Makefile +++ b/vnfs/VES5.0/evel/evel-library/bldjobs/Makefile @@ -29,6 +29,7 @@ ARCH=$(shell getconf LONG_BIT) CODE_ROOT=$(CURDIR)/.. EVELLIB_ROOT=$(CODE_ROOT)/code/evel_library EVELUNIT_ROOT=$(CODE_ROOT)/code/evel_unit +EVELTRAINING_ROOT=$(CODE_ROOT)/code LIBS_DIR=$(CODE_ROOT)/libs/x86_$(ARCH) OUTPUT_DIR=$(CODE_ROOT)/output/x86_$(ARCH) DOCS_ROOT=$(CODE_ROOT)/docs @@ -80,7 +81,7 @@ DOCS_SERVER_PATH=/var/www/html/evel #****************************************************************************** # Implicit rule to make dependency files. Recipe copied from Gnu docs at: * -# https://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html * +# https://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html * #****************************************************************************** %.d: %.c @echo Making dependency file $(notdir $@) for $(notdir $<) @@ -104,9 +105,11 @@ DOCS_SERVER_PATH=/var/www/html/evel $(JAVA) -jar $(PLANTUML) $(PLANTFLAGS) $< all: api_library \ + vnf_reporting clean: api_library_clean \ - evel_unit_clean \ + vnf_reporting_clean \ + evel_unit_clean install: evel_install_centos evel_install_ubuntu @@ -191,6 +194,17 @@ evel_unit_clean: @$(RM) $(EVELLIB_ROOT)/*.d @$(RM) $(EVELUNIT_ROOT)/*.d +#****************************************************************************** +# Build the VNF VES Reporting code * +#****************************************************************************** +vnf_reporting: + @echo Making VNF Reporting + @$(MAKE) -s -C $(EVELTRAINING_ROOT)/VESreporting + +vnf_reporting_clean: + @echo Cleaning VNF Reporting + @$(RM) $(EVELTRAINING_ROOT)/VESreporting/vpp_measurement_reporter + #****************************************************************************** # Copy the EVEL demo onto the CentOS testbed as a package and build it. * #****************************************************************************** diff --git a/vnfs/VESreporting_vFW5.0/Makefile b/vnfs/VESreporting_vFW5.0/Makefile index e7ac57b0..8fa70237 100644 --- a/vnfs/VESreporting_vFW5.0/Makefile +++ b/vnfs/VESreporting_vFW5.0/Makefile @@ -17,8 +17,7 @@ CC=gcc ARCH=$(shell getconf LONG_BIT) -#CODE_ROOT=$(CURDIR)/../../.. -CODE_ROOT=../VES5.0/evel/evel-library +CODE_ROOT=$(CURDIR)/../.. LIBS_DIR=$(CODE_ROOT)/libs/x86_$(ARCH) INCLUDE_DIR=$(CODE_ROOT)/code/evel_library diff --git a/vnfs/VESreporting_vLB5.0/Makefile b/vnfs/VESreporting_vLB5.0/Makefile index faf004cb..f5a4da9e 100644 --- a/vnfs/VESreporting_vLB5.0/Makefile +++ b/vnfs/VESreporting_vLB5.0/Makefile @@ -18,8 +18,7 @@ CC=gcc ARCH=$(shell getconf LONG_BIT) -#CODE_ROOT=$(CURDIR)/../../.. -CODE_ROOT=../VES5.0/evel/evel-library +CODE_ROOT=$(CURDIR)/../.. LIBS_DIR=$(CODE_ROOT)/libs/x86_$(ARCH) INCLUDE_DIR=$(CODE_ROOT)/code/evel_library diff --git a/vnfs/vFW/scripts/v_firewall_init.sh b/vnfs/vFW/scripts/v_firewall_init.sh index 75a55bee..df67a352 100644 --- a/vnfs/vFW/scripts/v_firewall_init.sh +++ b/vnfs/vFW/scripts/v_firewall_init.sh @@ -70,5 +70,5 @@ echo "" > /var/lib/honeycomb/persist/config/data.json sleep 1 # Start VES client -cd /opt/VES/code/evel_training/VESreporting/ +cd /opt/VES/evel/evel-library/code/VESreporting/ ./go-client.sh &>/dev/null &disown diff --git a/vnfs/vFW/scripts/v_firewall_install.sh b/vnfs/vFW/scripts/v_firewall_install.sh index 262a01b8..2a7c53c1 100644 --- a/vnfs/vFW/scripts/v_firewall_install.sh +++ b/vnfs/vFW/scripts/v_firewall_install.sh @@ -71,20 +71,23 @@ cd /opt wget $REPO_URL_BLOB/org.onap.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_firewall_init.sh wget $REPO_URL_BLOB/org.onap.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vfirewall.sh wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz -wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz -wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves/ves_vfw_reporting/$DEMO_ARTIFACTS_VERSION/ves_vfw_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_vfw_reporting/$DEMO_ARTIFACTS_VERSION/ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz tar -zmxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz mv ves-$DEMO_ARTIFACTS_VERSION VES tar -zmxvf ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz mv ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION VESreporting_vFW tar -zmxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz + mv sample-distribution-$DEMO_ARTIFACTS_VERSION honeycomb sed -i 's/"restconf-binding-address": "127.0.0.1",/"restconf-binding-address": "0.0.0.0",/g' honeycomb/sample-distribution-$DEMO_ARTIFACTS_VERSION/config/honeycomb.json -mv VESreporting_vFW /opt/VES/code/evel_training/VESreporting +mv VESreporting_vFW /opt/VES/evel/evel-library/code/VESreporting rm *.tar.gz + chmod +x v_firewall_init.sh chmod +x vfirewall.sh +chmod +x /opt/VES/evel/evel-library/code/VESreporting/go-client.sh # Install VPP export UBUNTU="trusty" @@ -96,7 +99,7 @@ apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev sleep 1 # Install VES -cd /opt/VES/bldjobs/ +cd /opt/VES/evel/evel-library/bldjobs/ make clean make sleep 1 diff --git a/vnfs/vLB/scripts/add_dns.sh b/vnfs/vLB/scripts/add_dns.sh index 3574e085..342679d0 100644 --- a/vnfs/vLB/scripts/add_dns.sh +++ b/vnfs/vLB/scripts/add_dns.sh @@ -17,7 +17,7 @@ vppctl set int ip address $GRE $GRE_IPADDR"/32" vppctl set int state $GRE up # Update the number of vDNSs currently active -FD="/opt/VES/code/evel_training/VESreporting/active_dns.txt" +FD="/opt/VES/evel/evel-library/code/VESreporting/active_dns.txt" CURR_DNS=$(cat $FD) let CURR_DNS=$CURR_DNS+1 echo $CURR_DNS > $FD \ No newline at end of file diff --git a/vnfs/vLB/scripts/remove_dns.sh b/vnfs/vLB/scripts/remove_dns.sh index f400aa0f..33d43a6b 100644 --- a/vnfs/vLB/scripts/remove_dns.sh +++ b/vnfs/vLB/scripts/remove_dns.sh @@ -14,7 +14,7 @@ vppctl lb as $IP_TO_PKTGEN_NET"/32" $DNS_IPADDR del vppctl create gre tunnel src $IP_TO_DNS_NET dst $DNS_IPADDR del # Update the number of vDNSs currently active -FD="/opt/VES/code/evel_training/VESreporting/active_dns.txt" +FD="/opt/VES/evel/evel-library/code/VESreporting/active_dns.txt" CURR_DNS=$(cat $FD) let CURR_DNS=$CURR_DNS-1 if [[ $CURR_DNS -lt 0 ]] diff --git a/vnfs/vLB/scripts/v_lb_init.sh b/vnfs/vLB/scripts/v_lb_init.sh index 9223e043..1bad1722 100755 --- a/vnfs/vLB/scripts/v_lb_init.sh +++ b/vnfs/vLB/scripts/v_lb_init.sh @@ -79,6 +79,6 @@ cd /opt/FDserver ./dnsmembership.sh &>/dev/null &disown # Start VES client -cd /opt/VES/code/evel_training/VESreporting/ +cd /opt/VES/evel/evel-library/code/VESreporting/ echo 0 > active_dns.txt ./go-client.sh &>/dev/null &disown \ No newline at end of file diff --git a/vnfs/vLB/scripts/v_lb_install.sh b/vnfs/vLB/scripts/v_lb_install.sh index a6577c4a..052ebb6e 100644 --- a/vnfs/vLB/scripts/v_lb_install.sh +++ b/vnfs/vLB/scripts/v_lb_install.sh @@ -70,15 +70,15 @@ wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/dnsmembership wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/add_dns.sh wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/remove_dns.sh wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vlb/dns-manager/$DEMO_ARTIFACTS_VERSION/dns-manager-$DEMO_ARTIFACTS_VERSION.jar -wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz -wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves/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 tar -zmxvf ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz mv ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION VESreporting_vLB -mv VESreporting_vLB /opt/VES/code/evel_training/VESreporting +mv VESreporting_vLB /opt/VES/evel/evel-library/code/VESreporting mv dns-manager-$DEMO_ARTIFACTS_VERSION.jar /opt/FDserver/dns-manager-$DEMO_ARTIFACTS_VERSION.jar mv dnsmembership.sh /opt/FDserver/dnsmembership.sh mv add_dns.sh /opt/FDserver/add_dns.sh @@ -87,7 +87,7 @@ rm *.tar.gz chmod +x v_lb_init.sh chmod +x vlb.sh -chmod +x /opt/VES/code/evel_training/VESreporting/go-client.sh +chmod +x /opt/VES/evel/evel-library/code/VESreporting/go-client.sh chmod +x /opt/FDserver/dnsmembership.sh chmod +x /opt/FDserver/add_dns.sh chmod +x /opt/FDserver/remove_dns.sh @@ -102,7 +102,7 @@ apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev sleep 1 # Install VES -cd /opt/VES/bldjobs/ +cd /opt/VES/evel/evel-library/bldjobs/ make clean make sleep 1 -- 2.16.6