Python3 compatibility

.github/workflows/main.yml

@@ -3,48 +3,54 @@ name: Unit tests
 on: [push, pull_request]
 
 jobs:
-  test_py2:
-    runs-on: ubuntu-20.04
+  test:
+    strategy:
+      matrix:
+        include:
+        - pyversion: '2.7'
+          os: ubuntu-20.04
+        - pyversion: '3'
+          os: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Set up Python 2.7
+      - name: Set up Python ${{ matrix.pyversion }}
         uses: actions/setup-python@v2
         with:
-          python-version: '2.7'
+          python-version: ${{ matrix.pyversion }}
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements-dev.txt
           # FIXME: branding.py still has no permanent home
           curl https://gist.github.com/ydirson/3c36a7e19d762cc529a6c82340894ccc/raw/5ca39f621b1feab813e171f535c1aad1bd483f1d/branding.py -O -L
-          pip install pyliblzma
           pip install -e .
           command -v xz
 
       - name: Test
         run: |
           pytest --cov -rP
           coverage xml
-          coverage html
-          coverage html -d htmlcov-tests --include="tests/*"
-          diff-cover --html-report coverage-diff.html coverage.xml
+          coverage html -d htmlcov-${{ matrix.pyversion }}
+          coverage html -d htmlcov-tests-${{ matrix.pyversion }} --include="tests/*"
+          diff-cover --compare-branch=origin/master --html-report coverage-diff-${{ matrix.pyversion }}.html coverage.xml
 
       - name: Pylint
         run: |
           pylint --version
           pylint --exit-zero xcp/ tests/ setup.py
           pylint --exit-zero --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" xcp/ tests/ setup.py > pylint.txt
-          diff-quality --violations=pylint --html-report pylint-diff.html pylint.txt
+          diff-quality --compare-branch=origin/master --violations=pylint --html-report pylint-diff-${{ matrix.pyversion }}.html pylint.txt
 
       - uses: actions/upload-artifact@v3
         with:
           name: Coverage and pylint reports
           path: |
-            coverage-diff.html
-            pylint-diff.html
-            htmlcov
-            htmlcov-tests
+            coverage-diff-${{ matrix.pyversion }}.html
+            pylint-diff-${{ matrix.pyversion }}.html
+            htmlcov-${{ matrix.pyversion }}
+            htmlcov-tests-${{ matrix.pyversion }}

requirements-dev.txt

@@ -5,3 +5,11 @@ diff_cover
 mock
 pytest
 pytest-cov
+parameterized
+# dependencies also in setup.py until they can be used
+six
+future
+
+# python-2.7 only
+configparser ; python_version < "3.0"
+pyliblzma ; python_version < "3.0"

setup.py

@@ -35,5 +35,7 @@
                 ],
       requires=[
           'branding',
+          'six',
+          'future',
       ],
      )

tests/data/all_ethN.biosdevname

@@ -0,0 +1,68 @@
+BIOS device: eth0
+Kernel name: eth0
+Permanent MAC: EC:F4:BB:C3:AF:A8
+Assigned MAC : EC:F4:BB:C3:AF:A8
+Driver: ixgbe
+Driver version: 5.9.4
+Firmware version: 0x8000095c, 19.5.12
+Bus Info: 0000:01:00.0
+PCI name      : 0000:01:00.0
+PCI Slot      : embedded
+SMBIOS Device Type: Ethernet
+SMBIOS Instance: 1
+SMBIOS Label: Integrated NIC 1
+sysfs Label: NIC1
+Embedded Index: 1
+
+BIOS device: eth1
+Kernel name: eth1
+Permanent MAC: EC:F4:BB:C3:AF:AA
+Assigned MAC : EC:F4:BB:C3:AF:AA
+Driver: ixgbe
+Driver version: 5.9.4
+Firmware version: 0x8000095c, 19.5.12
+Bus Info: 0000:01:00.1
+PCI name      : 0000:01:00.1
+PCI Slot      : embedded
+SMBIOS Device Type: Ethernet
+SMBIOS Instance: 2
+SMBIOS Label: Integrated NIC 2
+sysfs Label: NIC2
+Embedded Index: 2
+
+BIOS device: eth2
+Kernel name: eth2
+Permanent MAC: EC:F4:BB:C3:AF:AC
+Assigned MAC : EC:F4:BB:C3:AF:AC
+Driver: igb
+Driver version: 5.3.5.20
+Firmware version: 1.67, 0x80000fab, 19.5.12
+Bus Info: 0000:07:00.0
+PCI name      : 0000:07:00.0
+PCI Slot      : embedded
+SMBIOS Device Type: Ethernet
+SMBIOS Instance: 3
+SMBIOS Label: Integrated NIC 3
+sysfs Label: NIC3
+VPD Port: 3
+VPD Index: 1
+VPD PCI master: 0000:07:00.0
+
+BIOS device: eth3
+Kernel name: eth3
+Permanent MAC: EC:F4:BB:C3:AF:AD
+Assigned MAC : EC:F4:BB:C3:AF:AD
+Driver: igb
+Driver version: 5.3.5.20
+Firmware version: 1.67, 0x80000fab, 19.5.12
+Bus Info: 0000:07:00.1
+PCI name      : 0000:07:00.1
+PCI Slot      : embedded
+SMBIOS Device Type: Ethernet
+SMBIOS Instance: 4
+SMBIOS Label: Integrated NIC 4
+sysfs Label: NIC4
+VPD Port: 4
+VPD Index: 1
+VPD PCI master: 0000:07:00.1
+

