Module tests with Python 3

Author: azuresol

.travis.yml

@@ -33,7 +33,7 @@ before_install:
 install:
   - sudo apt-get install -y python2.7 python3 python3-pip
   - pip2 install grpcio scapy codecov
-  - pip3 install grpcio coverage
+  - pip3 install grpcio scapy-python3 coverage
   - "[[ ${DEBUG:-0} == 0 ]] || sudo apt-get install -y g++-5"  # install gcov-5
   - "[[ ${SANITIZE:-0} == 0 ]] || sudo apt-get install -y llvm-3.8"
   - "[[ $TAG_SUFFIX != _32 ]] || sudo apt-get install -y lib32gcc1"
@@ -53,7 +53,8 @@ script:
   - (cd core && ./all_test)  # TcpFlowReconstructTest requires working directory to be `core/`
   - coverage2 run -m unittest discover -v
   - coverage3 run -m unittest discover -v
-  - bessctl/bessctl -- daemon start -- run testing/run_module_tests
+  - python2 bessctl/bessctl -- daemon start -- run testing/run_module_tests
+  - python3 bessctl/bessctl -- daemon start -- run testing/run_module_tests
 
 after_success:
   - bessctl/bessctl daemon stop # flush out the coverage data

bessctl/conf/perftest/bpf.bess

@@ -10,7 +10,7 @@ bpf:2 -> Sink()      # for matched packets (by the second filter)
 
 def run_testcase(exps, test_pkts):
     rewrite.clear()
-    rewrite.add(templates=map(lambda x: str(x), test_pkts))
+    rewrite.add(templates=map(lambda x: bytes(x), test_pkts))
 
     # the higher number, the higher priority.
     bpf.clear()

bessctl/conf/perftest/flowgen.bess

@@ -23,7 +23,7 @@ ip = scapy.IP(src=src_ip, dst=dst_ip)
 src_port = int($BESS_SRC_PORT!'10001')
 tcp = scapy.TCP(sport=src_port, dport=12345, seq=12345)
 payload = "BESS is the Queen of Packet Processing."
-pkt_template = str(eth/ip/tcp/payload)
+pkt_template = bytes(eth/ip/tcp/payload)
 
 # This script is multi threaded but connects to a single port.
 myport = PMDPort(port_id=0, num_inc_q=num_cores, num_out_q=num_cores)
@@ -49,7 +49,7 @@ while True:
     portstats = myport.get_port_stats().inc.packets
     delta = portstats - prev_portstats
     nextround = max(1e6, 1.1 * delta / sleeptime)
-    print("Received " + str(delta / sleeptime) + " pps. Ramping up to: " + str(nextround))
+    print("Received " + bytes(delta / sleeptime) + " pps. Ramping up to: " + bytes(nextround))
     for wid, pkt_src in flowgens.items():
         bess.pause_worker(wid)
         pkt_src.update(pps = nextround / num_cores)

bessctl/conf/perftest/nat.bess

@@ -10,7 +10,7 @@ eth = scapy.Ether(src='02:1e:67:9f:4d:ac', dst='06:16:3e:1b:72:32')
 ip = scapy.IP(src='10.0.0.1', dst='192.168.1.1')
 udp = scapy.UDP(sport=10001, dport=10002)
 payload = 'helloworld'
-pkt_bytes = str(eth/ip/udp/payload)
+pkt_bytes = bytes(eth/ip/udp/payload)
 
 Source() \
     -> Rewrite(templates=[pkt_bytes]) \

bessctl/conf/perftest/pktgen.bess

@@ -21,7 +21,7 @@ def build_pkt(size):
     payload = ('hello' + '0123456789' * 200)[:size-len(eth/ip/udp)]
     pkt = eth/ip/udp/payload
     pkt.show()
-    return str(pkt)
+    return bytes(pkt)
 
 if imix:
     # https://en.wikipedia.org/wiki/Internet_Mix
@@ -45,7 +45,7 @@ ports = [PMDPort(port_id=i, num_inc_q=num_cores, num_out_q=num_cores) \
          for i in range(num_ports)]
 
 for i in range(num_cores):
-    print("starting up worker: " + str(i))
+    print("starting up worker: " + bytes(i))
     bess.add_worker(wid=i, core=i)
 
     src = Source()

bessctl/conf/port/unix_port.bess

@@ -38,8 +38,8 @@ else:
     s.connect(SOCKET_PATH)
 
 for i in range(ITERATION):
-    original = gen_packet('10.0.0.1', '192.168.1.10' + str(i))
-    s.send(str(original))
+    original = gen_packet('10.0.0.1', '192.168.1.10' + bytes(i))
+    s.send(bytes(original))
 
     modified = s.recv(2048)
     pkt = scapy.Ether(modified)

bessctl/conf/samples/acl.bess

@@ -7,7 +7,7 @@ def gen_packet(proto, src_ip, dst_ip):
     udp = proto(sport=10001, dport=10002)
     payload = 'helloworld'
     pkt = eth/ip/udp/payload
-    return str(pkt)
+    return bytes(pkt)
 
 packets = [gen_packet(scapy.UDP, '172.16.100.1', '10.0.0.1'),
            gen_packet(scapy.UDP, '172.12.55.99', '12.34.56.78'),

bessctl/conf/samples/drr.bess

@@ -5,8 +5,8 @@ ip1 = scapy.IP(src='192.168.1.1', dst='10.0.0.1')
 ip2 = scapy.IP(src='192.168.2.2', dst= '10.0.0.2')
 udp = scapy.UDP(sport=10001, dport=10002)
 payload = 'helloworld'
-pkt_bytes1 = str(eth/ip1/udp/payload)
-pkt_bytes2 = str(eth/ip2/udp/payload)
+pkt_bytes1 = bytes(eth/ip1/udp/payload)
+pkt_bytes2 = bytes(eth/ip2/udp/payload)
 
 # Create the pipeline from two sources rewriting each to have their own 
 # source port and destination port respectively, the pushing them into

bessctl/conf/samples/exactmatch.bess

@@ -11,7 +11,7 @@ def gen_packet(proto, src_ip, dst_ip):
     udp = proto(sport=10001, dport=10002)
     payload = 'helloworld'
     pkt = eth/ip/udp/payload
-    return str(pkt)
+    return bytes(pkt)
 
 packets = [gen_packet(scapy.UDP, '172.16.100.1', '10.0.0.1'),
            gen_packet(scapy.UDP, '172.12.55.99', '12.34.56.78'),

bessctl/conf/samples/flowgen.bess

@@ -10,7 +10,7 @@ ip = scapy.IP(src='10.0.0.1', dst='10.0.0.2')   # dst IP is overwritten
 tcp = scapy.TCP(sport=10001, dport=10002)
 payload = ('hello' + '0123456789' * 200)[:pkt_size-len(eth/ip/tcp)]
 pkt = eth/ip/tcp/payload
-pkt_data = str(pkt)
+pkt_data = bytes(pkt)
 
 # NOTE: without quick_rampup=1, it takes a while to converge to
 # the desied load level, especially when flow duration is pareto distribution