From 2880be7282fa792cbefb00e54eef4ecad2774a7c Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas Date: Tue, 13 Jun 2023 11:52:36 +0200 Subject: [PATCH] Rename UENetworkScript to NetworkScript in ci_ueinfra --- ci-scripts/ci_ueinfra.yaml | 30 +++++++++++++++--------------- ci-scripts/cls_module_ue.py | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ci-scripts/ci_ueinfra.yaml b/ci-scripts/ci_ueinfra.yaml index 8a6c76645a..bd2442cf16 100644 --- a/ci-scripts/ci_ueinfra.yaml +++ b/ci-scripts/ci_ueinfra.yaml @@ -4,7 +4,7 @@ idefix: TermScript: sudo -S killall --signal SIGKILL quectel-CM AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach - UENetworkScript: ip a show dev wwan0 + NetworkScript: ip a show dev wwan0 IF: wwan0 MTU: 1500 Trace: True @@ -15,7 +15,7 @@ nrmodule2_quectel: TermScript: sudo -S killall --signal SIGKILL quectel-CM AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach - UENetworkScript: ip a show dev wwan0 + NetworkScript: ip a show dev wwan0 IF: wwan0 MTU: 1500 LogStore: /media/ci_qlogs @@ -29,7 +29,7 @@ adb_ue_1: CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check R3CM40LZPHT DataEnableScript: adb -s R3CM40LZPHT shell "svc data enable" DataDisableScript: adb -s R3CM40LZPHT shell "svc data disable" - UENetworkScript: adb -s R3CM40LZPHT shell "ip address show | grep rmnet_data0" + NetworkScript: adb -s R3CM40LZPHT shell "ip address show | grep rmnet_data0" CmdPrefix: adb -s R3CM40LZPHT shell MTU: 1500 LogStore: /media/usb-drive/ci_adb_1-logs @@ -42,7 +42,7 @@ adb_ue_2: CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check 5200c00db4413517 DataEnableScript: adb -s 5200c00db4413517 shell "svc data enable" DataDisableScript: adb -s 5200c00db4413517 shell "svc data disable" - UENetworkScript: adb -s 5200c00db4413517 shell "ip address show | grep rmnet" + NetworkScript: adb -s 5200c00db4413517 shell "ip address show | grep rmnet" CmdPrefix: adb -s 5200c00db4413517 shell MTU: 1500 LogStore: /media/usb-drive/ci_adb_2-logs @@ -55,74 +55,74 @@ amarisoft_ue_1: Host: amariue AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}' DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}' - UENetworkScript: ip netns exec ue1 ip a show dev pdn0 + NetworkScript: ip netns exec ue1 ip a show dev pdn0 CmdPrefix: ip netns exec ue1 MTU: 1500 amarisoft_ue_2: Host: amariue AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}' DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}' - UENetworkScript: ip netns exec ue2 ip a show dev pdn0 + NetworkScript: ip netns exec ue2 ip a show dev pdn0 CmdPrefix: ip netns exec ue2 MTU: 1500 amarisoft_ue_3: Host: amariue AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}' DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}' - UENetworkScript: ip netns exec ue3 ip a show dev pdn0 + NetworkScript: ip netns exec ue3 ip a show dev pdn0 CmdPrefix: ip netns exec ue3 MTU: 1500 amarisoft_ue_4: Host: amariue AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}' DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}' - UENetworkScript: ip netns exec ue4 ip a show dev pdn0 + NetworkScript: ip netns exec ue4 ip a show dev pdn0 CmdPrefix: ip netns exec ue4 MTU: 1500 amarisoft_ue_5: Host: amariue AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}' DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}' - UENetworkScript: ip netns exec ue5 ip a show dev pdn0 + NetworkScript: ip netns exec ue5 ip a show dev pdn0 CmdPrefix: ip netns exec ue5 MTU: 1500 amarisoft_ue_6: Host: amariue AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}' DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}' - UENetworkScript: ip netns exec ue6 ip a show dev pdn0 + NetworkScript: ip netns exec ue6 ip a show dev pdn0 CmdPrefix: ip netns exec ue6 MTU: 1500 amarisoft_ue_7: Host: amariue AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}' DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}' - UENetworkScript: ip netns exec ue7 ip a show dev pdn0 + NetworkScript: ip netns exec ue7 ip a show dev pdn0 CmdPrefix: ip netns exec ue7 MTU: 1500 amarisoft_ue_8: Host: amariue AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}' DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}' - UENetworkScript: ip netns exec ue8 ip a show dev pdn0 + NetworkScript: ip netns exec ue8 ip a show dev pdn0 CmdPrefix: ip netns exec ue8 MTU: 1500 amarisoft_ue_9: Host: amariue AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}' DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}' - UENetworkScript: ip netns exec ue9 ip a show dev pdn0 + NetworkScript: ip netns exec ue9 ip a show dev pdn0 CmdPrefix: ip netns exec ue9 MTU: 1500 amarisoft_ue_10: Host: amariue AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}' DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}' - UENetworkScript: ip netns exec ue10 ip a show dev pdn0 + NetworkScript: ip netns exec ue10 ip a show dev pdn0 CmdPrefix: ip netns exec ue10 MTU: 1500 oai_ue_obelix: Host: obelix - UENetworkScript: ip a show dev oaitun_ue1 + NetworkScript: ip a show dev oaitun_ue1 IF: oaitun_ue1 diff --git a/ci-scripts/cls_module_ue.py b/ci-scripts/cls_module_ue.py index 26a2d1c242..19dac1044d 100644 --- a/ci-scripts/cls_module_ue.py +++ b/ci-scripts/cls_module_ue.py @@ -54,7 +54,7 @@ class Module_UE: "detach": m.get('DetachScript'), "initialize": m.get('InitScript'), "terminate": m.get('TermScript'), - "getNetwork": m.get('UENetworkScript'), + "getNetwork": m.get('NetworkScript'), "check": m.get('CheckStatusScript'), "dataEnable": m.get('DataEnableScript'), "dataDisable": m.get('DataDisableScript'),