Merge pull request #118 from fabric-testbed/fac-port-L2PTP

Added FacilityPort as a type of port capable of terminating a L2PTP service and updated tests
fabric-testbed · Jun 25, 2022 · b35b74c · b35b74c
2 parents 1c96991 + b239128
commit b35b74c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/fim/__init__.py b/fim/__init__.py
@@ -1,2 +1,2 @@
 #
-__VERSION__ = "1.2.4"
+__VERSION__ = "1.2.5"
diff --git a/fim/slivers/network_service.py b/fim/slivers/network_service.py
@@ -171,7 +171,8 @@ class NetworkServiceSliver(BaseSliver):
                                                    forbidden_properties=['mirror_port',
                                                                          'mirror_direction',
                                                                          'controller_url'],
-                                                   required_interface_types=[InterfaceType.DedicatedPort]),
+                                                   required_interface_types=[InterfaceType.DedicatedPort,
+                                                                             InterfaceType.FacilityPort]),
         ServiceType.L2Multisite: ServiceConstraintRecord(layer=NSLayer.L2, num_interfaces=NO_LIMIT, num_sites=NO_LIMIT,
                                                          num_instances=NO_LIMIT,
                                                          desc='A Multi-Site L2 service in FABRIC.',

diff --git a/test/slice_topology_test.py b/test/slice_topology_test.py
@@ -311,6 +311,7 @@ def __init__(self, val):
                                              interfaces=[fac1.interface_list[0],
                                                          n1.interface_list[2]])
 
+        self.topo.validate()
         self.assertEqual(s1.layer, f.Layer.L2)
         print(fac1.network_services['RENCI-DTN-ns'].labels)
         self.assertEqual(fac1.network_services['RENCI-DTN-ns'].layer, f.Layer.L2)