Merge pull request #22 from netgroup/fix-ebpf-in-srv6-pm-topo

Clean and fix 8r-1c-srv6-pm topology

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"

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

@@ -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/h2/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/h3/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/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

@@ -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/ospf3r.py

@@ -1,22 +1,27 @@
 #!/usr/bin/python
 
-import os
+# pylint: disable=missing-module-docstring
+# pylint: disable=missing-function-docstring
+# pylint: disable=missing-class-docstring
 
+import os
 import shutil
-from mininet.topo import Topo
-from mininet.node import Host
-from mininet.net import Mininet
+
 from mininet.cli import CLI
-from mininet.util import dumpNodeConnections
 from mininet.link import Link
 from mininet.log import setLogLevel
+from mininet.net import Mininet
+# from mininet.topo import Topo
+from mininet.node import Host
+from mininet.util import dumpNodeConnections
 
-#BASEDIR = "/home/user/mytests/ospf3routers/nodeconf/"
+# BASEDIR = "/home/user/mytests/ospf3routers/nodeconf/"
 BASEDIR = os.getcwd()+"/nodeconf/"
 OUTPUT_PID_TABLE_FILE = "/tmp/pid_table_file.txt"
 
 PRIVDIR = '/var/priv'
 
+
 class BaseNode(Host):
 
     def __init__(self, name, *args, **kwargs):
@@ -25,27 +30,29 @@ def __init__(self, name, *args, **kwargs):
         self.dir = "/tmp/%s" % name
         self.nets = []
         if not os.path.exists(self.dir):
-            os.makedirs(self.dir) 
+            os.makedirs(self.dir)
 
     def config(self, **kwargs):
+        # pylint: disable=arguments-differ
+
         # Init steps
         Host.config(self, **kwargs)
         # Iterate over the interfaces
-        first = True
+        # first = True
         for intf in self.intfs.values():
             # Remove any configured address
-            self.cmd('ifconfig %s 0' %intf.name)
+            self.cmd('ifconfig %s 0' % intf.name)
             # # For the first one, let's configure the mgmt address
             # if first:
             #   first = False
             #   self.cmd('ip a a %s dev %s' %(kwargs['mgmtip'], intf.name))
-        #let's write the hostname in /var/mininet/hostname
+        # let's write the hostname in /var/mininet/hostname
         self.cmd("echo '" + self.name + "' > "+PRIVDIR+"/hostname")
-        if os.path.isfile(BASEDIR+self.name+"/start.sh") :
-            self.cmd('source %s' %BASEDIR+self.name+"/start.sh")
+        if os.path.isfile(BASEDIR+self.name+"/start.sh"):
+            self.cmd('source %s' % BASEDIR+self.name+"/start.sh")
 
     def cleanup(self):
-        def remove_if_exists (filename):
+        def remove_if_exists(filename):
             if os.path.exists(filename):
                 os.remove(filename)
 
@@ -86,78 +93,80 @@ def __init__(self, name, *args, **kwargs):
 
 # the add_link function creates a link and assigns the interface names
 # as node1-node2 and node2-node1
-def add_link (node1, node2):
+
+
+def add_link(node1, node2):
     Link(node1, node2, intfName1=node1.name+'-'+node2.name,
-                       intfName2=node2.name+'-'+node1.name)
+         intfName2=node2.name+'-'+node1.name)
+
 
 def create_topo(my_net):
+    # pylint: disable=invalid-name
     h1 = my_net.addHost(name='h1', cls=BaseNode)
     h2 = my_net.addHost(name='h2', cls=BaseNode)
     h3 = my_net.addHost(name='h3', cls=BaseNode)
     r1 = my_net.addHost(name='r1', cls=Router)
     r2 = my_net.addHost(name='r2', cls=Router)
     r3 = my_net.addHost(name='r3', cls=Router)
 
-    #note that if the interface names are not provided,
-    #the order of adding link will determine the
-    #naming of the interfaces (e.g. on r1: r1-eth0, r1-eth1, r1-eth2...)
+    # note that if the interface names are not provided,
+    # the order of adding link will determine the
+    # naming of the interfaces (e.g. on r1: r1-eth0, r1-eth1, r1-eth2...)
     # it is possible to provide names as follows
     # Link(h1, r1, intfName1='h1-eth0', intfName2='r1-eth0')
     # the add_link function creates a link and assigns the interface names
     # as node1-node2 and node2-node1
 
-    #Link(h1, r1, intfName1='h1-r1', intfName2='r1-h1')
-    #Link(h2, r2, intfName1='h2-r2', intfName2='r2-h2')
-    #Link(h3, r3, intfName1='h3-r3', intfName2='r3-h3')
-    add_link(h1,r1)
-    add_link(h2,r2)
-    add_link(h3,r3)
+    # Link(h1, r1, intfName1='h1-r1', intfName2='r1-h1')
+    # Link(h2, r2, intfName1='h2-r2', intfName2='r2-h2')
+    # Link(h3, r3, intfName1='h3-r3', intfName2='r3-h3')
+    add_link(h1, r1)
+    add_link(h2, r2)
+    add_link(h3, r3)
 
-    add_link(r1,r2)
-    add_link(r1,r3)
-    add_link(r2,r3)
+    add_link(r1, r2)
+    add_link(r1, r3)
+    add_link(r2, r3)
 
 
-def stopAll():
+def stop_all():
     # Clean Mininet emulation environment
     os.system('sudo mn -c')
     # Kill all the started daemons
     os.system('sudo killall sshd zebra ospfd')
 
-def extractHostPid (dumpline):
+
+def extract_host_pid(dumpline):
     temp = dumpline[dumpline.find('pid=')+4:]
-    return int(temp [:len(temp)-2])
+    return int(temp[:len(temp)-2])
 
 
-    
-def simpleTest():
+def simple_test():
     "Create and test a simple network"
 
-    #topo = RoutersTopo()
-    #net = Mininet(topo=topo, build=False, controller=None)
+    # topo = RoutersTopo()
+    # net = Mininet(topo=topo, build=False, controller=None)
     net = Mininet(topo=None, build=False, controller=None)
     create_topo(net)
 
     net.build()
     net.start()
 
-
     print("Dumping host connections")
     dumpNodeConnections(net.hosts)
-    #print "Testing network connectivity"
-    #net.pingAll()
+    # print "Testing network connectivity"
+    # net.pingAll()
 
-    with open(OUTPUT_PID_TABLE_FILE,"w") as file:
+    with open(OUTPUT_PID_TABLE_FILE, "w") as file:
         for host in net.hosts:
-            file.write("%s %d\n" % (host, extractHostPid( repr(host) )) )
-
-    CLI( net ) 
-    net.stop() 
-    stopAll()
+            file.write("%s %d\n" % (host, extract_host_pid(repr(host))))
 
+    CLI(net)
+    net.stop()
+    stop_all()
 
 
 if __name__ == '__main__':
     # Tell mininet to print useful information
     setLogLevel('info')
-    simpleTest()
+    simple_test()

nets/8r-1c-in-band-isis/README.md

@@ -273,7 +273,6 @@ Currently IPv6 forwarding is not explicitly enabled in start.sh, we have to conf
 
 Example of configuration of start.sh
 
-BASE_DIR=/home/user/Progetto/1920-srv6-tutorial/nets/8routers-isis-ipv6/nodeconf
 NODE_NAME=h11
 GW_NAME=r1
 IF_NAME=$NODE_NAME-$GW_NAME