tests/data/grub-linux.cfg

@@ -0,0 +1,5 @@
+set default=0
+menuentry 'linux' {
+	linux /boot/vmlinuz-1 ro
+	initrd /boot/initrd.img-1
+}

tests/data/grub.cfg

@@ -0,0 +1,35 @@
+serial --unit=0 --speed=115200
+terminal_input serial console
+terminal_output serial console
+set default=0
+set timeout=5
+menuentry 'XCP-ng' {
+	search --label --set root root-vgdorj
+	multiboot2 /boot/xen.gz dom0_mem=7584M,max:7584M watchdog ucode=scan dom0_max_vcpus=1-16 crashkernel=256M,below=4G console=vga vga=mode-0x0311
+	module2 /boot/vmlinuz-4.19-xen root=LABEL=root-vgdorj ro nolvm hpet=disable console=hvc0 console=tty0 quiet vga=785 splash plymouth.ignore-serial-consoles
+	module2 /boot/initrd-4.19-xen.img
+}
+menuentry 'XCP-ng (Serial)' {
+	search --label --set root root-vgdorj
+	multiboot2 /boot/xen.gz com1=115200,8n1 console=com1,vga dom0_mem=7584M,max:7584M watchdog ucode=scan dom0_max_vcpus=1-16 crashkernel=256M,below=4G
+	module2 /boot/vmlinuz-4.19-xen root=LABEL=root-vgdorj ro nolvm hpet=disable console=tty0 console=hvc0
+	module2 /boot/initrd-4.19-xen.img
+}
+menuentry 'XCP-ng in Safe Mode' {
+	search --label --set root root-vgdorj
+	multiboot2 /boot/xen.gz nosmp noreboot noirqbalance no-mce no-bootscrub no-numa no-hap no-mmcfg max_cstate=0 nmi=ignore allow_unsafe dom0_mem=7584M,max:7584M com1=115200,8n1 console=com1,vga
+	module2 /boot/vmlinuz-4.19-xen earlyprintk=xen root=LABEL=root-vgdorj ro nolvm hpet=disable console=tty0 console=hvc0
+	module2 /boot/initrd-4.19-xen.img
+}
+menuentry 'XCP-ng (Xen 4.13.1 / Linux 4.19.0+1)' {
+	search --label --set root root-vgdorj
+	multiboot2 /boot/xen-fallback.gz dom0_mem=7584M,max:7584M watchdog ucode=scan dom0_max_vcpus=1-16 crashkernel=256M,below=4G
+	module2 /boot/vmlinuz-fallback root=LABEL=root-vgdorj ro nolvm hpet=disable console=hvc0 console=tty0
+	module2 /boot/initrd-fallback.img
+}
+menuentry 'XCP-ng (Serial, Xen 4.13.1 / Linux 4.19.0+1)' {
+	search --label --set root root-vgdorj
+	multiboot2 /boot/xen-fallback.gz com1=115200,8n1 console=com1,vga dom0_mem=7584M,max:7584M watchdog ucode=scan dom0_max_vcpus=1-16 crashkernel=256M,below=4G
+	module2 /boot/vmlinuz-fallback root=LABEL=root-vgdorj ro nolvm hpet=disable console=tty0 console=hvc0
+	module2 /boot/initrd-fallback.img
+}

tests/data/inventory/etc/xensource-inventory

