accept global defaults as ctor args in Base Layer

Author: amdfxlucas

examples/basic/A00_simple_as/simple_as.py

@@ -29,7 +29,9 @@ def run(dumpfile = None):
 
     # Initialize the emulator and layers
     emu     = Emulator()
-    base    = Base()
+    # set global defaults..
+    base    = Base(bandwidth=OptionRegistry().net_bandwidth(10000000),# 10 Mbit/s on all links
+                    mtu=OptionRegistry().net_mtu(9000)) # use JumboFrames 
     routing = Routing()
     ebgp    = Ebgp()
     web     = WebService()
@@ -43,7 +45,7 @@ def run(dumpfile = None):
 
     # Create an autonomous system 
     as150 = base.createAutonomousSystem(150)
-    as150.setOption(OptionRegistry().net_mtu(9000))
+    as150.setOption(OptionRegistry().net_mtu(1500))
 
     # Create a network 
     as150.createNetwork('net0')

seedemu/core/Binding.py

@@ -9,7 +9,7 @@
 from ipaddress import IPv4Network, IPv4Address
 from sys import stderr
 import re, random, string
-from .Scope import Scope, NodeScopeTier
+from .Scope import NodeScope, NodeScopeTier
 
 class Action(Enum):
     """!
@@ -181,7 +181,7 @@ def __create(self, emulator: Emulator) -> Node:
         # 'host' didnt exist back when Base::configure() installed
         #  the global default sysctl options on all nodes
         for o in base.getAvailableOptions():
-            host.setOption(o, Scope(NodeScopeTier.Global))
+            host.setOption(o, NodeScope(NodeScopeTier.Global))
 
         # set name servers
         host.setNameServers(asObject.getNameServers())

seedemu/core/Emulator.py

@@ -330,7 +330,7 @@ def getServiceNetwork(self) -> Network:
         @returns service network.
         """
         if self.__service_net == None:
-            self.__service_net = self.__registry.register('seedemu', 'net', '000_svc', Network('000_svc', NetworkType.Bridge, IPv4Network(self.__service_net_prefix), direct = False))
+            self.__service_net = self.__registry.register('seedemu', 'net', '000_svc', Network('000_svc', NetworkType.Bridge, IPv4Network(self.__service_net_prefix), direct = False, scope='-1'))
 
         return self.__service_net
 

seedemu/core/Network.py

@@ -117,7 +117,7 @@ def setMtu(self, mtu: int) -> Network:
 
         @returns self, for chaining API calls.
         """
-        from OptionRegistry import OptionRegistry
+        from .OptionRegistry import OptionRegistry
         self.setOption( OptionRegistry().net_mtu(mtu) )
 
         return self

seedemu/core/Node.py

@@ -363,7 +363,7 @@ def configure(self, emulator: Emulator):
                 # netname = 'as{}.{}_as{}.{}'.format(self.getAsn(), self.getName(), peerasn, peername)
                 netname = ''.join(choice(ascii_letters) for i in range(10))
                 # TOODO scope of XC nets ?! pair of both ASes .. ?!
-                net = Network(netname, NetworkType.CrossConnect, localaddr.network, direct = False) # TODO: XC nets w/ direct flag?
+                net = Network(netname, NetworkType.CrossConnect, localaddr.network, direct = False, scope='0') # TODO: XC nets w/ direct flag?
                 net.setDefaultLinkProperties(latency, bandwidth, packetDrop).setMtu(mtu) # Set link properties
                 self.__joinNetwork(reg.register('xc', 'net', netname, net), str(localaddr.ip))
 

seedemu/layers/Base.py

@@ -60,14 +60,24 @@ def getNetOptions(self):
         return [OptionRegistry().getOption(o) for o in opt_keys]
 
 
-    def __init__(self):
+    def __init__(self, **kwargs):
         """!
         @brief Base layer constructor.
         """
         super().__init__()
         self.__ases = {}
         self.__ixes = {}
         self.__name_servers = []
+        from seedemu.core import OptionRegistry
+        for k,v in kwargs.items():
+        # Replace the 'defaults' class methods dynamically
+      
+            opt_cls = type(v)
+            # Capture 'new_value' as default argument (forces a snapshot of the current value)
+            opt_cls.default = classmethod(lambda cls, new_value=v.value: new_value)
+            opt_cls.defaultMode = classmethod(lambda cls, newmode=v.mode: newmode)
+            prefix = getattr(opt_cls, '__prefix') if hasattr(opt_cls, '__prefix') else None
+            OptionRegistry().register(opt_cls, prefix)
 
     def getName(self) -> str:
         return "Base"