Bump Grout to v1.13.0 (#126)

* Bump Grout to v1.13.0

* Remove registry.redhat.io login as it is no longer required

Author: ramperher

.github/workflows/pr.yaml

@@ -32,13 +32,6 @@ jobs:
           password: ${{ secrets.QUAY_TOKEN }}
           registry: ${{ env.QUAY_REGISTRY }}
 
-      - name: Log in to registry.redhat.io
-        uses: redhat-actions/podman-login@v1
-        with:
-          username: ${{ secrets.RH_REGISTRY_USER }}
-          password: ${{ secrets.RH_REGISTRY_TOKEN }}
-          registry: ${{ env.RH_REGISTRY }}
-
       - name: Build All
         run: |
           env

.github/workflows/push.yaml

@@ -37,13 +37,6 @@ jobs:
           password: ${{ secrets.QUAY_TOKEN }}
           registry: ${{ env.QUAY_REGISTRY }}
 
-      - name: Log in to registry.redhat.io
-        uses: redhat-actions/podman-login@v1
-        with:
-          username: ${{ secrets.RH_REGISTRY_USER }}
-          password: ${{ secrets.RH_REGISTRY_TOKEN }}
-          registry: ${{ env.RH_REGISTRY }}
-
       - name: Build All
         id: build
         run: |

documentation/testing.md

@@ -702,20 +702,20 @@ grcli -f /usr/local/bin/example-cnf/run/grout.init -s /usr/local/bin/example-cnf
 
 # check the config file to be applied
 sh-4.4$ cat /usr/local/bin/example-cnf/run/grout.init
-add interface port p0 devargs 0000:86:02.1 rxqs 2
-add interface port p1 devargs 0000:86:03.3 rxqs 2
+interface add port p0 devargs 0000:86:02.1 rxqs 2
+interface add port p1 devargs 0000:86:03.3 rxqs 2
 
-add ip address 172.16.16.60/24 iface p0
-add ip address 172.16.21.60/24 iface p1
+address add 172.16.16.60/24 iface p0
+address add 172.16.21.60/24 iface p1
 
 # run the script
 sh-4.4$ sudo /usr/local/bin/example-cnf/run/config-grout
 
 # clear statistics
-sh-4.4$ sudo grcli -s /usr/local/bin/example-cnf/run/grout.sock clear stats
+sh-4.4$ sudo grcli -s /usr/local/bin/example-cnf/run/grout.sock stats reset
 
 # print statistics
-sh-4.4$ sudo grcli -s /usr/local/bin/example-cnf/run/grout.sock show stats software
+sh-4.4$ sudo grcli -s /usr/local/bin/example-cnf/run/grout.sock stats show software
 NODE                            CALLS  PACKETS  PKTS/CALL  CYCLES/CALL     CYCLES/PKT
 port_rx                  109805489408     2104        0.0         49.2   2567088141.0
 control_input            109805489408       39        0.0         22.6  63637321574.4

grout-container-app/Makefile

@@ -2,7 +2,7 @@ SHELL           := /bin/bash
 
 DATE            ?= $(shell date --utc +%Y%m%d%H%M)
 SHA             ?= $(shell git rev-parse --short HEAD)
-VERSION         ?= 0.2.1
+VERSION         ?= 0.2.2
 REGISTRY        ?= quay.io
 ORG             ?= rh-nfv-int
 CONTAINER_CLI   ?= podman

grout-container-app/build.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-TAG=${TAG:-"v0.2.1"}
+TAG=${TAG:-"v0.2.2"}
 
 CLI=${CLI:="podman"}
 ORG=${ORG:="rh-nfv-int"}

grout-container-app/cnfapp/Dockerfile

@@ -12,14 +12,14 @@ FROM quay.io/rh-nfv-int/ubi9-base-grout:v0.0.1
 LABEL name="NFV Example CNF Grout Application" \
       maintainer="telcoci" \
       vendor="fredco" \
-      version="v0.2.1" \
-      release="v0.2.1" \
+      version="v0.2.2" \
+      release="v0.2.2" \
       summary="An example CNF for platform validation" \
       description="An example CNF for platform validation"
 
 COPY licenses /licenses
 
-ENV GROUT_VER v0.11.0
+ENV GROUT_VER v0.13.0
 ENV GROUT_RPM https://github.com/DPDK/grout/releases/download/${GROUT_VER}/grout.x86_64.rpm
 
 # check latest release from https://github.com/DPDK/grout/releases

grout-container-app/cnfapp/README.md

@@ -30,11 +30,11 @@ This is an example of what we could find in that config file:
 
 ```
 sh-4.4$ cat /usr/local/bin/example-cnf/run/grout.init
-add interface port p0 devargs 0000:86:02.1 rxqs 2
-add interface port p1 devargs 0000:86:03.3 rxqs 2
+interface add port p0 devargs 0000:86:02.1 rxqs 2
+interface add port p1 devargs 0000:86:03.3 rxqs 2
 
-add ip address 172.16.16.60/24 iface p0
-add ip address 172.16.21.60/24 iface p1
+address add 172.16.16.60/24 iface p0
+address add 172.16.21.60/24 iface p1
 ```
 
 The file created by the automation to launch the Grout configuration is saved under `/usr/local/bin/example-cnf/run/grout.sock`, and it has the following content:
@@ -52,10 +52,10 @@ For example, we can print statistics in the following way:
 
 ```
 # clear statistics
-$ sudo grcli -s /usr/local/bin/example-cnf/run/grout.sock clear stats
+$ sudo grcli -s /usr/local/bin/example-cnf/run/grout.sock stats reset
 
 # print statistics
-$ sudo grcli -s /usr/local/bin/example-cnf/run/grout.sock show stats software
+$ sudo grcli -s /usr/local/bin/example-cnf/run/grout.sock stats show software
 NODE                            CALLS  PACKETS  PKTS/CALL  CYCLES/CALL     CYCLES/PKT
 port_rx                  109805489408     2104        0.0         49.2   2567088141.0
 control_input            109805489408       39        0.0         22.6  63637321574.4
@@ -91,15 +91,14 @@ Also, you can trace the traffic received by Grout with the following configurati
 
 > Note trace should not be used during performance testing, since it impacts performance. Just use it for troubleshooting purposes.
 
-
 ```
 # enter in grout CLI
 $ grcli -s /usr/local/bin/example-cnf/run/grout.sock
-grout# set trace all
+grout# trace enable all
 
 # if you get the latest N traces of traffic managed by Grout, you
 # will be able to see traffic details.
-grout# show trace count 50
+grout# trace show count 50
 ...
 --------- 08:25:08.558489191 cpu 2 ---------
 port_rx: port=0 queue=1
@@ -111,10 +110,10 @@ eth_output: 00:11:22:33:00:02 > 20:04:0f:f1:89:02 type=IP(0x0800) iface=p1
 port_tx: port=1 queue=1
 
 # you can clear the trace in this way
-grout# clear trace
+grout# trace clear
 
 # you can remove the trace in this way
-grout# del trace all
+grout# trace disable all
 ```
 
 ## What to update if bumping container version

grout-container-app/cnfapp/scripts/grout-wrapper

@@ -40,7 +40,7 @@ for item in "${NETWORK_ARRAY[@]}"; do
     fi
     IFS=',' read -r -a PCI_ARRAY <<< "${!NAME}"
     for pci_item in "${PCI_ARRAY[@]}"; do
-        echo "add interface port p${PORT_INDEX} devargs ${pci_item} rxqs ${RXQ}" >> $GROUT_CONF_FILE
+        echo "interface add port p${PORT_INDEX} devargs ${pci_item} rxqs ${RXQ}" >> $GROUT_CONF_FILE
         PORT_INDEX=$((PORT_INDEX+1))
     done
 done
@@ -90,7 +90,7 @@ if [[ $RUN_DEPLOYMENT == "1" ]]; then
     sudo /usr/local/bin/example-cnf/run/config-grout
 
     # Clear statistics
-    sudo grcli -s $GROUT_SOCKET_FILE clear stats
+    sudo grcli -s $GROUT_SOCKET_FILE stats reset
 
     # Print statistics every $STAT_PERIOD seconds
     set +ex
@@ -99,7 +99,7 @@ if [[ $RUN_DEPLOYMENT == "1" ]]; then
         echo "*******************************************" 2>&1 | tee -a $GROUT_LOG_FILE
         date 2>&1 | tee -a $GROUT_LOG_FILE
         echo "*******************************************" 2>&1 | tee -a $GROUT_LOG_FILE
-        sudo grcli -s $GROUT_SOCKET_FILE show stats software 2>&1 | tee -a $GROUT_LOG_FILE
+        sudo grcli -s $GROUT_SOCKET_FILE stats show software 2>&1 | tee -a $GROUT_LOG_FILE
         echo "" 2>&1 | tee -a $GROUT_LOG_FILE
         sleep $STATS_PERIOD
     done

grout-container-app/cnfapp/scripts/retrieve-grout-ip-addresses

@@ -27,7 +27,7 @@ def main():
     with open(CFG_FILE, "a") as f:
         f.write("\n")
         for idx in range(len(src_ip)):
-            f.write("add ip address " + src_ip[idx] + " iface p" + str(idx) + "\n")
+            f.write("address add " + src_ip[idx] + " iface p" + str(idx) + "\n")
 
 def get_src_network_annotation():
     # object to return