diff --git a/.travis.yml b/.travis.yml index 1a6097fc..10daa873 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ before_script: - docker run -it -d --privileged -v /usr/src:/usr/src -v /lib/modules:/lib/modules -v /sys/devices/system/node:/sys/devices/system/node --name test-nff-go test-cosmic /bin/bash script: + - docker exec -i test-nff-go go mod download - docker exec -i test-nff-go make # Build standalone examples - docker exec -i test-nff-go bash -c "cd examples && make gopacketParserExample && cd .." diff --git a/common/common.go b/common/common.go index 39cbb967..959c4293 100644 --- a/common/common.go +++ b/common/common.go @@ -154,6 +154,7 @@ const ( WrongPort FailToInitDPDK FailToCreateKNI + FailToReleaseKNI ) // NFError is error type returned by nff-go functions diff --git a/dpdk/Dockerfile b/dpdk/Dockerfile index 2e648df3..4265be1a 100644 --- a/dpdk/Dockerfile +++ b/dpdk/Dockerfile @@ -9,12 +9,14 @@ LABEL RUN docker run -it --privileged -v /sys/bus/pci/drivers:/sys/bus/pci/drive EXPOSE 22022 -RUN dnf -y install pciutils; dnf clean all +#Uncomment for Fedora +# RUN dnf -y install pciutils; dnf clean all WORKDIR /workdir COPY pktgen . -COPY Pktgen.lua . + # Workaround for linking agains libpcap.so.0.8 on Ubuntu -RUN ln -s libpcap.so.1 /usr/lib64/libpcap.so.0.8 +# Uncomment for Fedora +#RUN ln -s libpcap.so.1 /usr/lib64/libpcap.so.0.8 CMD ["./pktgen", "-c", "0x1ff", "-n", "4", "--", "-P", "-m", "[1:1-2].0, [3:3-4].1, [5-6:5].2, [7-8:7].3", "-G"] diff --git a/dpdk/Makefile b/dpdk/Makefile index c282ad4c..2735b868 100644 --- a/dpdk/Makefile +++ b/dpdk/Makefile @@ -22,7 +22,6 @@ endif dpdk: all all: pktgen - cp $(PKTGEN_DIR)/Pktgen.lua . $(DPDK_DIR)/$(DPDK_INSTALL_DIR): $(MAKE) -C $(DPDK_DIR) config T=$(RTE_TARGET) @@ -35,7 +34,6 @@ pktgen: $(PKTGEN_DIR)/app/$(RTE_TARGET)/pktgen cp $(PKTGEN_DIR)/app/$(RTE_TARGET)/pktgen . clean: - -rm pktgen Pktgen.lua -$(MAKE) -C $(DPDK_DIR) clean -rm -rf $(DPDK_DIR)/$(DPDK_INSTALL_DIR) $(DPDK_DIR)/build $(DPDK_DIR)/$(RTE_TARGET) -$(MAKE) -C $(PKTGEN_DIR) realclean diff --git a/flow/flow.go b/flow/flow.go index f676fe59..d64e4692 100644 --- a/flow/flow.go +++ b/flow/flow.go @@ -375,6 +375,7 @@ type port struct { txQueuesNumber int16 willReceive bool // will this port receive packets willKNI bool // will this port has assigned KNI device + KNICoreIndex int port uint16 MAC [common.EtherAddrLen]uint8 InIndex int32 @@ -601,7 +602,7 @@ func SystemStart() error { // SystemStop stops the system. All Flow functions plus resource releasing // Doesn't cleanup DPDK -func SystemStop() { +func SystemStop() error { // TODO we should release rings here schedState.systemStop() for i := range createdPorts { @@ -611,8 +612,17 @@ func SystemStop() { createdPorts[i].txQueuesNumber = 0 createdPorts[i].willReceive = false } + if createdPorts[i].willKNI { + err := low.FreeKNI(createdPorts[i].port) + if err != nil { + return err + } + schedState.setCoreByIndex(createdPorts[i].KNICoreIndex) + createdPorts[i].willKNI = false + } } low.FreeMempools() + return nil } // SystemReset stops whole framework plus cleanup DPDK @@ -1566,19 +1576,20 @@ func CreateKniDevice(portId uint16, name string) (*Kni, error) { if createdPorts[portId].willKNI { return nil, common.WrapWithNFError(nil, "Requested KNI port already has KNI. Two KNIs for one port are prohibited.", common.MultipleKNIPort) } - if core, _, err := schedState.getCore(); err != nil { + if core, coreIndex, err := schedState.getCore(); err != nil { return nil, err } else { if err := low.CreateKni(portId, uint(core), name); err != nil { return nil, err } + kni := new(Kni) + // Port will be identifier of this KNI + // KNI structure itself is stored inside low.c + kni.portId = portId + createdPorts[portId].willKNI = true + createdPorts[portId].KNICoreIndex = coreIndex + return kni, nil } - kni := new(Kni) - // Port will be identifier of this KNI - // KNI structure itself is stored inside low.c - kni.portId = portId - createdPorts[portId].willKNI = true - return kni, nil } func FillSliceFromMask(input []uintptr, mask *[burstSize]bool, output []uintptr) uint8 { diff --git a/flow/scheduler.go b/flow/scheduler.go index 4ccb7a4f..43549ab7 100644 --- a/flow/scheduler.go +++ b/flow/scheduler.go @@ -171,6 +171,7 @@ type scheduler struct { pAttempts []uint64 maxInIndex int32 measureRings low.Rings + coreIndex int } type core struct { @@ -204,7 +205,7 @@ func newScheduler(cpus []int, schedulerOff bool, schedulerOffRemove bool, stopDe func (scheduler *scheduler) systemStart() (err error) { scheduler.stopFlag = process var core int - if core, _, err = scheduler.getCore(); err != nil { + if core, scheduler.coreIndex, err = scheduler.getCore(); err != nil { return err } common.LogDebug(common.Initialization, "Start SCHEDULER at", core, "core") @@ -333,9 +334,9 @@ func (scheduler *scheduler) systemStop() { scheduler.ff[i].stopInstance(0, -1, scheduler) } } - scheduler.setCoreByIndex(0) // scheduler + scheduler.setCoreByIndex(scheduler.coreIndex) if scheduler.stopDedicatedCore { - scheduler.setCoreByIndex(1) // stop + scheduler.setCoreByIndex(scheduler.coreIndex + 1) } scheduler.ff = nil } diff --git a/go.mod b/go.mod index edb1002c..f91b0e36 100644 --- a/go.mod +++ b/go.mod @@ -12,5 +12,5 @@ require ( github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect golang.org/x/net v0.0.0-20180926154720-4dfa2610cdf3 // indirect golang.org/x/sys v0.0.0-20181004145325-8469e314837c // indirect - golang.org/x/tools v0.0.0-20181122213734-04b5d21e00f1 // indirect + golang.org/x/tools v0.0.0-20181204185109-3832e276fb48 // indirect ) diff --git a/go.sum b/go.sum index 1c60026e..74997c9e 100644 --- a/go.sum +++ b/go.sum @@ -33,3 +33,5 @@ golang.org/x/tools v0.0.0-20181002223833-cd09f19c2f7e h1:x8cnE8uLkl6ATwMpvL/N/wY golang.org/x/tools v0.0.0-20181002223833-cd09f19c2f7e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181122213734-04b5d21e00f1 h1:bsEj/LXbv3BCtkp/rBj9Wi/0Nde4OMaraIZpndHAhdI= golang.org/x/tools v0.0.0-20181122213734-04b5d21e00f1/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181204185109-3832e276fb48 h1:N6OJ2izGAYOu7TF6EHpWtlM+vFxWtFJoj/BxJI7UhSQ= +golang.org/x/tools v0.0.0-20181204185109-3832e276fb48/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/low/low.go b/low/low.go index c65c62f3..38449710 100644 --- a/low/low.go +++ b/low/low.go @@ -515,6 +515,13 @@ func StopPort(port uint16) { C.rte_eth_dev_stop(C.uint16_t(port)) } +func FreeKNI(port uint16) error { + if C.free_kni(C.uint16_t(port)) < 0 { + return common.WrapWithNFError(nil, "Problem with KNI releasing\n", common.FailToReleaseKNI) + } + return nil +} + // GetPortsNumber gets total number of available Ethernet devices. func GetPortsNumber() int { return int(C.rte_eth_dev_count()) diff --git a/low/low.h b/low/low.h index b8020399..360e3868 100644 --- a/low/low.h +++ b/low/low.h @@ -150,6 +150,10 @@ int create_kni(uint16_t port, uint32_t core, char *name, struct rte_mempool *mbu return 0; } +int free_kni(uint16_t port) { + return rte_kni_release(kni[port]); +} + int checkRSSPacketCount(struct cPort *port, int16_t queue) { return rte_eth_rx_queue_count(port->PortId, queue); } diff --git a/nff-go-base/Makefile b/nff-go-base/Makefile index f6100f07..bfb71af5 100644 --- a/nff-go-base/Makefile +++ b/nff-go-base/Makefile @@ -7,7 +7,9 @@ IMAGENAME = nff-go-base EXECUTABLES = NOCHECK_PKTGEN = yes -Dockerfile: Makefile +# This will not be used from "make deploy" or "make images" by default +# You should change images rule in mk/leaf.mk from "Dockerfile" to "Fedora" +Fedora: Makefile echo 'ARG USER_NAME' > Dockerfile echo 'FROM fedora' >> Dockerfile if [ -n '${http_proxy}' ]; then \ @@ -19,6 +21,18 @@ Dockerfile: Makefile echo 'RUN dnf -y install numactl-libs.x86_64; dnf clean all' >> Dockerfile echo 'CMD ["/bin/bash"]' >> Dockerfile +Dockerfile: Makefile + echo 'ARG USER_NAME' > Dockerfile + echo 'FROM ubuntu:cosmic' >> Dockerfile + if [ -n '${http_proxy}' ]; then \ + echo 'ENV http_proxy ${http_proxy}' >> Dockerfile; \ + echo 'ENV https_proxy ${http_proxy}' >> Dockerfile; \ + echo 'RUN echo Acquire::http::Proxy \"${http_proxy}\"\; >> /etc/apt/apt.conf' >> Dockerfile; \ + echo 'RUN echo Acquire::https::Proxy \"${https_proxy}\"\; >> /etc/apt/apt.conf' >> Dockerfile; \ + fi + echo 'RUN apt-get update; apt-get install -y libnuma-dev; apt-get install -y libpcap0.8-dev; apt-get install -y liblua5.3-dev; apt-get clean all' >> Dockerfile + echo 'CMD ["/bin/bash"]' >> Dockerfile + .PHONY: dpdk dpdk: diff --git a/scripts/get-depends.sh b/scripts/get-depends.sh index 125bffea..9388a097 100755 --- a/scripts/get-depends.sh +++ b/scripts/get-depends.sh @@ -6,7 +6,6 @@ go get -v github.com/Sirupsen/logrus go get -v github.com/pkg/errors go get -v golang.org/x/net/proxy go get -v github.com/docker/go-connections -go get -v golang.org/x/tools/cmd/stringer go get -v github.com/vishvananda/netlink go get -v github.com/google/gopacket diff --git a/test/framework/Makefile b/test/framework/Makefile index 22eaef83..199f0796 100644 --- a/test/framework/Makefile +++ b/test/framework/Makefile @@ -5,7 +5,7 @@ PATH_TO_MK = ../../mk SUBDIRS = main -main: apptype_string.go +main: %_string.go: types.go go generate diff --git a/test/framework/dockerlauncher.go b/test/framework/dockerlauncher.go index a83514f8..1889eea1 100644 --- a/test/framework/dockerlauncher.go +++ b/test/framework/dockerlauncher.go @@ -23,9 +23,9 @@ import ( // Pktgen commands constants const ( - PktgenGetPortsNumberCommand = "printf(\"%d\\n\", pktgen.portStats(\"all\", \"port\").n);" + PktgenGetPortsNumberCommand = "io.write(string.format(\"%d\\n\", pktgen.portStats(\"all\", \"port\").n)); io.flush();" PktgenGetPortStatsCommand = "stat = pktgen.portStats(\"all\", \"rate\");" - PktgenPrintPortStatsCommand = "printf(\"%%d %%d %%d %%d\\n\", stat[%d].pkts_tx, stat[%d].mbits_tx, stat[%d].pkts_rx, stat[%d].mbits_rx);" + PktgenPrintPortStatsCommand = "io.write(string.format(\"%%d %%d %%d %%d\\n\", stat[%d].pkts_tx, stat[%d].mbits_tx, stat[%d].pkts_rx, stat[%d].mbits_rx)); io.flush();" PktgenExitCommand = "os.exit(0);" PktgenGetPortsNumberFormat = "%d" @@ -227,7 +227,7 @@ func (app *RunningApp) testRoutine(report chan<- TestReport, done <-chan struct{ } } -func (app *RunningApp) testPktgenRoutine(report chan<- TestReport, done <-chan struct{}) { +func (app *RunningApp) testPktgenRoutine(report chan<- TestReport, done <-chan struct{}, start bool) { var connection net.Conn var err error var scanner *bufio.Scanner @@ -314,10 +314,13 @@ func (app *RunningApp) testPktgenRoutine(report chan<- TestReport, done <-chan s app.Logger.LogDebug("Got number of ports", numberOfPorts) // Start generating packets on ports - app.Logger.LogDebug("Executing startup commands") - for _, cmd := range app.test.BenchConf.StartCommands { - if writeData(cmd) { - return + // If we don't start generating - this pktgen will be used for receiving and counting + if start { + app.Logger.LogDebug("Executing startup commands") + for _, cmd := range app.test.BenchConf.StartCommands { + if writeData(cmd) { + return + } } } diff --git a/test/framework/main/perf.json b/test/framework/main/perf.json index 31be48d5..d5fb564f 100644 --- a/test/framework/main/perf.json +++ b/test/framework/main/perf.json @@ -16,8 +16,8 @@ "OUTPORT1_1": "1", "OUTPORT1_2": "1", "PKTGENCOREMASK": "0x1ff", - "PKTGENPORT": "[1:2-3].0, [4-5:6].1", - "CORES": "0-43" + "PKTGENPORT": "[1-2:3-4].0", + "CORES": "0-43" }, "tests": [ { @@ -25,6 +25,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -42,9 +49,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -57,6 +62,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -74,9 +86,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -89,6 +99,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -106,9 +123,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -121,6 +136,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -138,9 +160,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -153,6 +173,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -170,9 +197,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -185,6 +210,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -202,9 +234,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -217,6 +247,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -234,9 +271,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -249,6 +284,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -266,9 +308,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -281,6 +321,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -298,9 +345,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -313,6 +358,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -330,9 +382,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -345,6 +395,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -362,9 +419,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -377,6 +432,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -394,9 +456,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -409,6 +469,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -426,9 +493,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -441,6 +506,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -458,9 +530,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -473,6 +543,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -490,9 +567,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -505,6 +580,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -522,9 +604,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -537,6 +617,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -554,9 +641,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -569,6 +654,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -586,9 +678,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -601,6 +691,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -618,9 +715,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -633,6 +728,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -650,9 +752,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -665,6 +765,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -682,9 +789,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -697,6 +802,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -714,9 +826,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -729,6 +839,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -746,9 +863,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -761,6 +876,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -778,9 +900,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -793,6 +913,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -810,9 +937,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -825,6 +950,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -842,9 +974,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -857,6 +987,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -874,9 +1011,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -889,6 +1024,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -906,9 +1048,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -921,6 +1061,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -938,9 +1085,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -953,6 +1098,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -970,9 +1122,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -985,6 +1135,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1002,9 +1159,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1017,6 +1172,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1034,9 +1196,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1049,6 +1209,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1066,9 +1233,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1081,6 +1246,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1098,9 +1270,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1113,6 +1283,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1130,9 +1307,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1145,6 +1320,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1162,9 +1344,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1178,8 +1358,15 @@ "test-type": "TestTypeBenchmark", "test-apps": [ { - "image-name": "nff-go-performance", - "app-type": "TestAppGo", + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, + { + "image-name": "nff-go-performance", + "app-type": "TestAppGo", "exec-cmd": [ "./perf_main", "-load=500", "-loadRW=0", "--no-scheduler", "-inport=INPORT1", "-outport1=OUTPORT1_1", "-outport2=OUTPORT1_2" ] @@ -1194,9 +1381,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1209,6 +1394,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1226,9 +1418,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1241,6 +1431,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1258,9 +1455,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1273,6 +1468,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1290,9 +1492,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1305,6 +1505,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1322,9 +1529,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1337,6 +1542,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1354,9 +1566,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1369,6 +1579,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1386,9 +1603,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1401,6 +1616,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1418,9 +1640,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1433,6 +1653,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1450,9 +1677,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1465,6 +1690,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1482,9 +1714,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1497,6 +1727,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1514,9 +1751,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1529,6 +1764,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1546,9 +1788,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1561,6 +1801,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1578,9 +1825,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1593,6 +1838,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1610,9 +1862,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1625,6 +1875,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1642,9 +1899,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1657,6 +1912,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1674,9 +1936,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1689,6 +1949,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1706,9 +1973,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1721,6 +1986,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1738,9 +2010,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1753,6 +2023,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1770,9 +2047,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1785,6 +2060,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1802,9 +2084,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1817,6 +2097,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1834,9 +2121,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1849,6 +2134,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1866,9 +2158,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1881,6 +2171,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1898,9 +2195,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1913,6 +2208,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1930,9 +2232,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1945,6 +2245,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1962,9 +2269,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -1977,6 +2282,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -1994,9 +2306,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2009,6 +2319,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2026,9 +2343,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2041,6 +2356,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2058,9 +2380,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2073,6 +2393,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2090,9 +2417,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2105,6 +2430,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2122,9 +2454,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2137,6 +2467,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2154,9 +2491,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2169,6 +2504,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2186,9 +2528,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2201,6 +2541,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2218,9 +2565,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2233,6 +2578,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2250,9 +2602,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2265,6 +2615,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2282,9 +2639,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2297,6 +2652,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2314,9 +2676,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2329,6 +2689,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2346,9 +2713,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2361,6 +2726,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2378,9 +2750,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2393,6 +2763,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2410,9 +2787,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2425,6 +2800,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2442,9 +2824,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2457,6 +2837,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2474,9 +2861,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2489,6 +2874,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2506,9 +2898,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2521,6 +2911,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2538,9 +2935,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2553,6 +2948,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2570,9 +2972,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2585,6 +2985,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2602,9 +3009,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2617,6 +3022,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2634,9 +3046,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2649,6 +3059,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2666,9 +3083,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2681,6 +3096,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2698,9 +3120,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 64);", - "pktgen.pkt_size(\"0\", \"max\", 64);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 64);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2713,6 +3133,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2730,9 +3157,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2745,6 +3170,13 @@ "test-time": 97000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2762,9 +3194,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 128);", - "pktgen.pkt_size(\"0\", \"max\", 128);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 128);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2777,6 +3207,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2794,9 +3231,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2809,6 +3244,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2826,9 +3268,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 256);", - "pktgen.pkt_size(\"0\", \"max\", 256);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 256);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2841,6 +3281,13 @@ "test-time": 32000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2858,9 +3305,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], @@ -2873,6 +3318,13 @@ "test-time": 67000000000, "test-type": "TestTypeBenchmark", "test-apps": [ + { + "image-name": "nff-go-pktgen", + "app-type": "TestAppPktgen", + "exec-cmd": [ + "./pktgen", "-c", "PKTGENCOREMASK", "-n", "4", "--", "-P", "-m", "PKTGENPORT", "-G" + ] + }, { "image-name": "nff-go-performance", "app-type": "TestAppGo", @@ -2890,9 +3342,7 @@ ], "benchmarking-settings": { "pktgen-startup-commands": [ - "pktgen.pkt_size(\"0\", \"min\", 1518);", - "pktgen.pkt_size(\"0\", \"max\", 1518);", - "pktgen.pkt_size(\"0\", \"inc\", 64);", + "pktgen.pkt_size(\"0\", \"start\", 1518);", "pktgen.set_range(\"0\", \"on\");", "pktgen.start(0);" ], diff --git a/test/framework/main/perf_compare.go b/test/framework/main/perf_compare.go index 9e1b0f09..56dd993e 100644 --- a/test/framework/main/perf_compare.go +++ b/test/framework/main/perf_compare.go @@ -51,7 +51,7 @@ func main() { for strings.Contains(lines[j], "Average") == false { j++ } - t := strings.Split(lines[j], "")[2] + t := strings.Split(lines[j], "")[1] off_MGB, _ := strconv.Atoi(t[:len(t)-5]) // -6 ? t = strings.Split(lines[j+1], "")[0] off_cores, _ := strconv.Atoi(t[40:]) @@ -59,7 +59,7 @@ func main() { for strings.Contains(lines[k], "Average") == false { k++ } - t = strings.Split(lines[k], "")[2] + t = strings.Split(lines[k], "")[1] on_MGB, _ := strconv.Atoi(t[:len(t)-5]) // -6 ? t = strings.Split(lines[k+1], "")[0] on_cores, _ := strconv.Atoi(t[40:]) diff --git a/test/framework/testsuite.go b/test/framework/testsuite.go index 35e40da5..675d5ec6 100644 --- a/test/framework/testsuite.go +++ b/test/framework/testsuite.go @@ -60,7 +60,13 @@ func (config *TestsuiteConfig) executeOneTest(test *TestConfig, logdir string, for iii := range apps { go apps[iii].testRoutine(report, cancel) if apps[iii].config.Type == TestAppPktgen { - go apps[iii].testPktgenRoutine(report, cancel) + // We should "start" only first pktgen + // Other pktgens will only receive packets + if iii == 0 { + go apps[iii].testPktgenRoutine(report, cancel, true) + } else { + go apps[iii].testPktgenRoutine(report, cancel, false) + } pktgenAppIndex = iii } else { coresAppIndex = iii diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index e84067bc..6e9118d0 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -19,8 +19,8 @@ Vagrant.configure(2) do |config| vm_port_base = ENV.fetch("VM_TUNNEL_PORT_BASE", 12345).to_i vm_second_port_base = vm_port_base + (vm_links_number + 1) * vm_total_number -# config.vm.box = "ubuntu/xenial64" - config.vm.box = "fedora/28-cloud-base" + config.vm.box = "generic/ubuntu1804" +# config.vm.box = "fedora/28-cloud-base" # Docker server port config.vm.network "forwarded_port", guest: 2375, host: 2375, auto_correct: true @@ -46,15 +46,17 @@ Vagrant.configure(2) do |config| end end -$provision_fedora = </dev/null +then + sudo update-grub +else + sudo grub2-mkconfig -o /boot/grub2/grub.cfg +fi if [ "$(readlink /etc/udev/rules.d/80-net-setup-link.rules)" == /dev/null ] then echo Fixing udev to use consistent interface names @@ -62,9 +64,46 @@ then sudo cp /usr/lib/udev/rules.d/80-net-setup-link.rules /etc/udev/rules.d/ fi +if [ -d /etc/netplan ] +then + echo Fixing hardcoded DNS configuration + sudo sed -i -e 's,DNS=.*,DNS=,' /etc/systemd/resolved.conf + sudo sed -i -e 's,DNSSEC=yes,DNSSEC=no,' /etc/systemd/resolved.conf + + sudo sh -c 'cat > /etc/netplan/10-ens5.yaml < /etc/netplan/50-vagrant.yaml <> .bashrc setuptesthost echo Downloading and building NFF-GO framework -go get -d -v github.com/intel-go/nff-go -(cd "${GOPATH}"/src/github.com/intel-go/nff-go; git checkout develop; ./scripts/get-depends.sh; make) +go get -v golang.org/x/tools/cmd/stringer +git clone -b master --recurse-submodules http://github.com/intel-go/nff-go +(cd nff-go; go mod download; make) echo Downloading and building NFF-GO NAT example and its dependencies go get github.com/golang/protobuf/protoc-gen-go -git clone -b develop --recurse-submodules http://github.com/intel-go/nff-go-nat -(cd nff-go-nat; . env.sh; make) +git clone -b master --recurse-submodules http://github.com/intel-go/nff-go-nat +(cd nff-go-nat; go mod download; . env.sh; make) ./nff-go-nat/test/httpperfserv/install-systemd-service.sh "-port 8008" echo Setting up 1024 huge pages @@ -108,13 +151,15 @@ SHELL # Enable provisioning with a shell script. Additional provisioners such as # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the # documentation for more information about their specific syntax and use. - config.vm.provision "shell", privileged: false, inline: $provision_fedora - # Optional Ubuntu provisioning, use if you want to work in Ubuntu + config.vm.provision "shell", privileged: false, inline: $provision_common0 + config.vm.provision :reload + config.vm.provision "shell", privileged: false, inline: $provision_ubuntu + # Optional Fedora provisioning, use if you want to work in Fedora # environment. - config.vm.provision "shell", privileged: false, run: "never", inline: $provision_ubuntu + config.vm.provision "shell", privileged: false, run: "never", inline: $provision_fedora # Reboot VM after distro specific provisioning config.vm.provision :reload - config.vm.provision "shell", privileged: false, inline: $provision_common + config.vm.provision "shell", privileged: false, inline: $provision_common1 # Reboot VM after provisioning config.vm.provision :reload diff --git a/vagrant/scripts.sh b/vagrant/scripts.sh index 6d2eff4b..204a498f 100644 --- a/vagrant/scripts.sh +++ b/vagrant/scripts.sh @@ -1,8 +1,6 @@ -export DPDK_VERSION=18.11 -export GOPATH="$HOME"/go export GOROOT=/opt/go -export NFF_GO="$GOPATH"/src/github.com/intel-go/nff-go -export PATH="$GOPATH"/bin:"$GOROOT"/bin:"$PATH" +export NFF_GO="$HOME"/nff-go +export PATH="$HOME"/go/bin:"$GOROOT"/bin:"$PATH" export MAKEFLAGS="-j 4" export NFF_GO_CARDS="00:06.0 00:07.0" export DISTRO=$(lsb_release -i | cut -d: -f2 | sed s/'^\t'//) @@ -13,14 +11,14 @@ export CARD2=ens7 bindports () { sudo modprobe uio - sudo insmod "$NFF_GO"/dpdk/dpdk-${DPDK_VERSION}/x86_64-native-linuxapp-gcc/kmod/igb_uio.ko - sudo "$NFF_GO"/dpdk/dpdk-${DPDK_VERSION}/usertools/dpdk-devbind.py --bind=igb_uio $NFF_GO_CARDS + sudo insmod "$NFF_GO"/dpdk/dpdk/x86_64-native-linuxapp-gcc/kmod/igb_uio.ko + sudo "$NFF_GO"/dpdk/dpdk/usertools/dpdk-devbind.py --bind=igb_uio $NFF_GO_CARDS } # Bind ports to Linux kernel driver unbindports () { - sudo "$NFF_GO"/dpdk/dpdk-${DPDK_VERSION}/usertools/dpdk-devbind.py --bind=e1000 $NFF_GO_CARDS + sudo "$NFF_GO"/dpdk/dpdk/usertools/dpdk-devbind.py --bind=e1000 $NFF_GO_CARDS } # Run pktgen @@ -59,15 +57,14 @@ setupdocker () sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" sudo apt-get update sudo apt-get install -y docker-ce - sudo gpasswd -a ubuntu docker - sudo sed -i -e 's,ExecStart=/usr/bin/dockerd -H fd://,ExecStart=/usr/bin/dockerd,' /lib/systemd/system/docker.service elif [ $DISTRO == Fedora ]; then sudo dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo sudo dnf -y install docker-ce - sudo sed -i -e 's,ExecStart=/usr/bin/dockerd -H unix://,ExecStart=/usr/bin/dockerd,' /lib/systemd/system/docker.service - sudo gpasswd -a vagrant docker fi + sudo gpasswd -a vagrant docker + sudo sed -i -e 's,ExecStart=/usr/bin/dockerd -H unix://,ExecStart=/usr/bin/dockerd,' /lib/systemd/system/docker.service + if [ ! -z "${http_proxy}" ] then sudo mkdir /etc/systemd/system/docker.service.d