examples: updated interface creation to avoid using the helper to make example wlan/emane clear as to usual expectations

Author: bharnden

package/share/examples/grpc/emane80211.py

@@ -1,6 +1,6 @@
 # required imports
 from core.api.grpc import client
-from core.api.grpc.wrappers import NodeType, Position
+from core.api.grpc.wrappers import NodeType, Position, Interface
 from core.emane.models.ieee80211abg import EmaneIeee80211abgModel
 
 # interface helper
@@ -24,9 +24,9 @@
 node2 = session.add_node(3, model="mdr", position=position)
 
 # create links
-iface1 = iface_helper.create_iface(node1.id, 0)
+iface1 = Interface(id=0, ip4="10.0.0.1", ip4_mask=24)
 session.add_link(node1=node1, node2=emane, iface1=iface1)
-iface1 = iface_helper.create_iface(node2.id, 0)
+iface1 = Interface(id=0, ip4="10.0.0.2", ip4_mask=24)
 session.add_link(node1=node2, node2=emane, iface1=iface1)
 
 # setup emane configurations using a dict mapping currently support values as strings

package/share/examples/grpc/wireless.py

@@ -1,8 +1,5 @@
 from core.api.grpc import client
-from core.api.grpc.wrappers import NodeType, Position
-
-# interface helper
-iface_helper = client.InterfaceHelper(ip4_prefix="10.0.0.0/24", ip6_prefix="2001::/64")
+from core.api.grpc.wrappers import NodeType, Position, Interface
 
 # create grpc client and connect
 core = client.CoreGrpcClient()
@@ -20,9 +17,9 @@
 node2 = session.add_node(3, model="mdr", position=position)
 
 # create links
-iface1 = iface_helper.create_iface(node1.id, 0)
+iface1 = Interface(id=0, ip4="10.0.0.1", ip4_mask=24, ip6="2001::1", ip6_mask=128)
 session.add_link(node1=node1, node2=wlan, iface1=iface1)
-iface1 = iface_helper.create_iface(node2.id, 0)
+iface1 = Interface(id=0, ip4="10.0.0.2", ip4_mask=24, ip6="2001::2", ip6_mask=128)
 session.add_link(node1=node2, node2=wlan, iface1=iface1)
 
 # start session

package/share/examples/python/emane80211.py

@@ -2,13 +2,10 @@
 from core.emane.models.ieee80211abg import EmaneIeee80211abgModel
 from core.emane.nodes import EmaneNet
 from core.emulator.coreemu import CoreEmu
-from core.emulator.data import IpPrefixes
+from core.emulator.data import InterfaceData
 from core.emulator.enumerations import EventTypes
 from core.nodes.base import CoreNode, Position
 
-# ip nerator for example
-ip_prefixes = IpPrefixes(ip4_prefix="10.0.0.0/24")
-
 # create emulator instance for creating sessions and utility methods
 coreemu = CoreEmu()
 session = coreemu.create_session()
@@ -45,9 +42,9 @@
 )
 
 # link nodes to emane
-iface1 = ip_prefixes.create_iface(n1)
+iface1 = InterfaceData(ip4="10.0.0.1", ip4_mask=32)
 session.add_link(n1.id, emane.id, iface1)
-iface1 = ip_prefixes.create_iface(n2)
+iface1 = InterfaceData(ip4="10.0.0.2", ip4_mask=32)
 session.add_link(n2.id, emane.id, iface1)
 
 # start session

package/share/examples/python/wireless.py

@@ -2,17 +2,14 @@
 import logging
 
 from core.emulator.coreemu import CoreEmu
-from core.emulator.data import IpPrefixes
+from core.emulator.data import InterfaceData
 from core.emulator.enumerations import EventTypes
 from core.nodes.base import CoreNode, Position
 from core.nodes.network import WlanNode
 
 # enable info logging
 logging.basicConfig(level=logging.INFO)
 
-# ip nerator for example
-ip_prefixes = IpPrefixes(ip4_prefix="10.0.0.0/24")
-
 # create emulator instance for creating sessions and utility methods
 coreemu = CoreEmu()
 session = coreemu.create_session()
@@ -35,9 +32,9 @@
 n2 = session.add_node(CoreNode, position=position, options=options)
 
 # link nodes to wireless
-iface1 = ip_prefixes.create_iface(n1)
+iface1 = InterfaceData(ip4="10.0.0.1", ip4_mask=32, ip6="2001::1", ip6_mask=128)
 session.add_link(n1.id, wireless.id, iface1)
-iface1 = ip_prefixes.create_iface(n2)
+iface1 = InterfaceData(ip4="10.0.0.2", ip4_mask=32, ip6="2001::2", ip6_mask=128)
 session.add_link(n2.id, wireless.id, iface1)
 
 # start session