diff options
| -rw-r--r-- | build-root/deb/debian/control | 8 | ||||
| -rw-r--r-- | build-root/deb/debian/vpp-bin.README.Debian | 2 | ||||
| -rw-r--r-- | build-root/deb/debian/vpp.upstart | 2 | ||||
| -rw-r--r-- | build-root/rpm/vpp.service | 2 | ||||
| -rw-r--r-- | build-root/rpm/vpp.spec | 10 | ||||
| -rw-r--r-- | test/README | 2 | ||||
| -rw-r--r-- | test/resources/libraries/bash/dut_setup.sh | 4 | ||||
| -rw-r--r-- | test/resources/libraries/python/VatExecutor.py | 4 | ||||
| -rw-r--r-- | vnet/vnet/ip/ip6_hop_by_hop.c | 2 | ||||
| -rw-r--r-- | vpp-api-test/Makefile.am | 10 | ||||
| -rw-r--r-- | vpp-api-test/configure.ac | 4 | ||||
| -rwxr-xr-x | vpp-api-test/scripts/vppctl | 4 | ||||
| -rw-r--r-- | vpp-api-test/vat/main.c | 2 | ||||
| -rw-r--r-- | vpp-japi/japi/vppjni.h | 2 | ||||
| -rw-r--r-- | vpp/Makefile.am | 20 | ||||
| -rw-r--r-- | vpp/conf/startup.conf | 2 | ||||
| -rw-r--r-- | vpp/configure.ac | 2 | ||||
| -rw-r--r-- | vpp/vnet/main.c | 2 |
18 files changed, 42 insertions, 42 deletions
diff --git a/build-root/deb/debian/control b/build-root/deb/debian/control index 0278286af9d..a90cea76ea2 100644 --- a/build-root/deb/debian/control +++ b/build-root/deb/debian/control @@ -9,10 +9,10 @@ Package: vpp Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Vector Packet Processing--executables - This package provides VPP executables: vpe, vpe_api_test, vpe_json_test - vpe - the vector packet engine - vpe_api_test - vector packet engine API test tool - vpe_json_test - vector packet engine JSON test tool + This package provides VPP executables: vpp, vpp_api_test, vpp_json_test + vpp - the vector packet engine + vpp_api_test - vector packet engine API test tool + vpp_json_test - vector packet engine JSON test tool Package: vpp-dbg Architecture: any diff --git a/build-root/deb/debian/vpp-bin.README.Debian b/build-root/deb/debian/vpp-bin.README.Debian index 25ecd38ef66..192289696ef 100644 --- a/build-root/deb/debian/vpp-bin.README.Debian +++ b/build-root/deb/debian/vpp-bin.README.Debian @@ -1,6 +1,6 @@ To run vpp with the debug shell: -sudo vpe unix interactive +sudo vpp unix interactive which will result in a prompt that looks like: diff --git a/build-root/deb/debian/vpp.upstart b/build-root/deb/debian/vpp.upstart index ec731d896f5..c0ff09e2c16 100644 --- a/build-root/deb/debian/vpp.upstart +++ b/build-root/deb/debian/vpp.upstart @@ -13,7 +13,7 @@ end script script - exec vpe $(cat /etc/vpp/startup.conf | sed -e 's/#.*//') + exec vpp -c /etc/vpp/startup.conf end script post-stop script diff --git a/build-root/rpm/vpp.service b/build-root/rpm/vpp.service index dd8ee36bd73..fc66b15ccbc 100644 --- a/build-root/rpm/vpp.service +++ b/build-root/rpm/vpp.service @@ -3,7 +3,7 @@ Description=Vector Packet Processing Process After=syslog.target network.target auditd.service [Service] -ExecStart=/bin/sh -c '/usr/bin/vpe $(cat /etc/vpp/startup.conf | sed -e "s/#.*//")' +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf Type=simple Restart=on-failure RestartSec=5s diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec index ddcdeb9f1ab..fbadf07c3ae 100644 --- a/build-root/rpm/vpp.spec +++ b/build-root/rpm/vpp.spec @@ -14,10 +14,10 @@ Release: %{_release} Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils %description -This package provides VPP executables: vpe, vpe_api_test, vpe_json_test -vpe - the vector packet engine -vpe_api_test - vector packet engine API test tool -vpe_json_test - vector packet engine JSON test tool +This package provides VPP executables: vpp, vpp_api_test, vpp_json_test +vpp - the vector packet engine +vpp_api_test - vector packet engine API test tool +vpp_json_test - vector packet engine JSON test tool %package lib Summary: VPP libraries @@ -111,7 +111,7 @@ sysctl --system %files %defattr(-,bin,bin) %{_unitdir}/vpp.service -/usr/bin/vpe* +/usr/bin/vpp* /usr/bin/svm* %config /etc/sysctl.d/80-vpp.conf %config /etc/vpp/startup.conf diff --git a/test/README b/test/README index 862541a67a6..40154bb8cd0 100644 --- a/test/README +++ b/test/README @@ -7,7 +7,7 @@ - install python requirements for this project by executing: # pip install -r requirements.txt - make sure user mentioned in topology.py has NOPASSWD sudo access to - vpe_api_test + vpp_api_test Done. diff --git a/test/resources/libraries/bash/dut_setup.sh b/test/resources/libraries/bash/dut_setup.sh index c6cbd031f1a..1da8cc919b7 100644 --- a/test/resources/libraries/bash/dut_setup.sh +++ b/test/resources/libraries/bash/dut_setup.sh @@ -1,7 +1,7 @@ #!/bin/bash -echo vpe process -ps aux | grep vpe +echo vpp process +ps aux | grep vpp echo Free memory free -m diff --git a/test/resources/libraries/python/VatExecutor.py b/test/resources/libraries/python/VatExecutor.py index 55a0454bcb5..f10259b5006 100644 --- a/test/resources/libraries/python/VatExecutor.py +++ b/test/resources/libraries/python/VatExecutor.py @@ -19,7 +19,7 @@ __all__ = [] class VatExecutor(object): __TMP_DIR = "/tmp/" - __VAT_BIN = "vpe_api_test" + __VAT_BIN = "vpp_api_test" def __init__(self): self._stdout = None @@ -53,7 +53,7 @@ class VatExecutor(object): logger.trace("stdout: '{0}'".format(self._stdout)) logger.trace("stderr: '{0}'".format(self._stderr)) - #TODO: download vpe_api_test output file + #TODO: download vpp_api_test output file self._delete_files(node, remote_file_path, remote_file_out) def _delete_files(self, node, *files): diff --git a/vnet/vnet/ip/ip6_hop_by_hop.c b/vnet/vnet/ip/ip6_hop_by_hop.c index 64edfd249c3..5bd34b8c85e 100644 --- a/vnet/vnet/ip/ip6_hop_by_hop.c +++ b/vnet/vnet/ip/ip6_hop_by_hop.c @@ -51,7 +51,7 @@ ip6_hop_by_hop_main_t ip6_hop_by_hop_main; * configure the node id * trace list application data support * cons up analysis / steering plug-in(s) - * add configuration binary APIs, vpe_api_test_support, yang models and + * add configuration binary APIs, vpp_api_test_support, yang models and * orca code * perf tune: dual loop, replace memcpy w/ N x 8-byte load/stores * diff --git a/vpp-api-test/Makefile.am b/vpp-api-test/Makefile.am index ae071bcebe0..5079f8d49b9 100644 --- a/vpp-api-test/Makefile.am +++ b/vpp-api-test/Makefile.am @@ -20,15 +20,15 @@ libvatplugin_la_SOURCES = \ lib_LTLIBRARIES = libvatplugin.la -bin_PROGRAMS = vpe_api_test vpe_json_test +bin_PROGRAMS = vpp_api_test vpp_json_test -vpe_api_test_SOURCES = vat/api_format.c vat/main.c vat/plugin.c vat/vat.h vat/json_format.h vat/json_format.c -vpe_json_test_SOURCES = vat/json_format.h vat/json_format.c vat/json_test.c +vpp_api_test_SOURCES = vat/api_format.c vat/main.c vat/plugin.c vat/vat.h vat/json_format.h vat/json_format.c +vpp_json_test_SOURCES = vat/json_format.h vat/json_format.c vat/json_test.c -vpe_api_test_LDADD = -lvlibmemoryclient -lvlibapi -lsvm \ +vpp_api_test_LDADD = -lvlibmemoryclient -lvlibapi -lsvm \ -lvppinfra -lpthread -lm \ -lrt -ldl libvatplugin.la -vpe_json_test_LDADD = -lvppinfra -lm +vpp_json_test_LDADD = -lvppinfra -lm nobase_include_HEADERS = vat/vat.h vat/json_format.h diff --git a/vpp-api-test/configure.ac b/vpp-api-test/configure.ac index 652ddb5f674..59345daf885 100644 --- a/vpp-api-test/configure.ac +++ b/vpp-api-test/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(vpe-api-test, 1.0) +AC_INIT(vpp-api-test, 1.0) AM_INIT_AUTOMAKE AC_PROG_LIBTOOL @@ -16,7 +16,7 @@ AC_ARG_WITH(q-platform, AC_HELP_STRING([--with-q-platform],[Build version for given platform (qnative)]), [case $with_q_platform in qnative) ;; - vpe) with_q_platform=vpe;; + vpp) with_q_platform=vpp;; *) with_q_platform=qnative;; esac]) diff --git a/vpp-api-test/scripts/vppctl b/vpp-api-test/scripts/vppctl index 90828f6773b..12b132c9459 100755 --- a/vpp-api-test/scripts/vppctl +++ b/vpp-api-test/scripts/vppctl @@ -1,13 +1,13 @@ #!/bin/bash if [ $# -gt 0 ]; then - echo exec ${@} | vpe_api_test | sed 's/vat# //g' + echo exec ${@} | vpp_api_test | sed 's/vat# //g' else echo -n "vpp# " while read CMD; do if [ $CMD == "exit" ]; then exit fi - echo exec $CMD | vpe_api_test | sed 's/vat# //g' + echo exec $CMD | vpp_api_test | sed 's/vat# //g' echo -n "vpp# " done fi diff --git a/vpp-api-test/vat/main.c b/vpp-api-test/vat/main.c index e7c25520469..1bec4a101d1 100644 --- a/vpp-api-test/vat/main.c +++ b/vpp-api-test/vat/main.c @@ -236,7 +236,7 @@ int main (int argc, char ** argv) vat_api_hookup(vam); vat_plugin_api_reference(); - if (connect_to_vpe("vpe_api_test") < 0) { + if (connect_to_vpe("vpp_api_test") < 0) { svm_region_exit(); fformat (stderr, "Couldn't connect to vpe, exiting...\n"); exit (1); diff --git a/vpp-japi/japi/vppjni.h b/vpp-japi/japi/vppjni.h index 4973c0a65aa..2fe2893b374 100644 --- a/vpp-japi/japi/vppjni.h +++ b/vpp-japi/japi/vppjni.h @@ -140,7 +140,7 @@ typedef struct { volatile u32 lock; u32 tag; - /* To recycle pseudo-synchronous message code from vpe_api_test... */ + /* To recycle pseudo-synchronous message code from vpp_api_test... */ volatile u32 result_ready; volatile i32 retval; volatile u8 *shmem_result; diff --git a/vpp/Makefile.am b/vpp/Makefile.am index 8560fe5462f..5103646c5c9 100644 --- a/vpp/Makefile.am +++ b/vpp/Makefile.am @@ -21,22 +21,22 @@ bin_PROGRAMS = CLEANFILES = lib_LTLIBRARIES = -bin_PROGRAMS += vpe +bin_PROGRAMS += vpp -vpe_SOURCES = \ +vpp_SOURCES = \ vnet/main.c \ app/vpe_cli.c \ app/version.c \ oam/oam.c \ stats/stats.c -vpe_SOURCES += \ +vpp_SOURCES += \ api/api.c \ api/custom_dump.c # comment out to disable stats upload to gmond -vpe_SOURCES += \ +vpp_SOURCES += \ api/gmon.c nobase_include_HEADERS = \ @@ -63,21 +63,21 @@ app/version.h: @echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" >> $@ @echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@ -vpe_LDADD = -lvlibapi -lvlibmemory -lvlib_unix -lvlib +vpp_LDADD = -lvlibapi -lvlibmemory -lvlib_unix -lvlib -vpe_LDADD += -l:libvnet.a +vpp_LDADD += -l:libvnet.a -vpe_LDADD += -lsvm -lsvmdb -lrt +vpp_LDADD += -lsvm -lsvmdb -lrt -vpe_LDADD += -lvnetplugin +vpp_LDADD += -lvnetplugin if WITH_DPDK -vpe_LDADD += -l:libdpdk.a +vpp_LDADD += -l:libdpdk.a endif # These go last -vpe_LDADD += -lvppinfra -lm -lpthread -lcrypto -ldl +vpp_LDADD += -lvppinfra -lm -lpthread -lcrypto -ldl SUFFIXES = .api.h .api diff --git a/vpp/conf/startup.conf b/vpp/conf/startup.conf index 5ce860b3252..c41cf06d7e9 100644 --- a/vpp/conf/startup.conf +++ b/vpp/conf/startup.conf @@ -1,7 +1,7 @@ unix { nodaemon - log /tmp/vpe.log + log /tmp/vpp.log full-coredump } diff --git a/vpp/configure.ac b/vpp/configure.ac index 673ff5ae7d8..8c7beb4d94d 100644 --- a/vpp/configure.ac +++ b/vpp/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(vpe, 1.1) +AC_INIT(vpp, 1.1) AM_INIT_AUTOMAKE AM_SILENT_RULES diff --git a/vpp/vnet/main.c b/vpp/vnet/main.c index da1ec9a4d4f..d60b489e936 100644 --- a/vpp/vnet/main.c +++ b/vpp/vnet/main.c @@ -145,7 +145,7 @@ int main (int argc, char * argv[]) /* * Load startup config from file. - * usage: vpe -c /etc/vpp/startup.conf + * usage: vpp -c /etc/vpp/startup.conf */ if ((argc == 3) && !strncmp(argv[1], "-c", 2)) { |