diff options
| author | Jonathan Cave <jonathan.cave@canonical.com> | 2019-05-28 13:54:58 +0100 |
|---|---|---|
| committer | Jonathan Cave <jonathan.cave@canonical.com> | 2019-05-29 14:51:04 +0100 |
| commit | 5d905d4a9bee69919589e85dca7ab9980f213081 (patch) | |
| tree | 973321215c6b94e0a4be158a248f89121419c27c /units | |
| parent | 1d9b57f0fa573bf0c85a53f0dd21190575af1ba6 (diff) | |
network_info: consolidate jobs on newer info script
Diffstat (limited to 'units')
| -rw-r--r-- | units/ethernet/jobs.pxu | 4 | ||||
| -rw-r--r-- | units/networking/jobs.pxu | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/units/ethernet/jobs.pxu b/units/ethernet/jobs.pxu index 7c8d569..103a7b3 100644 --- a/units/ethernet/jobs.pxu +++ b/units/ethernet/jobs.pxu @@ -18,8 +18,8 @@ id: ethernet/info_automated requires: executable.name == 'ip' device.category == 'NETWORK' -command: udev_resource -f NETWORK | awk "/interface: / { print \$2 }" | xargs -n 1 network_info -estimated_duration: 30.0 +command: network_device_info.py detect NETWORK +estimated_duration: 2.0 _summary: Gather info on current state of network devices _description: diff --git a/units/networking/jobs.pxu b/units/networking/jobs.pxu index 360aaf2..c5f5c9f 100644 --- a/units/networking/jobs.pxu +++ b/units/networking/jobs.pxu @@ -14,7 +14,8 @@ category_id: com.canonical.plainbox::networking id: networking/info_device{__index__}_{interface} _summary: Network Information of device {__index__} ({interface}) estimated_duration: 1.0 -command: network_info {interface} | zenity --text-info --title="{interface}" +command: + network_device_info.py info NETWORK --interface {interface} | zenity --text-info --title="{interface}" _description: PURPOSE: This test will check the network device {__index__} ({interface}) |