pcn-router: test updated with the new notation

(from netmask to prefix len)

Signed-off-by: Francesco Messina <francescomessina92@hotmail.com>

Author: francescomessina

src/services/pcn-router/test/bridge/test2_2_4.sh

@@ -44,7 +44,7 @@ polycubectl router add r2 type=$TYPE
 polycubectl simplebridge add br1 type=$TYPE
 polycubectl simplebridge add br2 type=$TYPE
 
-router_add_port r1 to_br1 10.10.2.1 255.255.255.0
+router_add_port r1 to_br1 10.10.2.1/24
 
 bridge_add_port br1 veth1
 bridge_add_port br1 veth2
@@ -57,9 +57,9 @@ bridge_add_port br2 veth4
 
 router_add_port_as_gateway r2 br2 2 br2
 
-router_add_route r1 10.0.2.0 255.255.255.0 10.1.0.2
-router_add_route r2 10.0.1.0 255.255.255.0 10.1.0.1
-router_add_route r2 10.10.2.1 255.255.255.255 10.1.0.1
+router_add_route r1 10.0.2.0/24 10.1.0.2
+router_add_route r2 10.0.1.0/24 10.1.0.1
+router_add_route r2 10.10.2.1/32 10.1.0.1
 
 #sleep 40s #for fill filtering database
 

src/services/pcn-router/test/bridge/test2_2_4_special.sh

@@ -46,16 +46,16 @@ bridge_add_port br1 veth2
 
 polycubectl simplebridge br1 ports add to_r2
 router_add_port_as_gateway r2 br2 2 br2
-router_add_port r2 to_br1 10.0.1.253 255.255.255.0
+router_add_port r2 to_br1 10.0.1.253/24
 
 bridge_add_port br2 veth3
 bridge_add_port br2 veth4
 
 polycubectl connect br1:to_r2 r2:to_br1
 
-router_add_route r1 10.0.2.0 255.255.255.0 10.0.1.253
+router_add_route r1 10.0.2.0/24 10.0.1.253
 
-router_add_route r2 10.0.1.0 255.255.255.0 10.0.1.254 #ignored, local entry is preferred
+router_add_route r2 10.0.1.0/24 10.0.1.254 #ignored, local entry is preferred
 
 sudo ip netns exec ns1 ping 10.0.1.2 -c 2 -i 0.5
 sudo ip netns exec ns1 ping 10.0.2.1 -c 2 -i 0.5

src/services/pcn-router/test/bridge/test2_2_5.sh

@@ -38,37 +38,37 @@ add_routers 2
 add_bridges 2
 
 router_add_port_as_gateway r1 br1 1 br1
-router_add_secondary r1 br1 10.0.2.254 255.255.255.0 #DG for veth2
+router_add_secondary r1 br1 10.0.2.254/24 #DG for veth2
 
 connect_router_p_to_p r1 r2 1
-router_add_secondary r1 r2 10.10.0.1 255.255.255.252
-router_add_secondary r2 r1 10.10.0.2 255.255.255.252   #secondary nexthop
+router_add_secondary r1 r2 10.10.0.1/30
+router_add_secondary r2 r1 10.10.0.2/30   #secondary nexthop
 
 bridge_add_port br1 veth1
 bridge_add_port br1 veth2
 
 router_add_port_as_gateway r2 br2 3 br2
-router_add_secondary r2 br2 10.0.4.254 255.255.255.0 #DG for veth4
-router_add_secondary r2 br2 10.0.5.254 255.255.255.0 #DG for veth5
+router_add_secondary r2 br2 10.0.4.254/24 #DG for veth4
+router_add_secondary r2 br2 10.0.5.254/24 #DG for veth5
 
 bridge_add_port br2 veth3
 bridge_add_port br2 veth4
 bridge_add_port br2 veth5
 
-router_add_route r1 10.0.3.0 255.255.255.0 10.1.0.2 5
-router_add_route r1 10.0.4.0 255.255.255.0 10.1.0.2 5
-router_add_route r1 10.0.5.0 255.255.255.0 10.1.0.2 5
+router_add_route r1 10.0.3.0/24 10.1.0.2 5
+router_add_route r1 10.0.4.0/24 10.1.0.2 5
+router_add_route r1 10.0.5.0/24 10.1.0.2 5
 
-router_add_route r2 10.0.1.0 255.255.255.0 10.1.0.1 5
-router_add_route r2 10.0.2.0 255.255.255.0 10.1.0.1 5
+router_add_route r2 10.0.1.0/24 10.1.0.1 5
+router_add_route r2 10.0.2.0/24 10.1.0.1 5
 
 #minor patchost
