Merge pull request #330 from fabric-testbed/329-failures-when-adding-…

…interfaces-to-a-network

329 failures when adding interfaces to a network

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 # Unreleased
 
 ### Fixed
+- Failures when adding interfaces to a network (Issue[#329](https://github.com/fabric-testbed/fabrictestbed-extensions/issues/329))
 - Add Facility Port to allow adding multiple interfaces (Issue [#289](https://github.com/fabric-testbed/fabrictestbed-extensions/issues/289))
 - validate_config errors out when config directory does not exist (Issue [#299](https://github.com/fabric-testbed/fabrictestbed-extensions/issues/299))
 - create_ssh_config adds extra indentation (Issue [#300](https://github.com/fabric-testbed/fabrictestbed-extensions/issues/300))

fabrictestbed_extensions/fablib/network_service.py

@@ -151,7 +151,11 @@ def calculate_l2_nstype(interfaces: List[Interface] = None) -> ServiceType:
             # L2PTP limitation for Facility Ports:
             # basically the layer-2 point-to-point server template applied is not popping
             # vlan tags over the MPLS tunnel between two facility ports.
-            if includes_facility_port and facility_port_interfaces < 2:
+            if (
+                includes_facility_port
+                and facility_port_interfaces < 2
+                and not basic_nic_count
+            ):
                 # For now WAN FacilityPorts require L2PTP
                 rtn_nstype = NetworkService.network_service_map["L2PTP"]
             elif len(interfaces) >= 2: