[Ci] Upgrade python 2 to python 3 (#145)

[Ci] Upgrade python 2 to python 3
Fix unit test failure

Dockerfile

@@ -17,7 +17,7 @@ RUN apt-get update \
       libzmq5-dev
 
 COPY debs /debs
-RUN dpkg -i /debs/*.deb
+RUN dpkg -i /debs/*.deb || apt-get --fix-broken -y install
 RUN rm -fr /debs
 
 COPY supervisor/supervisor.conf /etc/supervisor/conf.d/

Dockerfile.build

@@ -27,7 +27,7 @@ RUN apt-get update \
       pkg-config
 
 COPY debs /debs
-RUN dpkg -i /debs/*.deb
+RUN dpkg -i /debs/*.deb || apt-get --fix-broken -y install
 RUN rm -fr /debs
 
 #RUN export VERSION=0.9.3 \

Dockerfile.test

@@ -18,7 +18,7 @@ RUN apt-get update \
       libzmq5-dev
 
 COPY debs /debs
-RUN dpkg -i /debs/*.deb
+RUN dpkg -i /debs/*.deb || apt-get --fix-broken -y install
 RUN rm -fr /debs
 
 # Adjust redis configurations

azurepipeline.yml

@@ -21,11 +21,6 @@ jobs:
     - checkout: self
       clean: true
 
-    # TODO: upgrade to python3
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '2.7'
-
     - script: |
         set -ex
         ./build.sh
@@ -40,8 +35,7 @@ jobs:
 
     - script: |
         set -ex
-        pip install requests
-        pip install redis
+        pip install -r test/requirements.txt
         pip install -U pytest
         cd test
         pytest -vv

copy.sh

@@ -1,7 +1,7 @@
 set -e
 
-wget -O debs/libhiredis0.14_0.14.0-3~bpo9+1_amd64.deb  'https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target%2Fdebs%2Fbuster%2Flibhiredis0.14_0.14.0-3~bpo9%2B1_amd64.deb'
-wget -O debs/libhiredis-dev_0.14.0-3~bpo9+1_amd64.deb  'https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target%2Fdebs%2Fbuster%2Flibhiredis-dev_0.14.0-3~bpo9%2B1_amd64.deb'
+wget -O debs/libhiredis0.14_0.14.1-1_amd64.deb  'https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target%2Fdebs%2Fbuster%2Flibhiredis0.14_0.14.1-1_amd64.deb'
+wget -O debs/libhiredis-dev_0.14.1-1_amd64.deb  'https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target%2Fdebs%2Fbuster%2Flibhiredis-dev_0.14.1-1_amd64.deb'
 wget -O debs/libnl-3-200_3.5.0-1_amd64.deb 'https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/buster/libnl-3-200_3.5.0-1_amd64.deb'
 wget -O debs/libnl-3-dev_3.5.0-1_amd64.deb 'https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/buster/libnl-3-dev_3.5.0-1_amd64.deb'
 wget -O debs/libnl-genl-3-200_3.5.0-1_amd64.deb  'https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/buster/libnl-genl-3-200_3.5.0-1_amd64.deb'

dependencies.conf

@@ -4,8 +4,8 @@
     "debian": "buster",
     "arch": "amd64",
     "dependencies": [
-                        "libhiredis0.14_0.14.0-3~bpo9+1",
-                        "libhiredis-dev_0.14.0-3~bpo9+1",
+                        "libhiredis0.14_0.14.1-1",
+                        "libhiredis-dev_0.14.1-1",
                         "libnl-3-200_3.5.0-1",
                         "libnl-3-dev_3.5.0-1",
                         "libnl-genl-3-200_3.5.0-1",

test/apitest.py

@@ -248,9 +248,9 @@ def check_routes_exist_in_tun_tb(self, vnet_num_mapped, routes_arr):
        for route in routes_arr:
            route_table = self.db.hgetall(ROUTE_TUN_TB + ':' + VNET_NAME_PREF +str(vnet_num_mapped)+':'+route['ip_prefix'])
            self.assertEqual(route_table, {
-                            b'endpoint' : route['nexthop'],
-                            b'mac_address' : route['mac_address'],
-                            b'vni' : str(route['vnid'])
+                            b'endpoint' : route['nexthop'].encode(),
+                            b'mac_address' : route['mac_address'].encode(),
+                            b'vni' : str(route['vnid']).encode()
                           })
 
     def check_routes_dont_exist_in_tun_tb(self, vnet_num_mapped, routes_arr):
@@ -262,8 +262,8 @@ def check_routes_exist_in_loc_route_tb(self, vnet_num_mapped, routes_arr):
        for route in routes_arr:
            route_table = self.db.hgetall(LOCAL_ROUTE_TB + ':' + VNET_NAME_PREF +str(vnet_num_mapped)+':'+route['ip_prefix'])
            self.assertEqual(route_table, {
-                            b'nexthop' : route['nexthop'],
-                            b'ifname' : route['ifname']
+                            b'nexthop' : route['nexthop'].encode(),
+                            b'ifname' : route['ifname'].encode()
                           })
 
     def check_routes_dont_exist_in_loc_route_tb(self, vnet_num_mapped, routes_arr):
@@ -1186,7 +1186,7 @@ def test_vrf_routes_all_verbs(self):
     def test_local_subnet_route_addition(self):
         self.post_generic_vlan_and_deps()
         local_route_table = self.db.hgetall(LOCAL_ROUTE_TB + ':' + VNET_NAME_PREF +str(1)+':10.1.1.0/24')
-        self.assertEqual(local_route_table, {b'ifname' : VLAN_NAME_PREF + '2'})
+        self.assertEqual(local_route_table, {b'ifname' : VLAN_NAME_PREF.encode() + b'2'})
         r = self.delete_config_vlan(2)
         self.assertEqual(r.status_code, 204)
         local_route_table = self.db.hgetall(LOCAL_ROUTE_TB + ':' + VNET_NAME_PREF +str(1)+':10.1.1.0/24')

test/restapi_client.py

@@ -250,9 +250,9 @@ def check_routes_exist_in_tun_tb(self, vnet_num_mapped, routes_arr):
        for route in routes_arr:
            route_table = self.db.hgetall(ROUTE_TUN_TB + ':' + VNET_NAME_PREF +str(vnet_num_mapped)+':'+route['ip_prefix'])
            assert route_table == {
-                            b'endpoint' : route['nexthop'],
-                            b'mac_address' : route['mac_address'],
-                            b'vni' : str(route['vnid'])
+                            b'endpoint' : route['nexthop'].encode(),
+                            b'mac_address' : route['mac_address'].encode(),
+                            b'vni' : str(route['vnid']).encode()
                           }
 
     def check_routes_dont_exist_in_tun_tb(self, vnet_num_mapped, routes_arr):
@@ -264,8 +264,8 @@ def check_routes_exist_in_loc_route_tb(self, vnet_num_mapped, routes_arr):
        for route in routes_arr:
            route_table = self.db.hgetall(LOCAL_ROUTE_TB + ':' + VNET_NAME_PREF +str(vnet_num_mapped)+':'+route['ip_prefix'])
            assert route_table == {
-                            b'nexthop' : route['nexthop'],
-                            b'ifname' : route['ifname']
+                            b'nexthop' : route['nexthop'].encode(),
+                            b'ifname' : route['ifname'].encode()
                           }
 
     def check_routes_dont_exist_in_loc_route_tb(self, vnet_num_mapped, routes_arr):