Merge ~rostyslav-fridman/maas:fix/iproute-default-route-determination into maas:2.9

[Rostyslav-fridman]

Changed the branch from 2.9.2 to 2.9

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix/iproute-default-route-determination lp:~rostyslav-fridman/maas/+git/maas into -b 2.9.2-branch lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/10406/console
COMMIT: 09d7497dc99b9c2556f57e8ed112db7298be0163

review: Needs Fixing

[Alberto Donato (ack)]

Note that the target for this MP should be 2.9, not 2.9.2-branch

[Rostyslav-fridman (rostyslav-fridman)]

Changed the branch to 2.9

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix/iproute-default-route-determination lp:~rostyslav-fridman/maas/+git/maas into -b 2.9 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/10413/console
COMMIT: 09d7497dc99b9c2556f57e8ed112db7298be0163

review: Needs Fixing

[Björn Tillenius (bjornt)]

Alberto was actually incorrect in his comment. This needs to be targeted to master (unless you can confirm that the issue is fixed there). We always fix things in master and backport to stable releases later, to avoid bugs returning when upgrading.

[Adam Collard (adam-collard)]

It appears this branch has been abandoned, please re-base and re-propose the branch should you still need the fix

Unmerged commits

09d7497... by Rostyslav Fridman <email address hidden> on 2021-07-07

Fix finding of default route

diff --git a/src/provisioningserver/utils/iproute.py b/src/provisioningserver/utils/iproute.py
index 07d4f5b..38caa5c 100644
--- a/src/provisioningserver/utils/iproute.py
+++ b/src/provisioningserver/utils/iproute.py
@@ -53,7 +53,31 @@ def parse_ip_route(output):
         output = str(output, "utf-8")
 
     routes = {}
-    for line in output.splitlines():
+    spl = output.splitlines()
+    multiline_route_marker = False
+
+    print(spl)
+
+    for idx, line in enumerate(spl):
+        if idx + 1 == len(spl):
+            break
+
+        if spl[idx + 1].startswith("\tnexthop"):
+            print("Inside if")
+            print(line)
+            if multiline_route_marker:
+                continue
+
+            subnet, _ = line.split(" ", 1)
+            _, route = _parse_route_definition(spl[idx + 1])
+
+            routes[subnet] = route
+            multiline_route_marker = True
+
+        if multiline_route_marker:
+            multiline_route_marker = False
+            continue
+
         subnet, route = _parse_route_definition(line)
         routes[subnet] = route
     return routes
@@ -69,3 +93,4 @@ def get_ip_route():
         ["ip", "route", "list", "scope", "global"]
     )
     return parse_ip_route(ip_route_output)
+