From 7daf1effbdfc1be1bd1b7451912b962a909572cd Mon Sep 17 00:00:00 2001
From: Paul Larson <paul.larson@canonical.com>
Date: Thu, 1 Feb 2024 16:40:56 -0600
Subject: [PATCH] device-name in connector modules is no longer needed

---
 .../src/testflinger_device_connectors/devices/cm3/__init__.py   | 2 --
 .../devices/dell_oemscript/__init__.py                          | 2 --
 .../devices/dragonboard/__init__.py                             | 2 --
 .../devices/hp_oemscript/__init__.py                            | 2 --
 .../testflinger_device_connectors/devices/iotscript/__init__.py | 2 --
 .../devices/lenovo_oemscript/__init__.py                        | 2 --
 .../src/testflinger_device_connectors/devices/maas2/__init__.py | 2 --
 .../src/testflinger_device_connectors/devices/multi/__init__.py | 2 --
 .../src/testflinger_device_connectors/devices/muxpi/__init__.py | 2 --
 .../testflinger_device_connectors/devices/netboot/__init__.py   | 2 --
 .../devices/noprovision/__init__.py                             | 2 --
 .../devices/oemrecovery/__init__.py                             | 2 --
 .../testflinger_device_connectors/devices/oemscript/__init__.py | 2 --
 13 files changed, 26 deletions(-)

diff --git a/device-connectors/src/testflinger_device_connectors/devices/cm3/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/cm3/__init__.py
index 92d020b7..edf87489 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/cm3/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/cm3/__init__.py
@@ -28,8 +28,6 @@
 )
 from testflinger_device_connectors.devices.cm3.cm3 import CM3
 
-device_name = "cm3"
-
 
 class DeviceConnector(DefaultDevice):
     """Tool for provisioning baremetal with a given image."""
diff --git a/device-connectors/src/testflinger_device_connectors/devices/dell_oemscript/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/dell_oemscript/__init__.py
index 715f34f6..c4af5d5e 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/dell_oemscript/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/dell_oemscript/__init__.py
@@ -32,8 +32,6 @@
 )
 from .dell_oemscript import DellOemScript
 
-device_name = "dell_oemscript"
-
 
 class DeviceConnector(DefaultDevice):
     """Tool for provisioning Dell OEM devices with an oem image."""
diff --git a/device-connectors/src/testflinger_device_connectors/devices/dragonboard/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/dragonboard/__init__.py
index 206046f3..1246633f 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/dragonboard/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/dragonboard/__init__.py
@@ -30,8 +30,6 @@
     Dragonboard,
 )
 
-device_name = "dragonboard"
-
 
 class DeviceConnector(DefaultDevice):
     """Tool for provisioning baremetal with a given image."""
diff --git a/device-connectors/src/testflinger_device_connectors/devices/hp_oemscript/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/hp_oemscript/__init__.py
index a813ed0e..5fb3cdee 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/hp_oemscript/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/hp_oemscript/__init__.py
@@ -32,8 +32,6 @@
 )
 from .hp_oemscript import HPOemScript
 
-device_name = "hp_oemscript"
-
 
 class DeviceConnector(DefaultDevice):
     """Tool for provisioning HP OEM devices with an oem image."""
diff --git a/device-connectors/src/testflinger_device_connectors/devices/iotscript/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/iotscript/__init__.py
index fbf3491c..e20aa211 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/iotscript/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/iotscript/__init__.py
@@ -2,8 +2,6 @@
 
 from testflinger_device_connectors.devices import DefaultDevice
 
-device_name = "iotscript"
-
 
 class DeviceConnector(DefaultDevice):
     def provision(self, args):
diff --git a/device-connectors/src/testflinger_device_connectors/devices/lenovo_oemscript/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/lenovo_oemscript/__init__.py
index 048f0632..c16f3026 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/lenovo_oemscript/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/lenovo_oemscript/__init__.py
@@ -32,8 +32,6 @@
 )
 from .lenovo_oemscript import LenovoOemScript
 
-device_name = "lenovo_oemscript"
-
 
 class DeviceConnector(DefaultDevice):
     """Tool for provisioning Lenovo OEM devices with an oem image."""
diff --git a/device-connectors/src/testflinger_device_connectors/devices/maas2/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/maas2/__init__.py
index e3150497..81476af7 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/maas2/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/maas2/__init__.py
@@ -29,8 +29,6 @@
 )
 from testflinger_device_connectors.devices.maas2.maas2 import Maas2
 
-device_name = "maas2"
-
 
 class DeviceConnector(DefaultDevice):
     """Tool for provisioning baremetal with a given image."""
diff --git a/device-connectors/src/testflinger_device_connectors/devices/multi/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/multi/__init__.py
index 4f4d8c6b..fab7bcb0 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/multi/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/multi/__init__.py
@@ -28,8 +28,6 @@
 from testflinger_device_connectors.devices.multi.multi import Multi
 from testflinger_device_connectors.devices.multi.tfclient import TFClient
 
-device_name = "multi"
-
 
 class DeviceConnector(DefaultDevice):
     """Device Connector for provisioning multiple devices at the same time"""
diff --git a/device-connectors/src/testflinger_device_connectors/devices/muxpi/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/muxpi/__init__.py
index c0ddddf6..e9079f42 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/muxpi/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/muxpi/__init__.py
@@ -28,8 +28,6 @@
 )
 from testflinger_device_connectors.devices.muxpi.muxpi import MuxPi
 
-device_name = "muxpi"
-
 
 class DeviceConnector(DefaultDevice):
     """Tool for provisioning baremetal with a given image."""
diff --git a/device-connectors/src/testflinger_device_connectors/devices/netboot/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/netboot/__init__.py
index b0ca4b3b..620aad47 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/netboot/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/netboot/__init__.py
@@ -30,8 +30,6 @@
 from testflinger_device_connectors import logmsg
 from testflinger_device_connectors.devices.netboot.netboot import Netboot
 
-device_name = "netboot"
-
 
 class DeviceConnector(DefaultDevice):
     """Tool for provisioning baremetal with a given image."""
diff --git a/device-connectors/src/testflinger_device_connectors/devices/noprovision/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/noprovision/__init__.py
index 465c8d06..be15a5b3 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/noprovision/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/noprovision/__init__.py
@@ -29,8 +29,6 @@
     Noprovision,
 )
 
-device_name = "noprovision"
-
 
 class DeviceConnector(DefaultDevice):
     @catch(RecoveryError, 46)
diff --git a/device-connectors/src/testflinger_device_connectors/devices/oemrecovery/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/oemrecovery/__init__.py
index d2dbee2a..28af84d9 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/oemrecovery/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/oemrecovery/__init__.py
@@ -29,8 +29,6 @@
     OemRecovery,
 )
 
-device_name = "oemrecovery"
-
 
 class DeviceConnector(DefaultDevice):
     """Tool for provisioning baremetal with a given image."""
diff --git a/device-connectors/src/testflinger_device_connectors/devices/oemscript/__init__.py b/device-connectors/src/testflinger_device_connectors/devices/oemscript/__init__.py
index 4cef65f3..b8166355 100644
--- a/device-connectors/src/testflinger_device_connectors/devices/oemscript/__init__.py
+++ b/device-connectors/src/testflinger_device_connectors/devices/oemscript/__init__.py
@@ -27,8 +27,6 @@
 )
 from testflinger_device_connectors.devices.oemscript.oemscript import OemScript
 
-device_name = "oemscript"
-
 
 class DeviceConnector(DefaultDevice):
     """Tool for provisioning baremetal with a given image."""