aparcar · aparcar · Sep 29, 2025 · Sep 5, 2025 · Sep 10, 2025 · Sep 11, 2025
diff --git a/ansible/files/exporter/labgrid-hsn.yaml b/ansible/files/exporter/labgrid-hsn.yaml
@@ -5,8 +5,8 @@ labgrid-hsn-genexis_pulse-ex400:
       ID_PATH: pci-0000:00:14.0-usb-0:1.1.1:1.0
   PDUDaemonPort:
     host: localhost:16421
-    pdu: 192.168.128.3
-    index: 1
+    pdu: 192.168.128.2
+    index: 3
   TFTPProvider:
     internal: "/srv/tftp/genexis_pulse-ex400/"
     external: "genexis_pulse-ex400/"
@@ -18,7 +18,7 @@ labgrid-hsn-bananapi_bpi-r64:
   location: hsn-desk
   USBSerialPort:
     match:
-      ID_PATH: pci-0000:00:14.0-usb-0:1.4:1.0
+      ID_PATH: pci-0000:00:14.0-usb-0:1.1.4:1.0
   PDUDaemonPort:
     host: localhost:16421
     pdu: 192.168.128.2
@@ -46,18 +46,51 @@ labgrid-hsn-bananapi_bpi-r4:
     address: "192.168.1.1%vlan106"
     username: "root"
 
-labgrid-hsn-iei_puzzle-m902:
+labgrid-hsn-glinet_gl-mt1300:
   location: hsn-desk
   USBSerialPort:
     match:
       ID_PATH: pci-0000:00:14.0-usb-0:1.1.3:1.0
   PDUDaemonPort:
     host: localhost:16421
-    pdu: 192.168.128.3
-    index: 2
+    pdu: 192.168.128.4
+    index: 1
   TFTPProvider:
-    internal: "/srv/tftp/iei_puzzle-m902"
-    external: "iei_puzzle-m902/"
+    internal: "/srv/tftp/glinet_gl-mt1300"
+    external: "glinet_gl-mt1300/"
   NetworkService:
     address: "192.168.1.1%vlan108"
     username: "root"
+
+labgrid-hsn-linksys_e8450:
+  location: hsn-desk
+  USBSerialPort:
+    match:
+      ID_PATH: pci-0000:00:14.0-usb-0:1.2:1.0
+  PDUDaemonPort:
+    host: localhost:16421
+    pdu: 192.168.128.2
+    index: 9
+  TFTPProvider:
+    internal: "/srv/tftp/linksys_e8450"
+    external: "linksys_e8450/"
+  NetworkService:
+    address: "192.168.1.1%vlan110"
+    username: "root"
+
+labgrid-hsn-tplink_tl-wr1043nd-v4:
+  location: hsn-desk
+  USBSerialPort:
+    match:
+      ID_PATH: pci-0000:00:14.0-usb-0:1.3:1.0
+  PDUDaemonPort:
+    host: localhost:16421
+    pdu: 192.168.128.2
+    index: 11
+  TFTPProvider:
+    internal: "/srv/tftp/tplink_tl-wr1043nd-v4"
+    external: "tplink_tl-wr1043nd-v4/"
+  NetworkService:
+    address: "192.168.1.1%vlan112"
+    username: "root"
+
diff --git a/ansible/files/exporter/pdudaemon-labgrid-hsn.conf b/ansible/files/exporter/pdudaemon-labgrid-hsn.conf
@@ -12,8 +12,15 @@
             "password": "netio",
             "telnetport": 23
         },
+        "192.168.128.4": {
+            "driver": "netio4",
+            "username": "netio",
+            "password": "netio",
+            "telnetport": 23
+        },
         "192.168.128.2": {
             "driver": "ubus"
         }
     }
+
 }
diff --git a/ansible/host_vars/labgrid-hsn/main.yaml b/ansible/host_vars/labgrid-hsn/main.yaml
@@ -4,3 +4,4 @@ vlans: 8
 labnet_interfaces:
   - eno2
   - eno3
