diff options
| author | Jonathan Cave <jonathan.cave@canonical.com> | 2019-02-20 16:43:56 +0000 |
|---|---|---|
| committer | Jonathan Cave <jonathan.cave@canonical.com> | 2019-02-20 17:33:55 +0000 |
| commit | 8e6c4d9ec57f120df42f634a91d05722914e93da (patch) | |
| tree | 979ab6a24cac169383b3d496347a71b1ccd8cbce /units/ethernet | |
| parent | 36f0620a97cc56a069fb2773bd559f5ce990981c (diff) | |
ethernet: network_device_info detect/info changes
The network_device_info script was being used by the ethernet/detect and info/network_devices jobs. This clarifies the two roles and removes the unrequired udev/NM matching code.
Diffstat (limited to 'units/ethernet')
| -rw-r--r-- | units/ethernet/jobs.pxu | 6 | ||||
| -rw-r--r-- | units/ethernet/manifest.pxu | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/units/ethernet/jobs.pxu b/units/ethernet/jobs.pxu index cf1c02b3..15625a5c 100644 --- a/units/ethernet/jobs.pxu +++ b/units/ethernet/jobs.pxu @@ -2,13 +2,15 @@ plugin: shell category_id: com.canonical.plainbox::ethernet id: ethernet/detect flags: also-after-suspend -command: network_device_info +command: network_device_info.py detect estimated_duration: 2.0 _summary: - Report info about available network devices + Detect if at least one ethernet device is detected _description: Test to detect and return information about available network controllers on the system under test. +imports: from com.canonical.plainbox import manifest +requires: manifest.has_ethernet_adapter == 'True' plugin: shell category_id: com.canonical.plainbox::ethernet diff --git a/units/ethernet/manifest.pxu b/units/ethernet/manifest.pxu new file mode 100644 index 00000000..6936344e --- /dev/null +++ b/units/ethernet/manifest.pxu @@ -0,0 +1,4 @@ +unit: manifest entry +id: has_ethernet_adapter +_name: An Ethernet Adapter +value-type: bool |