initial sweeping changes to call all usages of various interface related variables and functions (netif, interface, if, ifc, etc) to use a consistent name iface

daemon/tests/test_links.py

@@ -14,9 +14,9 @@ def create_ptp_network(
     node2 = session.add_node(CoreNode)
 
     # link nodes to net node
-    interface1_data = ip_prefixes.create_interface(node1)
-    interface2_data = ip_prefixes.create_interface(node2)
-    session.add_link(node1.id, node2.id, interface1_data, interface2_data)
+    iface1_data = ip_prefixes.create_iface(node1)
+    iface2_data = ip_prefixes.create_iface(node2)
+    session.add_link(node1.id, node2.id, iface1_data, iface2_data)
 
     # instantiate session
     session.instantiate()
@@ -29,41 +29,41 @@ class TestLinks:
         # given
         node1 = session.add_node(CoreNode)
         node2 = session.add_node(CoreNode)
-        interface1_data = ip_prefixes.create_interface(node1)
-        interface2_data = ip_prefixes.create_interface(node2)
+        iface1_data = ip_prefixes.create_iface(node1)
+        iface2_data = ip_prefixes.create_iface(node2)
 
         # when
-        session.add_link(node1.id, node2.id, interface1_data, interface2_data)
+        session.add_link(node1.id, node2.id, iface1_data, iface2_data)
 
         # then
-        assert node1.netif(interface1_data.id)
-        assert node2.netif(interface2_data.id)
+        assert node1.get_iface(iface1_data.id)
+        assert node2.get_iface(iface2_data.id)
 
     def test_add_node_to_net(self, session: Session, ip_prefixes: IpPrefixes):
         # given
         node1 = session.add_node(CoreNode)
         node2 = session.add_node(SwitchNode)
-        interface1_data = ip_prefixes.create_interface(node1)
+        iface1_data = ip_prefixes.create_iface(node1)
 
         # when
-        session.add_link(node1.id, node2.id, interface1_data=interface1_data)
+        session.add_link(node1.id, node2.id, iface1_data=iface1_data)
 
         # then
         assert node2.all_link_data()
-        assert node1.netif(interface1_data.id)
+        assert node1.get_iface(iface1_data.id)
 
     def test_add_net_to_node(self, session: Session, ip_prefixes: IpPrefixes):
         # given
         node1 = session.add_node(SwitchNode)
         node2 = session.add_node(CoreNode)
-        interface2_data = ip_prefixes.create_interface(node2)
+        iface2_data = ip_prefixes.create_iface(node2)
 
         # when
-        session.add_link(node1.id, node2.id, interface2_data=interface2_data)
+        session.add_link(node1.id, node2.id, iface2_data=iface2_data)
 
         # then
         assert node1.all_link_data()
-        assert node2.netif(interface2_data.id)
+        assert node2.get_iface(iface2_data.id)
 
     def test_add_net_to_net(self, session):
         # given
@@ -85,29 +85,29 @@ class TestLinks:
         jitter = 10
         node1 = session.add_node(CoreNode)
         node2 = session.add_node(SwitchNode)
-        interface1_data = ip_prefixes.create_interface(node1)
-        session.add_link(node1.id, node2.id, interface1_data)
-        interface1 = node1.netif(interface1_data.id)
-        assert interface1.getparam("delay") != delay
-        assert interface1.getparam("bw") != bandwidth
-        assert interface1.getparam("loss") != loss
-        assert interface1.getparam("duplicate") != dup
-        assert interface1.getparam("jitter") != jitter
+        iface1_data = ip_prefixes.create_iface(node1)
+        session.add_link(node1.id, node2.id, iface1_data)
+        iface1 = node1.get_iface(iface1_data.id)
+        assert iface1.getparam("delay") != delay
+        assert iface1.getparam("bw") != bandwidth
+        assert iface1.getparam("loss") != loss
+        assert iface1.getparam("duplicate") != dup
+        assert iface1.getparam("jitter") != jitter
 
         # when
         options = LinkOptions(
             delay=delay, bandwidth=bandwidth, loss=loss, dup=dup, jitter=jitter
         )
         session.update_link(
-            node1.id, node2.id, interface1_id=interface1_data.id, options=options
+            node1.id, node2.id, iface1_id=iface1_data.id, options=options
         )
 
         # then
-        assert interface1.getparam("delay") == delay
-        assert interface1.getparam("bw") == bandwidth
-        assert interface1.getparam("loss") == loss
-        assert interface1.getparam("duplicate") == dup
-        assert interface1.getparam("jitter") == jitter
+        assert iface1.getparam("delay") == delay
+        assert iface1.getparam("bw") == bandwidth
+        assert iface1.getparam("loss") == loss
+        assert iface1.getparam("duplicate") == dup
+        assert iface1.getparam("jitter") == jitter
 
     def test_update_net_to_node(self, session: Session, ip_prefixes: IpPrefixes):
         # given
@@ -118,29 +118,29 @@ class TestLinks:
         jitter = 10
         node1 = session.add_node(SwitchNode)
         node2 = session.add_node(CoreNode)
-        interface2_data = ip_prefixes.create_interface(node2)
-        session.add_link(node1.id, node2.id, interface2_data=interface2_data)
-        interface2 = node2.netif(interface2_data.id)
-        assert interface2.getparam("delay") != delay
-        assert interface2.getparam("bw") != bandwidth
-        assert interface2.getparam("loss") != loss
-        assert interface2.getparam("duplicate") != dup
-        assert interface2.getparam("jitter") != jitter
+        iface2_data = ip_prefixes.create_iface(node2)
+        session.add_link(node1.id, node2.id, iface2_data=iface2_data)
+        iface2 = node2.get_iface(iface2_data.id)
+        assert iface2.getparam("delay") != delay
+        assert iface2.getparam("bw") != bandwidth
+        assert iface2.getparam("loss") != loss
+        assert iface2.getparam("duplicate") != dup
+        assert iface2.getparam("jitter") != jitter
 
         # when
         options = LinkOptions(
             delay=delay, bandwidth=bandwidth, loss=loss, dup=dup, jitter=jitter
         )
         session.update_link(
-            node1.id, node2.id, interface2_id=interface2_data.id, options=options
+            node1.id, node2.id, iface2_id=iface2_data.id, options=options
         )
 
         # then
-        assert interface2.getparam("delay") == delay
-        assert interface2.getparam("bw") == bandwidth
-        assert interface2.getparam("loss") == loss
-        assert interface2.getparam("duplicate") == dup
-        assert interface2.getparam("jitter") == jitter
+        assert iface2.getparam("delay") == delay
+        assert iface2.getparam("bw") == bandwidth
+        assert iface2.getparam("loss") == loss
+        assert iface2.getparam("duplicate") == dup
+        assert iface2.getparam("jitter") == jitter
 
     def test_update_ptp(self, session: Session, ip_prefixes: IpPrefixes):
         # given
@@ -151,83 +151,81 @@ class TestLinks:
         jitter = 10
         node1 = session.add_node(CoreNode)
         node2 = session.add_node(CoreNode)
-        interface1_data = ip_prefixes.create_interface(node1)
-        interface2_data = ip_prefixes.create_interface(node2)
-        session.add_link(node1.id, node2.id, interface1_data, interface2_data)
-        interface1 = node1.netif(interface1_data.id)
-        interface2 = node2.netif(interface2_data.id)
-        assert interface1.getparam("delay") != delay
-        assert interface1.getparam("bw") != bandwidth
-        assert interface1.getparam("loss") != loss
-        assert interface1.getparam("duplicate") != dup
-        assert interface1.getparam("jitter") != jitter
-        assert interface2.getparam("delay") != delay
-        assert interface2.getparam("bw") != bandwidth
-        assert interface2.getparam("loss") != loss
-        assert interface2.getparam("duplicate") != dup
-        assert interface2.getparam("jitter") != jitter
+        iface1_data = ip_prefixes.create_iface(node1)
+        iface2_data = ip_prefixes.create_iface(node2)
+        session.add_link(node1.id, node2.id, iface1_data, iface2_data)
+        iface1 = node1.get_iface(iface1_data.id)
+        iface2 = node2.get_iface(iface2_data.id)
+        assert iface1.getparam("delay") != delay
+        assert iface1.getparam("bw") != bandwidth
+        assert iface1.getparam("loss") != loss
+        assert iface1.getparam("duplicate") != dup
+        assert iface1.getparam("jitter") != jitter
+        assert iface2.getparam("delay") != delay
+        assert iface2.getparam("bw") != bandwidth
+        assert iface2.getparam("loss") != loss
+        assert iface2.getparam("duplicate") != dup
+        assert iface2.getparam("jitter") != jitter
 
         # when
         options = LinkOptions(
             delay=delay, bandwidth=bandwidth, loss=loss, dup=dup, jitter=jitter
         )
-        session.update_link(
-            node1.id, node2.id, interface1_data.id, interface2_data.id, options
-        )
+        session.update_link(node1.id, node2.id, iface1_data.id, iface2_data.id, options)
 
         # then
-        assert interface1.getparam("delay") == delay
-        assert interface1.getparam("bw") == bandwidth
-        assert interface1.getparam("loss") == loss
-        assert interface1.getparam("duplicate") == dup
-        assert interface1.getparam("jitter") == jitter
-        assert interface2.getparam("delay") == delay
-        assert interface2.getparam("bw") == bandwidth
-        assert interface2.getparam("loss") == loss
-        assert interface2.getparam("duplicate") == dup
-        assert interface2.getparam("jitter") == jitter
+        assert iface1.getparam("delay") == delay
+        assert iface1.getparam("bw") == bandwidth
+        assert iface1.getparam("loss") == loss
+        assert iface1.getparam("duplicate") == dup
+        assert iface1.getparam("jitter") == jitter
+        assert iface2.getparam("delay") == delay
+        assert iface2.getparam("bw") == bandwidth
+        assert iface2.getparam("loss") == loss
+        assert iface2.getparam("duplicate") == dup
+        assert iface2.getparam("jitter") == jitter
 
     def test_delete_ptp(self, session: Session, ip_prefixes: IpPrefixes):
         # given
         node1 = session.add_node(CoreNode)
         node2 = session.add_node(CoreNode)
-        interface1_data = ip_prefixes.create_interface(node1)
-        interface2_data = ip_prefixes.create_interface(node2)
-        session.add_link(node1.id, node2.id, interface1_data, interface2_data)
-        assert node1.netif(interface1_data.id)
-        assert node2.netif(interface2_data.id)
+        iface1_data = ip_prefixes.create_iface(node1)
+        iface2_data = ip_prefixes.create_iface(node2)
+        session.add_link(node1.id, node2.id, iface1_data, iface2_data)
+        assert node1.get_iface(iface1_data.id)
+        assert node2.get_iface(iface2_data.id)
 
         # when
-        session.delete_link(node1.id, node2.id, interface1_data.id, interface2_data.id)
+        session.delete_link(node1.id, node2.id, iface1_data.id, iface2_data.id)
 
         # then
-        assert not node1.netif(interface1_data.id)
-        assert not node2.netif(interface2_data.id)
+        assert iface1_data.id not in node1.ifaces
+        assert iface2_data.id not in node2.ifaces
 
     def test_delete_node_to_net(self, session: Session, ip_prefixes: IpPrefixes):
         # given
         node1 = session.add_node(CoreNode)
         node2 = session.add_node(SwitchNode)
-        interface1_data = ip_prefixes.create_interface(node1)
-        session.add_link(node1.id, node2.id, interface1_data)
-        assert node1.netif(interface1_data.id)
+        iface1_data = ip_prefixes.create_iface(node1)
+        session.add_link(node1.id, node2.id, iface1_data)
+        assert node1.get_iface(iface1_data.id)
 
         # when
-        session.delete_link(node1.id, node2.id, interface1_id=interface1_data.id)
+        session.delete_link(node1.id, node2.id, iface1_id=iface1_data.id)
 
         # then
-        assert not node1.netif(interface1_data.id)
+        assert iface1_data.id not in node1.ifaces
 
     def test_delete_net_to_node(self, session: Session, ip_prefixes: IpPrefixes):
         # given
         node1 = session.add_node(SwitchNode)
         node2 = session.add_node(CoreNode)
-        interface2_data = ip_prefixes.create_interface(node2)
-        session.add_link(node1.id, node2.id, interface2_data=interface2_data)
-        assert node2.netif(interface2_data.id)
+        iface2_data = ip_prefixes.create_iface(node2)
+        session.add_link(node1.id, node2.id, iface2_data=iface2_data)
+        assert node2.get_iface(iface2_data.id)
 
         # when
-        session.delete_link(node1.id, node2.id, interface2_id=interface2_data.id)
+        session.delete_link(node1.id, node2.id, iface2_id=iface2_data.id)
 
         # then
-        assert not node2.netif(interface2_data.id)
+        assert iface2_data.id not in node2.ifaces