+  - eno4
diff --git a/labnet.yaml b/labnet.yaml
@@ -33,6 +33,11 @@ devices:
     name: TP-Link TL-WR1043N/ND v3
     target: ath79-generic
     firmware: initramfs-kernel.bin
+
+  tplink_tl-wr1043nd-v4:
+    name: TP-Link TL-WR1043N/ND v4
+    target: ath79-generic
+    firmware: initramfs-kernel.bin
 
   cznic_turris-omnia:
     name: CZ.NIC Turris Omnia
@@ -135,7 +140,9 @@ labs:
       - genexis_pulse-ex400
       - bananapi_bpi-r64
       - bananapi_bpi-r4
-      - iei_puzzle-m902
+      - glinet_gl-mt1300
+      - linksys_e8450
+      - tplink_tl-wr1043nd-v4
     developers:
       - aparcar
       - jonasjelonek

diff --git a/switch/etc/config/network b/switch/etc/config/network
@@ -85,3 +85,4 @@ config bridge-vlan
         option vlan '108'
         list ports 'lan8'
         list ports 'lan10:t'
+
diff --git a/switch/etc/config/poe b/switch/etc/config/poe
@@ -1,5 +1,8 @@
 config global
 	option budget	'77'
+#Required on zyxel gs1900-24hp V2
+#	option force-baudrate '115200'
+#	option force_dialect 'realtek'
 
 config port
 	option enable 	'1'
@@ -55,4 +58,4 @@ config port
 	option id	'8'
 	option name	'lan8'
 	option poe_plus	'1'
-	option priority	'2'
+	option priority	'2'
diff --git a/targets/glinet_gl-mt1300.yaml b/targets/glinet_gl-mt1300.yaml
@@ -23,6 +23,8 @@ targets:
         prompt: "MT7621 #"
         boot_secret: "gl"
         init_commands:
+#         - setenv ipaddr "192.168.$vlan108.2"
+#         - setenv serverip "$address"
           - tftp 0x81000000
       UBootTFTPStrategy: {}
       SSHDriver:

diff --git a/targets/tplink_tl-wr1043nd-v4.yaml b/targets/tplink_tl-wr1043nd-v4.yaml
@@ -0,0 +1,48 @@
+targets:
+  main:
+    features:
+      - wan_port
+      - wifi
+    resources:
+      RemotePlace:
+        name: !template "$LG_PLACE"
+    drivers:
+      TFTPProviderDriver: {}
+      SerialDriver:
+        txdelay: 0.05
+      power_driver:
+        cls: GpioDigitalOutputDriver
+        name: power_driver
+        bindings:
+          gpio: power
+      reset_driver:
+        cls: GpioDigitalOutputDriver
+        name: reset_driver
+        bindings:
+          gpio: reset
+      DigitalOutputPowerDriver:
+        bindings:
+          output: power_driver
+      ShellDriver:
+        prompt: 'root@[\w()]+:[^ ]+ '
+        login_prompt: Please press Enter to activate this console.
+        await_login_timeout: 15
+        login_timeout: 120
+        post_login_settle_time: 5
+        username: root
+      SmallUBootDriver:
+        boot_expression: "Autobooting in 1 seconds"
+        boot_secret: "tpl"
+        prompt: "ap151>"
+        init_commands:
+          - tftp 0x82000000
+      UBootTFTPStrategy: {}
+      SSHDriver:
+        connection_timeout: 120.0
+        explicit_scp_mode: True
+
+images:
+  root: !template $LG_IMAGE
+
+imports:
+  - ../strategies/tftpstrategy.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ vlans: 8 @@
     labnet_interfaces:
       - eno2
       - eno3
+      - eno4
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,3 +85,4 @@ config bridge-vlan
		option vlan '108'
		list ports 'lan8'
		list ports 'lan10:t'