Merge branch 'linter-github-action' into fix-ebpf-in-srv6-pm-topo

Author: cscarpitta

.github/workflows/shell_linter.yml

@@ -0,0 +1,33 @@
+name: Shell Linter
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  shell-lint:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    - name: Shell Linter
+      uses: reviewdog/action-shellcheck@v1
+      with:
+        github_token: ${{ secrets.github_token }}
+        reporter: github-pr-review # Change reporter.
+        path: "." # Optional.
+        pattern: "*.sh" # Optional.
+        exclude: "./.git/*" # Optional.
+        fail_on_error: true
+        level: "info"
+        shellcheck_flags: --severity=style --external-sources
+        filter_mode: "nofilter"

.gitignore

@@ -3,4 +3,11 @@
 *.pyc
 *.log
 *.pid
-*.swp
+*.swp
+
+nets/3routers/starter.sh
+nets/8routers/starter.sh
+nets/8routers-isis-ipv6/starter.sh
+nets/8r-1c-in-band-isis/starter.sh
+nets/8r-1c-out-band-isis/starter.sh
+nets/8r-1c-srv6-pm/starter.sh

nets/3routers/.venv

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-BASE_DIR=/home/user/mytests/ospf3routers/nodeconf
 NODE_NAME=h1
 GW_NAME=r1
 IF_NAME=$NODE_NAME-$GW_NAME

nets/3routers/nodeconf/h1/start.sh

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-BASE_DIR=/home/user/mytests/ospf3routers/nodeconf
 NODE_NAME=h2
 GW_NAME=r2
 IF_NAME=$NODE_NAME-$GW_NAME

nets/3routers/nodeconf/h2/start.sh

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-BASE_DIR=/home/user/mytests/ospf3routers/nodeconf
 NODE_NAME=h3
 GW_NAME=r3
 IF_NAME=$NODE_NAME-$GW_NAME

nets/3routers/nodeconf/h3/start.sh

@@ -12,16 +12,16 @@ sysctl -w net.ipv4.ip_forward=1
 #sysctl -w net.ipv4.conf.default.rp_filter=0
 #the following for loop also disables all and default
 for i in /proc/sys/net/ipv4/conf/*/rp_filter ; do
-  echo 0 > $i 
+  echo 0 > "$i" 
 done
 
 
 echo "no service integrated-vtysh-config" >> /etc/frr/vtysh.conf
 chown frr:frrvty $BASE_DIR/$NODE_NAME
 #chown quagga:quagga $BASE_DIR/$NODE_NAME
 
-$FRR_PATH/zebra -f $PWD/$BASE_DIR/$NODE_NAME/zebra.conf -d -z $PWD/$BASE_DIR/$NODE_NAME/zebra.sock -i $PWD/$BASE_DIR/$NODE_NAME/zebra.pid
+$FRR_PATH/zebra -f "$PWD"/$BASE_DIR/$NODE_NAME/zebra.conf -d -z "$PWD"/$BASE_DIR/$NODE_NAME/zebra.sock -i "$PWD"/$BASE_DIR/$NODE_NAME/zebra.pid
 
 sleep 1
 
-$FRR_PATH/ospfd -f $PWD/$BASE_DIR/$NODE_NAME/ospfd.conf -d -z $PWD/$BASE_DIR/$NODE_NAME/zebra.sock -i $PWD/$BASE_DIR/$NODE_NAME/ospfd.pid
+$FRR_PATH/ospfd -f "$PWD"/$BASE_DIR/$NODE_NAME/ospfd.conf -d -z "$PWD"/$BASE_DIR/$NODE_NAME/zebra.sock -i "$PWD"/$BASE_DIR/$NODE_NAME/ospfd.pid

nets/3routers/nodeconf/r1/start.sh

@@ -12,16 +12,16 @@ sysctl -w net.ipv4.ip_forward=1
 #sysctl -w net.ipv4.conf.default.rp_filter=0
 #the following for loop also disables all and default
 for i in /proc/sys/net/ipv4/conf/*/rp_filter ; do
-  echo 0 > $i 
+  echo 0 > "$i" 
 done
 
 
 echo "no service integrated-vtysh-config" >> /etc/frr/vtysh.conf
 chown frr:frrvty $BASE_DIR/$NODE_NAME
 #chown quagga:quagga $BASE_DIR/$NODE_NAME
 
