Merge pull request #351 from myakove/nncp-set-self.res-default-to-dict

NNCP: call to_dict() if not self.res

Author: rnetser

ocp_resources/node_network_configuration_policy.py

@@ -51,7 +51,6 @@ def __init__(
         ipv6_dhcp=False,
         ipv6_auto_dns=True,
         ipv6_addresses=None,
-        node_active_nics=None,
         dns_resolver=None,
         routes=None,
         yaml_file=None,
@@ -115,6 +114,8 @@ def __init__(
             self.nodes = list(Node.get(dyn_client=self.client))
 
     def set_interface(self, interface):
+        if not self.res:
+            self.res = super().to_dict()
         # First drop the interface if it's already in the list
         interfaces = [
             iface

ocp_resources/node_network_state.py

@@ -32,10 +32,7 @@ def __init__(
             delete_timeout=delete_timeout,
         )
         status = self.instance.to_dict()["status"]
-        if "desiredState" in status:
-            self.desired_state = status["desiredState"]
-        else:
-            self.desired_state = {"interfaces": []}
+        self.desired_state = status.get("desiredState", {"interfaces": []})
 
     def set_interface(self, interface):