pcn-nat: tests updated with the new notation for the routers

(from netmask to prefix len)

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

Author: francescomessina

src/services/pcn-nat/test/examples/example1.sh

@@ -36,9 +36,9 @@ create_veth_net 2
 polycubectl nat add nat1
 polycubectl router add r1
 
-polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip netmask=255.255.255.0
+polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip/24
 polycubectl router r1 ports to_veth1 set peer=veth1
-polycubectl router r1 ports add to_nat1 ip=$to_nat_ip netmask=255.255.255.0
+polycubectl router r1 ports add to_nat1 ip=$to_nat_ip/24
 
 polycubectl nat1 ports add to_r1 type=INTERNAL
 polycubectl connect nat1:to_r1 r1:to_nat1

src/services/pcn-nat/test/examples/example2.sh

@@ -36,9 +36,9 @@ create_veth_net 2
 polycubectl nat add nat1
 polycubectl router add r1
 
-polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip netmask=255.255.255.0
+polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip/24
 polycubectl router r1 ports to_veth1 set peer=veth1
-polycubectl router r1 ports add to_nat1 ip=$to_nat_ip netmask=255.255.255.0
+polycubectl router r1 ports add to_nat1 ip=$to_nat_ip/24
 
 polycubectl nat1 ports add to_r1 type=INTERNAL
 polycubectl connect nat1:to_r1 r1:to_nat1

src/services/pcn-nat/test/examples/example3.sh

@@ -38,9 +38,9 @@ create_veth_net 2
 polycubectl nat add nat1
 polycubectl router add r1
 
-polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip netmask=255.255.255.0
+polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip/24
 polycubectl router r1 ports to_veth1 set peer=veth1
-polycubectl router r1 ports add to_nat1 ip=$to_nat_ip netmask=255.255.255.0
+polycubectl router r1 ports add to_nat1 ip=$to_nat_ip/24
 
 polycubectl nat1 ports add to_r1 type=INTERNAL
 polycubectl connect nat1:to_r1 r1:to_nat1

src/services/pcn-nat/test/examples/example4.sh

@@ -54,9 +54,9 @@ create_veth_net 2
 polycubectl nat add nat1
 polycubectl router add r1
 
-polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip netmask=255.255.255.0
+polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip/24
 polycubectl router r1 ports to_veth1 set peer=veth1
-polycubectl router r1 ports add to_nat1 ip=$to_nat_ip netmask=255.255.255.0
+polycubectl router r1 ports add to_nat1 ip=$to_nat_ip/24
 
 polycubectl nat1 ports add to_r1 type=INTERNAL
 polycubectl connect nat1:to_r1 r1:to_nat1

src/services/pcn-nat/test/test_all_dnat.sh

@@ -60,8 +60,8 @@ create_veth_net 2
 polycubectl nat add nat1
 polycubectl router add r1
 
-polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip netmask=255.255.255.0 peer=veth1
-polycubectl router r1 ports add to_veth2 ip=$to_veth2_ip netmask=255.255.255.0 peer=veth2
+polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip/24 peer=veth1
+polycubectl router r1 ports add to_veth2 ip=$to_veth2_ip/24 peer=veth2
 
 polycubectl attach nat1 r1:to_veth2 position=first
 

src/services/pcn-nat/test/test_all_pf.sh

@@ -62,8 +62,8 @@ create_veth_net 2
 polycubectl nat add nat1
 polycubectl router add r1
 
-polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip netmask=255.255.255.0 peer=veth1
-polycubectl router r1 ports add to_veth2 ip=$to_veth2_ip netmask=255.255.255.0 peer=veth2
+polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip/24 peer=veth1
+polycubectl router r1 ports add to_veth2 ip=$to_veth2_ip/24 peer=veth2
 
 polycubectl attach nat1 r1:to_veth2 position=first
 

src/services/pcn-nat/test/test_icmp_dnat.sh

@@ -36,8 +36,8 @@ create_veth_net 2
 polycubectl nat add nat1
 polycubectl router add r1
 
-polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip netmask=255.255.255.0 peer=veth1
-polycubectl router r1 ports add to_veth2 ip=$to_veth2_ip netmask=255.255.255.0 peer=veth2
+polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip/24 peer=veth1
+polycubectl router r1 ports add to_veth2 ip=$to_veth2_ip/24 peer=veth2
 
 polycubectl attach nat1 r1:to_veth2 position=first
 

src/services/pcn-nat/test/test_icmp_masq.sh

@@ -35,8 +35,8 @@ create_veth_net 2
 polycubectl nat add nat1
 polycubectl router add r1
 
-polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip netmask=255.255.255.0 peer=veth1
-polycubectl router r1 ports add to_veth2 ip=$to_veth2_ip netmask=255.255.255.0 peer=veth2
+polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip/24 peer=veth1
+polycubectl router r1 ports add to_veth2 ip=$to_veth2_ip/24 peer=veth2
 
 polycubectl attach nat1 r1:to_veth2 position=first
 

src/services/pcn-nat/test/test_icmp_snat.sh

@@ -35,12 +35,12 @@ create_veth_net 2
 polycubectl nat add nat1
 polycubectl router add r1
 
-polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip netmask=255.255.255.0 peer=veth1
-polycubectl router r1 ports add to_veth2 ip=$to_veth2_ip netmask=255.255.255.0 peer=veth2
+polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip/24 peer=veth1
+polycubectl router r1 ports add to_veth2 ip=$to_veth2_ip/24 peer=veth2
 
 polycubectl attach nat1 r1:to_veth2 position=first
 
 # configure source nat
 polycubectl nat1 rule snat append internal-net=10.0.1.0/24 external-ip=$to_veth2_ip
 
-sudo ip netns exec ns1 ping $veth2_ip -c 3
+sudo ip netns exec ns1 ping $veth2_ip -c 3

src/services/pcn-nat/test/test_tcp_dnat.sh

@@ -52,8 +52,8 @@ create_veth_net 2
 polycubectl nat add nat1
 polycubectl router add r1
 
-polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip netmask=255.255.255.0 peer=veth1
-polycubectl router r1 ports add to_veth2 ip=$to_veth2_ip netmask=255.255.255.0 peer=veth2
+polycubectl router r1 ports add to_veth1 ip=$to_veth1_ip/24 peer=veth1
+polycubectl router r1 ports add to_veth2 ip=$to_veth2_ip/24 peer=veth2
 
 polycubectl attach nat1 r1:to_veth2 position=first