add template-id fields to template units (infra)

providers/base/units/audio/jobs.pxu

@@ -73,6 +73,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::audio
 id: audio/{index}_playback_hdmi_{product_slug}
+template-id: audio/index_playback_hdmi_product_slug
 estimated_duration: 30.0
 imports: from com.canonical.plainbox import manifest
 requires:
@@ -109,6 +110,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::audio
 id: audio/{index}_playback_displayport_{product_slug}
+template-id: audio/index_playback_displayport_product_slug
 estimated_duration: 30.0
 imports: from com.canonical.plainbox import manifest
 requires:
@@ -145,6 +147,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::audio
 id: audio/{index}_playback_thunderbolt_{product_slug}
+template-id: audio/index_playback_thunderbolt_product_slug
 imports: from com.canonical.plainbox import manifest
 estimated_duration: 30.0
 requires:
@@ -181,6 +184,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::audio
 id: audio/{index}_playback_thunderbolt3_{product_slug}
+template-id: audio/index_playback_thunderbolt3_product_slug
 imports: from com.canonical.plainbox import manifest
 estimated_duration: 30.0
 requires:
@@ -217,6 +221,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::audio
 id: audio/{index}_playback_type-c_displayport_{product_slug}
+template-id: audio/index_playback_type-c_displayport_product_slug
 imports: from com.canonical.plainbox import manifest
 estimated_duration: 30.0
 requires:
@@ -253,6 +258,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::audio
 id: audio/{index}_playback_type-c_hdmi_{product_slug}
+template-id: audio/index_playback_type-c_hdmi_product_slug
 imports: from com.canonical.plainbox import manifest
 estimated_duration: 30.0
 requires:

providers/base/units/benchmarks/jobs.pxu

@@ -4,6 +4,7 @@ template-filter: device.category == 'DISK'
 plugin: shell
 category_id: com.canonical.plainbox::benchmarks
 id: benchmarks/disk/hdparm-read_{name}
+template-id: benchmarks/disk/hdparm-read_name
 flags: also-after-suspend
 estimated_duration: 15.0
 user: root
@@ -17,6 +18,7 @@ template-filter: device.category == 'DISK'
 plugin: shell
 category_id: com.canonical.plainbox::benchmarks
 id: benchmarks/disk/hdparm-cache-read_{name}
+template-id: benchmarks/disk/hdparm-cache-read_name
 flags: also-after-suspend
 estimated_duration: 10.0
 user: root

providers/base/units/bluetooth/jobs.pxu

@@ -248,6 +248,7 @@ template-filter: device.category == 'BLUETOOTH'
 template-engine: jinja2
 template-unit: job
 id: bluetooth4/beacon_notification_{{ path }}
+template-id: bluetooth4/beacon_notification_path
 _summary: Test system can get beacon notifications on the {{ path.split('/')[-1] }} adapter
 environ: ADV_SVC_UUID SVC_UUID MSRMT_UUID
 command:
@@ -267,6 +268,7 @@ template-resource: device
 template-filter: device.category == 'BLUETOOTH'
 template-unit: job
 id: bluetooth4/beacon_eddystone_url_{interface}
+template-id: bluetooth4/beacon_eddystone_url_interface
 _summary: Test system can get beacon EddyStone URL advertisements on the {interface} adapter
 command:
  checkbox-support-eddystone_scanner -D {interface}
@@ -280,6 +282,7 @@ unit: template
 template-resource: bluez-internal-rfcomm-tests
 template-unit: job
 id: bluetooth/bluez-internal-rfcomm-tests_{bluez-internal-rfcomm-test}
+template-id: bluetooth/bluez-internal-rfcomm-tests_bluez-internal-rfcomm-test
 category_id: bluetooth_bluez5_selftests
 _summary: BlueZ-{bluez-internal-rfcomm-test}
 _description:
@@ -296,6 +299,7 @@ unit: template
 template-resource: bluez-internal-hci-tests
 template-unit: job
 id: bluetooth/bluez-internal-hci-tests_{bluez-internal-hci-test}
+template-id: bluetooth/bluez-internal-hci-tests_bluez-internal-hci-test
 category_id: bluetooth_bluez5_selftests
 _summary: BlueZ-{bluez-internal-hci-test}
 _description:
