Merge pull request #8 from vicitori/add_duplicate

Изменила источник mininet

Author: i1ya

ipmininet/ipnet.py

@@ -121,6 +121,7 @@ def addLink(self, node1: Node, node2: Node,
                 igp_area: Optional[str] = None,
                 igp_passive=False,
                 v4_width=1, v6_width=1,
+                duplicate: Optional[Union[str, float]] = None,
                 *args, **params) -> IPLink:
         """Register a link with additional properties
 
@@ -142,12 +143,26 @@ def addLink(self, node1: Node, node2: Node,
             igp_metric = self.igp_metric
         if not igp_area:
             igp_area = self.igp_area
+
+        duplicate_val = None
+        if isinstance(duplicate, str):
+            duplicate_str = duplicate.strip()
+            if duplicate_str.endswith('%'):
+                duplicate_val = duplicate_str
+            else:
+                try:
+                    duplicate_val = float(duplicate_str)
+                except ValueError:
+                    duplicate_val = None
+        else:
+            duplicate_val = duplicate
         # Register all link properties
         props = {'igp_metric': igp_metric,
                  'igp_area': igp_area,
                  'igp_passive': igp_passive,
                  'v4_width': v4_width,
-                 'v6_width': v6_width}
+                 'v6_width': v6_width,
+                 'duplicate': duplicate_val}
         # Update interface properties with link properties
         for pstr in ('params1', 'params2'):
             try:

pyproject.toml

@@ -8,7 +8,7 @@ version = "1.1"
 description = "A mininet extension providing components to emulate IPnetworks running multiple protocols."
 keywords = [ "networking", "OSPF", "IP", "BGP", "quagga", "mininet",]
 classifiers = [ "License :: OSI Approved :: GNU General Public License v2 (GPLv2)", "Programming Language :: Python", "Development Status :: 4 - Beta", "Intended Audience :: Developers", "Topic :: System :: Networking", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9",]
-dependencies = [ "setuptools", "mako>=1.1,<1.2", "mininet @ git+https://github.com/mininet/mininet@2.3.0",]
+dependencies = [ "setuptools", "mako>=1.1,<1.2", "mininet @ git+https://github.com/mimi-net/mininet.git",]
 
 [[project.authors]]
 name = "Olivier Tilmans"