diff options
5 files changed, 65 insertions, 1 deletions
diff --git a/.ci/templates/job-uhd-devtest-rhombus.yml b/.ci/templates/job-uhd-devtest-rhombus.yml index 6fc1baa5c..c7db12f9c 100644 --- a/.ci/templates/job-uhd-devtest-rhombus.yml +++ b/.ci/templates/job-uhd-devtest-rhombus.yml @@ -114,3 +114,16 @@ jobs: devtestPattern: 'n3x0' devSDImage: gnuradio-image-ni-sulfur-rev11-mender.sdimg.bz2 devLabgridConfig: .ci/templates/tests/rhombus-labgrid/device-configs/rhombus-n310-0.yml + rhombus-n321-0: + devType: 'n3xx' + devModel: 'n320' + devName: rhombus-n321-0 + devSerial: '3166646' + devHostname: 'ni-n3xx-3166646' + devBus: 'ip' + devAddr: '192.168.20.8' + sfpAddrs: '192.168.10.8,192.168.20.8' + devFpga: 'HG,XG' + devtestPattern: 'n3x0' + devSDImage: gnuradio-image-ni-sulfur-rev11-mender.sdimg.bz2 + devLabgridConfig: .ci/templates/tests/rhombus-labgrid/device-configs/rhombus-n321-0.yml diff --git a/.ci/templates/tests/rhombus-labgrid/crossbar/places.yaml b/.ci/templates/tests/rhombus-labgrid/crossbar/places.yaml index 43284c5ef..baf68bbd1 100755 --- a/.ci/templates/tests/rhombus-labgrid/crossbar/places.yaml +++ b/.ci/templates/tests/rhombus-labgrid/crossbar/places.yaml @@ -14,4 +14,21 @@ rhombus-n310-0: rename: null reservation: null tags: {} - + +rhombus-n321-0: + acquired: null + acquired_resources: [] + aliases: [] + allowed: [] + changed: 1654034475.1935894 + comment: '' + created: 1654034136.0077882 + matches: + - cls: '*' + exporter: '*' + group: rhombus-n321-0-group + name: null + rename: null + reservation: null + tags: {} + diff --git a/.ci/templates/tests/rhombus-labgrid/device-configs/rhombus-n321-0.yml b/.ci/templates/tests/rhombus-labgrid/device-configs/rhombus-n321-0.yml new file mode 100644 index 000000000..f4d53d68a --- /dev/null +++ b/.ci/templates/tests/rhombus-labgrid/device-configs/rhombus-n321-0.yml @@ -0,0 +1,16 @@ +targets: + main: + resources: + RemotePlace: + name: 'rhombus-n321-0' + drivers: + - SerialDriver: + name: 'linux_serial_driver' + bindings: + port: 'console-linux' + - SerialDriver: + name: 'scu_serial_driver' + bindings: + port: 'console-scu' + - USBSDMuxDriver: {} + - USBStorageDriver: {} diff --git a/.ci/templates/tests/rhombus-labgrid/exporter-conf/exporter.yaml b/.ci/templates/tests/rhombus-labgrid/exporter-conf/exporter.yaml index c898b8dda..f13ebbe07 100755 --- a/.ci/templates/tests/rhombus-labgrid/exporter-conf/exporter.yaml +++ b/.ci/templates/tests/rhombus-labgrid/exporter-conf/exporter.yaml @@ -15,3 +15,20 @@ rhombus-n310-0-group: match: ID_SERIAL_SHORT: '000000001506' +rhombus-n321-0-group: + console-scu: + cls: USBSerialPort + match: + ID_SERIAL: 'Silicon_Labs_CP2105_Dual_USB_to_UART_Bridge_Controller_0097D610' + ID_USB_INTERFACE_NUM: '01' + speed: 115200 + console-linux: + cls: USBSerialPort + match: + ID_SERIAL: 'Silicon_Labs_CP2105_Dual_USB_to_UART_Bridge_Controller_0097D610' + ID_USB_INTERFACE_NUM: '00' + speed: 115200 + USBSDMuxDevice: + match: + ID_SERIAL_SHORT: '000000001140' + diff --git a/.ci/utils/mutex_hardware.py b/.ci/utils/mutex_hardware.py index e6fece61f..e9c102469 100644 --- a/.ci/utils/mutex_hardware.py +++ b/.ci/utils/mutex_hardware.py @@ -45,6 +45,7 @@ def set_sfp_addrs(mgmt_addr, sfp_addrs): with Connection(host=mgmt_addr,user='root',connect_kwargs={"password":"", "timeout":120, "banner_timeout":120, "auth_timeout":120}) as dut: for idx, sfp_addr in enumerate(sfp_addrs): dut.run(f"ip link set sfp{idx} down") + dut.run(f"ip addr flush dev sfp{idx}") dut.run(f"ip addr add {sfp_addr}/24 dev sfp{idx}") dut.run(f"ip link set sfp{idx} up") time.sleep(30) |