diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-03-05 06:41:56 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-03-13 06:29:00 +0100 |
| commit | c9cc03834369abfb91fba76fbb26a2e97d3fa9ad (patch) | |
| tree | 0ff2cc60dfd46c76a8dd486f904d38d9b6ac405c /test | |
| parent | network: move LinkOperationalState and relevant functions to network-util.[ch] (diff) | |
| download | systemd-c9cc03834369abfb91fba76fbb26a2e97d3fa9ad.tar.xz systemd-c9cc03834369abfb91fba76fbb26a2e97d3fa9ad.zip | |
network: introduce 'degraded-carrier' operstate to order all states
Previously, 'degraded' state is ambiguous for bonding or bridge master:
1. one or more slave interfaces does not have carrier,
2. no link local address is assigned to the master,
3. combination of the above two.
This makes the above case 1 and 3 are in the new 'degraded-carrier'
state, and makes 'degraded' state as all slaves are active but no
link local address on master.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index eaf57cb540..1614af29b0 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1200,7 +1200,7 @@ class NetworkdNetWorkBondTests(unittest.TestCase, Utilities): output = subprocess.check_output(['networkctl', 'status', 'bond99']).rstrip().decode('utf-8') print(output) - self.assertRegex(output, 'State: degraded \(configured\)') + self.assertRegex(output, 'State: degraded-carrier \(configured\)') self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy98', 'up']), 0) time.sleep(2) @@ -1313,7 +1313,7 @@ class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities): time.sleep(3) output = subprocess.check_output(['networkctl', 'status', 'bridge99']).rstrip().decode('utf-8') - self.assertRegex(output, 'State: degraded \(configured\)') + self.assertRegex(output, 'State: degraded-carrier \(configured\)') self.assertEqual(subprocess.call(['ip', 'link', 'del', 'dummy98']), 0) time.sleep(3) |