EM-345: Merge EM-345-port-pyd7a-from-python2-to-python3-run-sub-iot-testsuite-with-python3 to master

Author: jolantatadla

.gitlab-ci.yml

@@ -149,7 +149,7 @@ job 2:
   - job 1
   script:
   - if $(lsof -i -P -n | grep -q JLinkExe) ; then exit 1; fi
-  - if pgrep -f "python2 run.py" ; then exit 1; fi
+  - if pgrep -f "python3 run.py" ; then exit 1; fi
   - cd build/apps/modem
   - JLinkExe -SelectEmuBySN 770821797 -CommandFile jlink-flash-full.script > flashOutput1.txt
   - JLinkExe -SelectEmuBySN 772958091 -CommandFile jlink-flash-full.script > flashOutput2.txt
@@ -158,20 +158,18 @@ job 2:
   - if grep -q 'FAILED\|ERROR' "flashOutput1.txt"; then exit 1; fi
   - if grep -q 'FAILED\|ERROR' "flashOutput2.txt"; then exit 1; fi
 job 3:
+  image: python:3.8
   tags:
   - testsuite
   stage: run tests
   script:
   - if $(lsof -i -P -n | grep -q JLinkExe) ; then exit 1; fi
-  - if pgrep -f "python2 run.py" ; then exit 1; fi
+  - if pgrep -f "python3 run.py" ; then exit 1; fi
   - rm -rf Sub-IoT-testsuite
   - git clone --recurse-submodules https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/aloxy/Sub-IoT-testsuite.git
   - cd Sub-IoT-testsuite
-  - pip install -r requirements.txt
-  - cd lib/pyd7a/
-  - pip install -r requirements.txt
-  - cd ../..
-  - python2 run.py --serial-test-device=/dev/ttyUSB0 --serial-dut=/dev/ttyUSB1 -m "not band433 and not band915 and not known_issue" --junitxml report.xml -v
+  - python3 -m pip install -r requirements.txt -r lib/pyd7a/requirements.txt
+  - python3 run.py --serial-test-device=/dev/ttyUSB0 --serial-dut=/dev/ttyUSB1 -m "not band433 and not known_issue" --junitxml report.xml -v
   artifacts:
     reports:
       junit: Sub-IoT-testsuite/report.xml

docs/_docs/filesystem.md

@@ -21,7 +21,7 @@ The platform should define the blockdevices to use for the filesystem. The files
 To do this, the platform should define `PLATFORM_METADATA_BLOCKDEVICE`, `PLATFORM_PERMANENT_BLOCKDEVICE` and `PLATFORM_VOLATILE_BLOCKDEVICE` in its platform.h (see for instance `stack/framework/hal/platforms/B_L072Z_LRWAN1/inc/platform.h`).
 
 The data in the systemfiles contained in `d7ap_fs_data.c` is not hardcoded, instead it is generated.
-For this we use [pyd7a](https://github.com/Sub-IoT/pyd7a), which provides an API to generate the files, together with [cog](https://github.com/nedbat/cog). Cog is a code generation tool which allows to run the python code embedded in comments in `d7ap_fs_data.c` and generate output, which is used to fill the C arrays. If wanted, the filesystem data can be updated by running `PYTHONPATH="<path to pyd7a>" python2 -m cogapp -c -r stack/fs/d7ap_fs_data.c` (after installing pyd7a).
+For this we use [pyd7a](https://github.com/Sub-IoT/pyd7a), which provides an API to generate the files, together with [cog](https://github.com/nedbat/cog). Cog is a code generation tool which allows to run the python code embedded in comments in `d7ap_fs_data.c` and generate output, which is used to fill the C arrays. If wanted, the filesystem data can be updated by running `PYTHONPATH="<path to pyd7a>" python3 -m cogapp -c -r stack/fs/d7ap_fs_data.c` (after installing pyd7a).
 
 The value of the systemfiles in `d7ap_fs_data.c` is provided as a default. If you want to override it for your application you can do it out-of-tree to keep the source in sync with upstream. To do so, set the `MODULE_D7AP_FS_USE_DEFAULT_SYSTEMFILES` cmake variable to `false` and define `fs_systemfiles` and `fs_systemfiles_file_offsets` in your application code (which can be [out-of-tree]({{ site.baseurl }}{% link _docs/out-of-tree.md %})). The easiest way is to copy `d7ap_fs_data.c` to your application directory, strip everything besides the `fs_systemfiles` and `fs_systemfiles_file_offsets` definitions, adapt file contents where needed and add it to the `APP_BUILD` sources in the app's CMakeLists.txt.
 

stack/fs/d7ap_fs_data.c

@@ -99,7 +99,7 @@ LoRaWAN_OTAA_Keys = [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07] + \
 
 #This is an offset to factor in the antenna gain in order to comply with max tx pow regulations. So e.g. setting this to 2 will DROP the tx power used in software by 2dBm.
 lorawan_antenna_gain_in_db = 1 #dBm #in EU868 the MAX_EIRP is 16dBm so this corresponds to a max TX power of 15dBm 
-lorawan_antenna_gain = [int(bytes(lorawan_antenna_gain_in_db & 0xff))] #dBm
+lorawan_antenna_gain = [lorawan_antenna_gain_in_db & 0xff] #dBm
 lorawan_antenna_gain_file_size = 1
 
 ctrl_stack_file_size = 2