@@ -0,0 +1,23 @@
+PRIMARY_DISK='/dev/disk/by-id/scsi-123456789012345678901234567899012'
+PRODUCT_VERSION='8.2.1'
+DOM0_VCPUS='16'
+CONTROL_DOMAIN_UUID='3b1dccee-9da4-49c6-8250-e3725e0e4b2d'
+DOM0_MEM='7584'
+COMPANY_NAME_SHORT='Open Source'
+MANAGEMENT_ADDRESS_TYPE='IPv4'
+PARTITION_LAYOUT='ROOT,BACKUP,LOG,BOOT,SWAP,SR'
+PRODUCT_VERSION_TEXT='8.2'
+PRODUCT_BRAND='XCP-ng'
+INSTALLATION_UUID='b8b63475-d28c-44d4-9d1e-c38298ad3a0d'
+PRODUCT_VERSION_TEXT_SHORT='8.2'
+BRAND_CONSOLE='XCP-ng Center'
+PRODUCT_NAME='xenenterprise'
+MANAGEMENT_INTERFACE='xapi1'
+COMPANY_PRODUCT_BRAND='XCP-ng'
+PLATFORM_VERSION='3.2.1'
+BUILD_NUMBER='release/yangtze/master/58'
+PLATFORM_NAME='XCP'
+BRAND_CONSOLE_URL='https://xcp-ng.org'
+BACKUP_PARTITION='/dev/disk/by-id/scsi-123456789012345678901234567899012-part2'
+INSTALLATION_DATE='2021-08-03 16:39:24.077945'
+COMPANY_NAME='Open Source'

tests/data/lspci-mn

@@ -0,0 +1,36 @@
+00:00.0 "0600" "1022" "1630" "1022" "1630"
+00:00.2 "0806" "1022" "1631" "1022" "1631"
+00:01.0 "0600" "1022" "1632" "" ""
+00:01.1 "0604" "1022" "1633" "" ""
+00:02.0 "0600" "1022" "1632" "" ""
+00:02.1 "0604" "1022" "1634" "" ""
+00:02.2 "0604" "1022" "1634" "" ""
+00:02.3 "0604" "1022" "1634" "" ""
+00:08.0 "0600" "1022" "1632" "" ""
+00:08.1 "0604" "1022" "1635" "" ""
+00:08.2 "0604" "1022" "1635" "" ""
+00:14.0 "0c05" "1022" "790b" -r51 "1462" "12ac"
+00:14.3 "0601" "1022" "790e" -r51 "1462" "12ac"
+00:18.0 "0600" "1022" "1448" "" ""
+00:18.1 "0600" "1022" "1449" "" ""
+00:18.2 "0600" "1022" "144a" "" ""
+00:18.3 "0600" "1022" "144b" "" ""
+00:18.4 "0600" "1022" "144c" "" ""
+00:18.5 "0600" "1022" "144d" "" ""
+00:18.6 "0600" "1022" "144e" "" ""
+00:18.7 "0600" "1022" "144f" "" ""
+01:00.0 "0604" "1002" "1478" -rc1 "" ""
+02:00.0 "0604" "1002" "1479" "" ""
+03:00.0 "0380" "1002" "7340" -rc1 "1462" "12ac"
+03:00.1 "0403" "1002" "ab38" "1462" "12ac"
+04:00.0 "0280" "8086" "2723" -r1a "8086" "0084"
+05:00.0 "0200" "10ec" "8168" -r15 "1462" "12ac"
+06:00.0 "0108" "144d" "a808" -p02 "144d" "a801"
+07:00.0 "0300" "1002" "1636" -rc6 "1462" "12ac"
+07:00.2 "1080" "1022" "15df" "1022" "15df"
+07:00.3 "0c03" "1022" "1639" -p30 "1462" "12ac"
+07:00.4 "0c03" "1022" "1639" -p30 "1462" "12ac"
+07:00.5 "0480" "1022" "15e2" -r01 "1462" "12ac"
+07:00.6 "0403" "1022" "15e3" "1462" "12ac"
+08:00.0 "0106" "1022" "7901" -r81 -p01 "1462" "12ac"
+08:00.1 "0106" "1022" "7901" -r81 -p01 "1462" "12ac"

tests/data/pci.ids