-$FRR_PATH/zebra -f $PWD/$BASE_DIR/$NODE_NAME/zebra.conf -d -z $PWD/$BASE_DIR/$NODE_NAME/zebra.sock -i $PWD/$BASE_DIR/$NODE_NAME/zebra.pid
+$FRR_PATH/zebra -f "$PWD"/$BASE_DIR/$NODE_NAME/zebra.conf -d -z "$PWD"/$BASE_DIR/$NODE_NAME/zebra.sock -i "$PWD"/$BASE_DIR/$NODE_NAME/zebra.pid
 
 sleep 1
 
-$FRR_PATH/ospfd -f $PWD/$BASE_DIR/$NODE_NAME/ospfd.conf -d -z $PWD/$BASE_DIR/$NODE_NAME/zebra.sock -i $PWD/$BASE_DIR/$NODE_NAME/ospfd.pid
+$FRR_PATH/ospfd -f "$PWD"/$BASE_DIR/$NODE_NAME/ospfd.conf -d -z "$PWD"/$BASE_DIR/$NODE_NAME/zebra.sock -i "$PWD"/$BASE_DIR/$NODE_NAME/ospfd.pid

nets/3routers/nodeconf/r2/start.sh

@@ -12,16 +12,16 @@ sysctl -w net.ipv4.ip_forward=1
 #sysctl -w net.ipv4.conf.default.rp_filter=0
 #the following for loop also disables all and default
 for i in /proc/sys/net/ipv4/conf/*/rp_filter ; do
-  echo 0 > $i 
+  echo 0 > "$i" 
 done
 
 
 echo "no service integrated-vtysh-config" >> /etc/frr/vtysh.conf
 chown frr:frrvty $BASE_DIR/$NODE_NAME
 #chown quagga:quagga $BASE_DIR/$NODE_NAME
 
-$FRR_PATH/zebra -f $PWD/$BASE_DIR/$NODE_NAME/zebra.conf -d -z $PWD/$BASE_DIR/$NODE_NAME/zebra.sock -i $PWD/$BASE_DIR/$NODE_NAME/zebra.pid
+$FRR_PATH/zebra -f "$PWD"/$BASE_DIR/$NODE_NAME/zebra.conf -d -z "$PWD"/$BASE_DIR/$NODE_NAME/zebra.sock -i "$PWD"/$BASE_DIR/$NODE_NAME/zebra.pid
 
 sleep 1
 
-$FRR_PATH/ospfd -f $PWD/$BASE_DIR/$NODE_NAME/ospfd.conf -d -z $PWD/$BASE_DIR/$NODE_NAME/zebra.sock -i $PWD/$BASE_DIR/$NODE_NAME/ospfd.pid
+$FRR_PATH/ospfd -f "$PWD"/$BASE_DIR/$NODE_NAME/ospfd.conf -d -z "$PWD"/$BASE_DIR/$NODE_NAME/zebra.sock -i "$PWD"/$BASE_DIR/$NODE_NAME/ospfd.pid

nets/3routers/nodeconf/r3/start.sh

@@ -2,28 +2,6 @@
 
 import os
 
-# Activate virtual environment if a venv path has been specified in .venv
-# This must be executed only if this file has been executed as a 
-# script (instead of a module)
-if __name__ == '__main__':
-    # Check if .venv file exists
-    if os.path.exists('.venv'):
-        with open('.venv', 'r') as venv_file:
-            # Get virtualenv path from .venv file
-            # and remove trailing newline chars
-            venv_path = venv_file.read().rstrip()
-        # Get path of the activation script
-        venv_path = os.path.join(venv_path, 'bin/activate_this.py')
-        if not os.path.exists(venv_path):
-            print('Virtual environment path specified in .venv '
-                  'points to an invalid path\n')
-            exit(-2)
-        with open(venv_path) as f:
-            # Read the activation script
-            code = compile(f.read(), venv_path, 'exec')
-            # Execute the activation script to activate the venv
-            exec(code, {'__file__': venv_path})
-
 import shutil
 from mininet.topo import Topo
 from mininet.node import Host