@@ -312,6 +316,7 @@ unit: template
 template-resource: bluez-internal-mgmt-tests
 template-unit: job
 id: bluetooth/bluez-internal-mgmt-tests_{bluez-internal-mgmt-test}
+template-id: bluetooth/bluez-internal-mgmt-tests_bluez-internal-mgmt-test
 category_id: bluetooth_bluez5_selftests
 _summary: BlueZ-{bluez-internal-mgmt-test}
 _description:
@@ -328,6 +333,7 @@ unit: template
 template-resource: bluez-internal-uc-tests
 template-unit: job
 id: bluetooth/bluez-internal-uc-tests_{bluez-internal-uc-test}
+template-id: bluetooth/bluez-internal-uc-tests_bluez-internal-uc-test
 category_id: bluetooth_bluez5_selftests
 _summary: BlueZ-{bluez-internal-uc-test}
 _description:
@@ -344,6 +350,7 @@ unit: template
 template-resource: bluez-internal-bnep-tests
 template-unit: job
 id: bluetooth/bluez-internal-bnep-tests_{bluez-internal-bnep-test}
+template-id: bluetooth/bluez-internal-bnep-tests_bluez-internal-bnep-test
 category_id: bluetooth_bluez5_selftests
 _summary: BlueZ-{bluez-internal-bnep-test}
 _description:

providers/base/units/camera/jobs.pxu

@@ -29,6 +29,7 @@ template-unit: job
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::camera
 id: camera/display_{name}
+template-id: camera/display_name
 flags: also-after-suspend
 _summary: Webcam video display test for {product_slug}
 estimated_duration: 120.0
@@ -50,6 +51,7 @@ template-unit: job
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::camera
 id: camera/led_{name}
+template-id: camera/led_name
 _summary: Webcam LED test for {product_slug}
 estimated_duration: 120.0
 depends: camera/detect
@@ -72,6 +74,7 @@ template-unit: job
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::camera
 id: camera/still_{name}
+template-id: camera/still_name
 flags: also-after-suspend
 _summary: Webcam still image capture test for {product_slug}
 estimated_duration: 120.0
@@ -93,6 +96,7 @@ template-unit: job
 plugin: shell
 category_id: com.canonical.plainbox::camera
 id: camera/multiple-resolution-images_{name}
+template-id: camera/multiple-resolution-images_name
 flags: also-after-suspend
 _summary: Webcam multiple resolution capture test for {product_slug}
 estimated_duration: 1.2
@@ -110,6 +114,7 @@ template-unit: job
 plugin: shell
 category_id: com.canonical.plainbox::camera
 id: camera/camera-quality_{name}
+template-id: camera/camera-quality_name
 flags: also-after-suspend
 _summary: Webcam brisque score for {product_slug}
 estimated_duration: 20s
@@ -145,6 +150,7 @@ template-unit: job
 plugin: shell
 category_id: com.canonical.plainbox::camera
 id: camera/multiple-resolution-images-rpi_{name}
+template-id: camera/multiple-resolution-images-rpi_name
 _summary: Webcam multiple resolution capture test for Pi Camera
 estimated_duration: 16.0
 depends: camera/detect-rpi
@@ -164,6 +170,7 @@ template-unit: job
 plugin: shell
 category_id: com.canonical.plainbox::camera
 id: camera/roundtrip-qrcode_{{ name }}
+template-id: camera/roundtrip-qrcode_name
 _summary: Test video output and camera {{ name }} by displaying and reading a qrcode
 estimated_duration: 5.0
 depends:

providers/base/units/cpu/jobs.pxu

@@ -177,6 +177,7 @@ template-unit: job
 plugin: shell
 category_id: com.canonical.plainbox::cpu
 id: cpu/armhf_vfp_support_{platform}
+template-id: cpu/armhf_vfp_support_platform
 estimated_duration: 1.0
 user: root
 command:
@@ -193,6 +194,7 @@ template-unit: job
 plugin: shell
 category_id: com.canonical.plainbox::cpu
 id: cpu/arm64_vfp_support_{platform}
+template-id: cpu/arm64_vfp_support_platform
 estimated_duration: 1.0
 user: root
 command:

providers/base/units/disk/jobs.pxu

@@ -18,6 +18,7 @@ template-unit: job
 plugin: shell
 category_id: com.canonical.plainbox::disk
 id: disk/stats_{name}