@@ -0,0 +1,29 @@
+## Excerpt from /usr/share/hwdata/pci.ids
+
+# Vendors, devices and subsystems. Please keep sorted.
+
+# Syntax:
+# vendor  vendor_name
+#	device  device_name				<-- single tab
+#		subvendor subdevice  subsystem_name	<-- two tabs
+
+1002  Advanced Micro Devices, Inc. [AMD/ATI]
+	1314  Wrestler HDMI Audio
+		174b 1001  PURE Fusion Mini
+	1636  Renoir
+	7340  Navi 14 [Radeon RX 5500/5500M / Pro 5500M]
+
+# List of known device classes, subclasses and programming interfaces
+
+# Syntax:
+# C class       class_name
+#       subclass        subclass_name           <-- single tab
+#               prog-if  prog-if_name   <-- two tabs
+
+C 03  Display controller
+	00  VGA compatible controller
+		00  VGA controller
+		01  8514 controller
+	01  XGA compatible controller
+	02  3D controller
+	80  Display controller

tests/data/physical.biosdevname

@@ -0,0 +1,68 @@
+BIOS device: em1
+Kernel name: eth0
+Permanent MAC: EC:F4:BB:C3:AF:A8
+Assigned MAC : EC:F4:BB:C3:AF:A8
+Driver: ixgbe
+Driver version: 5.9.4
+Firmware version: 0x8000095c, 19.5.12
+Bus Info: 0000:01:00.0
+PCI name      : 0000:01:00.0
+PCI Slot      : embedded
+SMBIOS Device Type: Ethernet
+SMBIOS Instance: 1
+SMBIOS Label: Integrated NIC 1
+sysfs Label: NIC1
+Embedded Index: 1
+
+BIOS device: em2
+Kernel name: eth1
+Permanent MAC: EC:F4:BB:C3:AF:AA
+Assigned MAC : EC:F4:BB:C3:AF:AA
+Driver: ixgbe
+Driver version: 5.9.4
+Firmware version: 0x8000095c, 19.5.12
+Bus Info: 0000:01:00.1
+PCI name      : 0000:01:00.1
+PCI Slot      : embedded
+SMBIOS Device Type: Ethernet
+SMBIOS Instance: 2
+SMBIOS Label: Integrated NIC 2
+sysfs Label: NIC2
+Embedded Index: 2
+
+BIOS device: em3_1
+Kernel name: eth2
+Permanent MAC: EC:F4:BB:C3:AF:AC
+Assigned MAC : EC:F4:BB:C3:AF:AC
+Driver: igb
+Driver version: 5.3.5.20
+Firmware version: 1.67, 0x80000fab, 19.5.12
+Bus Info: 0000:07:00.0
+PCI name      : 0000:07:00.0
+PCI Slot      : embedded
+SMBIOS Device Type: Ethernet
+SMBIOS Instance: 3
+SMBIOS Label: Integrated NIC 3
+sysfs Label: NIC3
+VPD Port: 3
+VPD Index: 1
+VPD PCI master: 0000:07:00.0
+
+BIOS device: em4_1
+Kernel name: eth3
+Permanent MAC: EC:F4:BB:C3:AF:AD
+Assigned MAC : EC:F4:BB:C3:AF:AD
+Driver: igb
+Driver version: 5.3.5.20
+Firmware version: 1.67, 0x80000fab, 19.5.12
+Bus Info: 0000:07:00.1
+PCI name      : 0000:07:00.1
+PCI Slot      : embedded
+SMBIOS Device Type: Ethernet
+SMBIOS Instance: 4
+SMBIOS Label: Integrated NIC 4
+sysfs Label: NIC4
+VPD Port: 4
+VPD Index: 1
+VPD PCI master: 0000:07:00.1
+

tests/data/repo/.treeinfo

@@ -0,0 +1,34 @@
+[platform]
+name = XCP
+version = 3.2.1
+
+[branding]
+name = XCP-ng
+version = 8.2.1
+
+[build]
+number = release/yangtze/master/58
+
+[keys]
+key1 = RPM-GPG-KEY-CH-8
+key2 = RPM-GPG-KEY-CH-8-LCM
+key3 = RPM-GPG-KEY-Platform-V1
+
+[general]
+name = XCP-ng-8.2.1
+family = XCP-ng
+timestamp = 1645700813.00
+variant =
+version = 8.2.1
+packagedir =
+arch = x86_64
+
+[images-x86_64]
+kernel = boot/pxelinux/mboot.c32
+initrd = boot/vmlinuz
+boot.iso = boot/xen.gz
+
+[images-xen]
+kernel = boot/pxelinux/mboot.c32
+initrd = boot/vmlinuz
+