Netplan state diff

netplan_cli/cli/state.py

@@ -509,6 +509,7 @@ def __init__(self, subtree='all', rootdir='/'):
 
         np_state = netplan.State()
         np_state.import_parser_results(parser)
+        self.netdefs = np_state.netdefs
 
         self.state = StringIO()
 

netplan_cli/meson.build

@@ -25,6 +25,7 @@ cli_sources = files(
     'cli/core.py',
     'cli/ovs.py',
     'cli/state.py',
+    'cli/state_diff.py',
     'cli/sriov.py',
     'cli/utils.py')
 

python-cffi/netplan/netdef.py

@@ -242,7 +242,7 @@ def __next__(self):
         return ffi.string(next_value).decode('utf-8')
 
 
-@dataclass(unsafe_hash=True)
+@dataclass
 class NetplanRoute:
     _METRIC_UNSPEC_ = lib.UINT_MAX
     _TABLE_UNSPEC_ = 0
@@ -298,6 +298,25 @@ def to_dict(self):
 
         return route
 
+    def __hash__(self):
+        return hash(
+            (self.to, self.via,
+             self.from_addr, self.table,
+             self.family, self.metric,
+             self.type, self.scope))
+
+    def __eq__(self, route):
+        return (
+            self.to == route.to and
+            self.via == route.via and
+            self.from_addr == route.from_addr and
+            self.table == route.table and
+            self.family == route.family and
+            self.metric == route.metric and
+            self.type == route.type and
+            self.scope == route.scope
+        )
+
 
 class _NetdefRouteIterator:
     def __init__(self, netdef):