+template-id: disk/stats_name
 flags: deprecated also-after-suspend
 user: root
 estimated_duration: 10.0
@@ -40,6 +41,7 @@ template-filter: device.category == 'DISK'
 plugin: shell
 category_id: com.canonical.plainbox::disk
 id: disk/smart_{name}
+template-id: disk/smart_name
 estimated_duration: 180.0
 requires:
  executable.name == 'smartctl'
@@ -57,6 +59,7 @@ template-filter: device.category == 'DISK'
 plugin: shell
 category_id: com.canonical.plainbox::disk
 id: disk/read_performance_{name}
+template-id: disk/read_performance_name
 flags: also-after-suspend
 estimated_duration: 65.0
 requires:
@@ -72,6 +75,7 @@ template-filter: device.category == 'DISK'
 plugin: shell
 category_id: com.canonical.plainbox::disk
 id: disk/storage_device_{name}
+template-id: disk/storage_device_name
 flags: also-after-suspend
 estimated_duration: 375.0
 user: root
@@ -86,6 +90,7 @@ template-filter: device.category == 'DISK'
 plugin: shell
 category_id: com.canonical.plainbox::disk
 id: disk/fstrim_{name}
+template-id: disk/fstrim_name
 estimated_duration: 1.0
 user: root
 requires:
@@ -100,6 +105,7 @@ template-filter: device.category == 'DISK'
 plugin: shell
 category_id: com.canonical.plainbox::disk
 id: disk/disk_stress_ng_{name}
+template-id: disk/disk_stress_ng_name
 estimated_duration: 4560.0
 user: root
 requires:
@@ -123,6 +129,7 @@ template-filter: device.category == 'DISK'
 plugin: shell
 category_id: com.canonical.plainbox::disk
 id: disk/disk_cpu_load_{name}
+template-id: disk/disk_cpu_load_name
 estimated_duration: 15
 user: root
 requires:
@@ -160,6 +167,7 @@ template-filter: device.driver == 'nvme' and device.category == 'OTHER'
 plugin: shell
 category_id: com.canonical.plainbox::disk
 id: disk/apste_support_on_{name}
+template-id: disk/apste_support_on_name
 flags: also-after-suspend
 estimated_duration: 1.0
 user: root

providers/base/units/ethernet/jobs.pxu

@@ -60,6 +60,7 @@ template-filter: device.category == 'NETWORK'
 plugin: shell
 category_id: com.canonical.plainbox::ethernet
 id: ethernet/multi_nic_device{__index__}_{interface}
+template-id: ethernet/multi_nic_device__index___interface
 _summary: Multi-NIC Iperf stress testing for NIC {interface}
 estimated_duration: 7400.0
 requires:
@@ -79,6 +80,7 @@ template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 plugin: shell
 category_id: com.canonical.plainbox::ethernet
 id: ethernet/multi_iperf3_nic_device{__index__}_{interface}
+template-id: ethernet/multi_iperf3_nic_device__index___interface
 _summary: Multi-NIC Iperf3 stress testing for NIC {interface}
 estimated_duration: 7400.0
 requires:
@@ -98,6 +100,7 @@ template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 plugin: shell
 category_id: com.canonical.plainbox::ethernet
 id: ethernet/sru_iperf3_stress_device-{__index__}_{interface}
+template-id: ethernet/sru_iperf3_stress_device-__index___interface
 _summary: Multi-NIC Iperf3 SRU testing for NIC {interface}
 estimated_duration: 1200.0
 requires:
@@ -118,6 +121,7 @@ template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 plugin: shell
 category_id: com.canonical.plainbox::ethernet
 id: ethernet/multi_iperf3_nic_underspeed_device{__index__}_{interface}
+template-id: ethernet/multi_iperf3_nic_underspeed_device__index___interface
 _summary: Underspeed Enabled Multi-NIC Iperf3 stress testing for NIC {interface}
 estimated_duration: 7400.0
 requires:
@@ -137,6 +141,7 @@ template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 plugin: shell
 category_id: com.canonical.plainbox::ethernet
 id: ethernet/ethertool_check_device{__index__}_{interface}
+template-id: ethernet/ethertool_check_device__index___interface
 _summary: ethtool check for NIC {interface}
 estimated_duration: 330.0
 requires:
@@ -152,6 +157,7 @@ template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 plugin: shell
 category_id: com.canonical.plainbox::ethernet
 id: ethernet/ethertool_eee_check_device_{interface}
+template-id: ethernet/ethertool_eee_check_device_interface
 _summary: Check ethtool EEE status for NIC {interface}
 estimated_duration: 330.0
 requires:
@@ -167,6 +173,7 @@ template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::ethernet
 id: ethernet/maximum_bandwidth_device{__index__}_{interface}
+template-id: ethernet/maximum_bandwidth_device__index___interface
 _summary: Maximum bandwidth test of device {__index__} ({interface})
 estimated_duration: 330.0
 requires:
@@ -190,6 +197,7 @@ template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 plugin: shell
 category_id: com.canonical.plainbox::ethernet
 id: ethernet/stress_performance_device{__index__}_{interface}
+template-id: ethernet/stress_performance_device__index___interface
 _summary: Stress and performance test of ethernet device {__index__} ({interface})
 estimated_duration: 330.0
 requires:
@@ -202,6 +210,7 @@ unit: template
 template-resource: device
 template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 id: ethernet/ping_{interface}
+template-id: ethernet/ping_interface
 _summary: Can ping another machine over Ethernet port {interface}
 _description: Check Ethernet works by pinging another machine
 plugin: shell
@@ -230,6 +239,7 @@ unit: template
 template-resource: device
 template-filter: device.category == 'NETWORK' and device.mac != 'UNKNOWN'
 id: ethernet/wol_S5_{interface}
+template-id: ethernet/wol_S5_interface
 _summary: Wake on LAN (WOL) test from S5 - {interface}
 _purpose:
  Check that another system can wake up from S5 the SUT using ethernet port {interface} WOL function.
@@ -254,6 +264,7 @@ unit: template
 template-resource: device
 template-filter: device.category == 'NETWORK' and device.mac != 'UNKNOWN'
 id: ethernet/wol_S4_{interface}
+template-id: ethernet/wol_S4_interface
 _summary: Wake on LAN (WOL) test from S4 - {interface}
 _purpose:
  Check that another system can wake up from S4 the SUT using ethernet port {interface} WOL function.
@@ -279,6 +290,7 @@ unit: template
 template-resource: device
 template-filter: device.category == 'NETWORK' and device.mac != 'UNKNOWN' and device.interface != 'UNKNOWN'
 id: ethernet/wol_S3_{interface}
+template-id: ethernet/wol_S3_interface
 _summary: Wake on LAN (WOL) test from S3 - {interface}
 _purpose:
  Check that another system can wake up from S3 the SUT using ethernet port {interface} WOL function.
@@ -305,6 +317,7 @@ template-resource: device
 template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 template-engine: jinja2
 id: ethernet/hotplug-{{ interface }}
+template-id: ethernet/hotplug-interface
 _summary: Ensure hotplugging works on port {{ interface }}
 _purpose:
  Check that hotplugging works on port {{ interface }}
@@ -324,6 +337,7 @@ template-resource: device
 template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 template-unit: job
 id: ethernet/iperf3_{interface}
+template-id: ethernet/iperf3_interface
 plugin: shell
 _summary: Iperf3 stress testing for {interface}
 category_id: com.canonical.plainbox::ethernet
@@ -342,6 +356,7 @@ template-resource: device
 template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 template-unit: job
 id: ethernet/iperf3_reverse_{interface}
+template-id: ethernet/iperf3_reverse_interface
 plugin: shell
 _summary: Iperf3 stress testing for {interface} (reverse)
 category_id: com.canonical.plainbox::ethernet
@@ -361,6 +376,7 @@ template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 template-engine: jinja2
 template-unit: job
 id: ethernet/check-{{ interface }}-static-configuration
+template-id: ethernet/check-interface-static-configuration
 _summary: Check that {{ interface }} has a static configuration
 _description:
  This job is intended to be used on particular devices where an interface has
@@ -387,6 +403,7 @@ template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 template-engine: jinja2
 template-unit: job
 id: ethernet/check-{{ interface }}-static-configuration-np
+template-id: ethernet/check-interface-static-configuration-np
 _summary: Check that {{ interface }} has a static configuration
 _description:
  This job is intended to be used on particular devices where an interface has