-router_add_route r1 10.0.3.0 255.255.255.0 10.10.0.2 2
+router_add_route r1 10.0.3.0/24 10.10.0.2 2
 
 ping_cycle 5
 ping_special 5 10.10.0.1 10.10.0.2
 
-polycubectl router r1 ports to_r2 secondaryip del 10.10.0.1 255.255.255.252
+polycubectl router r1 ports to_r2 secondaryip del 10.10.0.1/30
 
 ping_cycle 5
 

src/services/pcn-router/test/helpers.bash

@@ -27,7 +27,7 @@ function del_routers {
 }
 
 function router_add_port_as_gateway { #$3 network number #$4 bridge name
-  polycubectl router $1 ports add to_$2 ip=10.0.$3.254 netmask=255.255.255.0
+  polycubectl router $1 ports add to_$2 ip=10.0.$3.254/24
   if [[ $# -eq 4 ]] ; then
     polycubectl simplebridge $4 ports add to_$1
     polycubectl connect $4:to_$1 $1:to_$4
@@ -38,30 +38,30 @@ function router_add_port_as_gateway { #$3 network number #$4 bridge name
 
 }
 
-function router_add_port { #$3 ip $4 netmask
-  polycubectl router $1 ports add $2 ip=$3 netmask=$4
+function router_add_port { #$3 ip
+  polycubectl router $1 ports add $2 ip=$3
 }
 
 function connect_router_p_to_p { #$1 router name 1, $2 router name 2, $3 network point to point connection
-  polycubectl router $1 ports add to_$2 ip=10.$3.0.1 netmask=255.255.255.252
-  polycubectl router $2 ports add to_$1 ip=10.$3.0.2 netmask=255.255.255.252
+  polycubectl router $1 ports add to_$2 ip=10.$3.0.1/30
+  polycubectl router $2 ports add to_$1 ip=10.$3.0.2/30
   polycubectl connect $1:to_$2 $2:to_$1
 }
 
 function connect_router_secondary_p_to_p { #$1 router name 1, $2 router name 2, $3 network point to point connection
-  polycubectl router $1 ports to_$2 secondaryip add 10.$3.0.1 255.255.255.252
-  polycubectl router $2 ports to_$1 secondaryip add 10.$3.0.2 255.255.255.252
+  polycubectl router $1 ports to_$2 secondaryip add 10.$3.0.1/30
+  polycubectl router $2 ports to_$1 secondaryip add 10.$3.0.2/30
   polycubectl connect $1:to_$2 $2:to_$1
 }
 
 
 
 function router_add_secondary {
-  polycubectl router $1 ports to_$2 secondaryip add $3 $4
+  polycubectl router $1 ports to_$2 secondaryip add $3
 }
 
 function router_add_secondary_as_gateway {
-polycubectl router $1 ports to_$2 secondaryip add 10.0.$3.254 255.255.255.0
+polycubectl router $1 ports to_$2 secondaryip add 10.0.$3.254/24
   if [[ $# -eq 4 ]] ; then
     polycubectl simplebridge $4 ports add to_$1
     polycubectl connect $4:to_$1 $1:to_$4
@@ -72,10 +72,10 @@ polycubectl router $1 ports to_$2 secondaryip add 10.0.$3.254 255.255.255.0
 
 function router_add_route {
 
-  if [[ $# -eq 5 ]] ; then
-    polycubectl router $1 route add $2 $3 $4 pathcost=$5
+  if [[ $# -eq 4 ]] ; then
+    polycubectl router $1 route add $2 $3 pathcost=$4
   else
-  	polycubectl router $1 route add $2 $3 $4
+    polycubectl router $1 route add $2 $3
   fi
 
 }

src/services/pcn-router/test/test1_3s.sh

@@ -41,23 +41,23 @@ set -e
 add_routers 1
 
 # Creates three ports on the router, each one attached to a different namespace
-router_add_port r1 to_veth1 10.0.0.120 255.255.255.0
-router_add_port r1 to_veth2 10.10.20.10 255.255.255.0
-router_add_port r1 to_veth3 10.30.10.10 255.255.255.0
+router_add_port r1 to_veth1 10.0.0.120/24
+router_add_port r1 to_veth2 10.10.20.10/24
+router_add_port r1 to_veth3 10.30.10.10/24
 
 # Configure secondary addresses on port veth1
-router_add_secondary r1 veth1 10.10.10.1 255.255.255.0
-router_add_secondary r1 veth1 10.10.21.2 255.255.255.0
+router_add_secondary r1 veth1 10.10.10.1/24
+router_add_secondary r1 veth1 10.10.21.2/24
 router_add_secondary_as_gateway r1 veth1 1
 
 # Configure secondary addresses on port veth2
-router_add_secondary r1 veth2 10.14.1.1 255.255.255.0
-router_add_secondary r1 veth2 10.1.15.2 255.255.255.0
+router_add_secondary r1 veth2 10.14.1.1/24
+router_add_secondary r1 veth2 10.1.15.2/24
 router_add_secondary_as_gateway r1 veth2 2
 
 # Configure secondary addresses on port veth3
-router_add_secondary r1 veth3 11.1.1.1 255.255.255.0
-router_add_secondary r1 veth3 12.1.1.1 255.255.255.0
+router_add_secondary r1 veth3 11.1.1.1/24
+router_add_secondary r1 veth3 12.1.1.1/24
 router_add_secondary_as_gateway r1 veth3 3
 
 #ns1 on port veth1

src/services/pcn-router/test/test3_3s.sh

@@ -43,29 +43,29 @@ polycubectl router add r3 type=$TYPE
 
 router_add_port_as_gateway r1 veth1 1
 
-router_add_port r1 to_r2 10.10.10.10 255.255.255.0
-router_add_port r2 to_r1 10.10.20.10 255.255.255.0
+router_add_port r1 to_r2 10.10.10.10/24
+router_add_port r2 to_r1 10.10.20.10/24
 connect_router_secondary_p_to_p r1 r2 1
 
-router_add_port r2 to_veth2 12.10.1.1 255.255.255.0
+router_add_port r2 to_veth2 12.10.1.1/24
 router_add_secondary_as_gateway r2 veth2 2
 
 connect_router_p_to_p r1 r3 2
 connect_router_p_to_p r2 r3 3
 
 router_add_port_as_gateway r3 veth3 3
 
-#router_add_route r1 10.0.2.0 255.255.255.0 10.1.0.2
-#router_add_route r1 10.0.3.0 255.255.255.0 10.2.0.2
-router_add_route r1 0.0.0.0 0.0.0.0 10.1.0.2
+#router_add_route r1 10.0.2.0/24 10.1.0.2
+#router_add_route r1 10.0.3.0/24 10.2.0.2
+router_add_route r1 0.0.0.0/0 10.1.0.2
 
-router_add_route r2 10.0.1.0 255.255.255.0 10.1.0.1
-router_add_route r2 10.0.3.0 255.255.255.0 10.3.0.2
+router_add_route r2 10.0.1.0/24 10.1.0.1
+router_add_route r2 10.0.3.0/24 10.3.0.2
 
-router_add_route r3 10.0.1.0 255.255.255.0 10.2.0.1
-router_add_route r3 10.0.2.0 255.255.255.0 10.3.0.1
-router_add_route r3 10.10.10.10 255.255.255.255 10.2.0.1
-router_add_route r3 10.10.20.10 255.255.255.255 10.3.0.1
+router_add_route r3 10.0.1.0/24 10.2.0.1
+router_add_route r3 10.0.2.0/24 10.3.0.1
+router_add_route r3 10.10.10.10/32 10.2.0.1
+router_add_route r3 10.10.20.10/32 10.3.0.1
 
 router_routingtable_show r1
 router_routingtable_show r2
@@ -78,5 +78,3 @@ ping_cycle 3
 
 #test ICMP ttl exceeded packet
 test_fail sudo ip netns exec ns1 ping 10.0.2.2 -b -t1 -c 2 -i 0.5
-
-

src/services/pcn-router/test/test_shadow/test1.sh

@@ -17,7 +17,7 @@ polycubectl router add r1 shadow=true
 sudo ip netns ls
 
 # Add port p1
-router_add_port r1 p1 10.0.0.1 255.255.255.0
+router_add_port r1 p1 10.0.0.1/24
 sudo ip netns exec pcn-r1 ip -c a
 
 # Change the Ip address of the p1 port from Linux

src/services/pcn-router/test/test_shadow/test4.sh

@@ -27,7 +27,7 @@ set -e
 
 # Create the router r1 (shadow) and the port p1
 polycubectl router add r1 shadow=true
-router_add_port r1 p1 10.0.0.1 255.255.255.0
+router_add_port r1 p1 10.0.0.1/24
 
 # Show router r1
 polycubectl router r1 show