DNM

Author: evallesp

plugins/module_utils/net_map/networking_definition.py

@@ -1044,6 +1044,7 @@ class SubnetBasedNetworkToolDefinition:
     __FIELD_ROUTES = "routes"
     __FIELD_ROUTES_IPV4 = "routes-v4"
     __FIELD_ROUTES_IPV6 = "routes-v6"
+    __FIELD_TYPE = "type"
 
     def __init__(
         self,
@@ -1067,6 +1068,7 @@ def __init__(
         self.__ipv6_ranges: typing.List[HostNetworkRange] = []
         self.__ipv4_routes: typing.List[HostNetworkRoute] = []
         self.__ipv6_routes: typing.List[HostNetworkRoute] = []
+        self.__type: typing.Optional[str] = None
 
         self.__parse_raw(raw_config)
 
@@ -1092,6 +1094,13 @@ def __parse_raw(self, raw_definition: typing.Dict[str, typing.Any]):
             alone_field=self.__FIELD_ROUTES,
         )
 
+        _validate_fields_one_of(
+            [
+                self.__FIELD_TYPE,
+            ],
+            raw_definition,
+            parent_name=self.__object_name,
+        )
         self.__parse_raw_range_field(raw_definition, self.__FIELD_RANGES)
         self.__parse_raw_range_field(
             raw_definition, self.__FIELD_RANGES_IPV4, ip_version=4
@@ -1107,6 +1116,7 @@ def __parse_raw(self, raw_definition: typing.Dict[str, typing.Any]):
         self.__parse_raw_route_field(
             raw_definition, self.__FIELD_ROUTES_IPV6, ip_version=6
         )
+        self.__parse_raw_type_field(raw_definition, self.__FIELD_TYPE)
 
     def __parse_raw_range_field(
         self,
@@ -1190,6 +1200,21 @@ def __parse_raw_route_field(
                 if ipv6_route:
                     self.__ipv6_routes.append(ipv6_route)
 
+    @property
+    def type(self) -> str:
+        """The type of the tool for multus."""
+        return self.__type
+
+    def __parse_raw_type_field(self, raw_definition, field_name: str):
+        if field_name in raw_definition:
+            type = _validate_parse_field_type(
+                field_name,
+                raw_definition,
+                str,
+                parent_name=self.__object_name,
+            )
+            self.__type = type
+
 
 class MultusNetworkDefinition(SubnetBasedNetworkToolDefinition):
     """Parses and holds Multus configuration for a given network."""

plugins/module_utils/net_map/networking_env_definitions.py

@@ -136,13 +136,15 @@ class MappedMultusNetworkConfig:
         ipv6_ranges: IPv6 ranges assigned to Multus.
         ipv4_routes: IPv4 routes assigned to Multus.
         ipv6_routes: IPv6 routes assigned to Multus.
+        multus_type: The type of the multus network.
 
     """
 
     ipv4_ranges: typing.List[MappedIpv4NetworkRange]
     ipv6_ranges: typing.List[MappedIpv6NetworkRange]
     ipv4_routes: typing.List[MappedIpv4NetworkRoute]
     ipv6_routes: typing.List[MappedIpv6NetworkRoute]
+    multus_type: typing.Optional[str] = None
 
 
 @dataclasses.dataclass(frozen=True)

plugins/module_utils/net_map/networking_mapper.py

@@ -678,12 +678,15 @@ def __build_network_tool_common(
                 for ip_route in tool_net_def.routes_ipv6
             ],
         ]
+        multus_type = []
+        if tool_type.__name__ == "MappedMultusNetworkConfig":
+            multus_type.append(tool_net_def.type)
 
         if any(
             route_field in tool_type.__dataclass_fields__
             for route_field in ["ipv4_routes", "ipv6_routes"]
         ):
-            args_list = args_list + route_args_list
+            args_list = args_list + route_args_list + multus_type
         return tool_type(*args_list)
 
 

roles/ci_multus/molecule/default/verify_crc.yml

@@ -58,7 +58,7 @@
                   - "trap : TERM INT; sleep infinity & wait"
         wait: true
         wait_sleep: 10
-        wait_timeout: 300
+        wait_timeout: 420
         wait_condition:
           type: Ready
           status: "True"

roles/ci_multus/templates/nad.yml.j2

@@ -1,4 +1,9 @@
 {% for network_name, network_details in _cifmw_ci_multus_net_info.items() %}
+{% if network_details.tools.get('multus', {}).get('multus_type', None) %}
+{% set multus_type = network_details.tools.multus.multus_type %}
+{% else %}
+{% set multus_type = cifmw_ci_multus_default_nad_type %}
+{% endif %}
 ---
 apiVersion: k8s.cni.cncf.io/v1
 kind: NetworkAttachmentDefinition
@@ -12,12 +17,11 @@ spec:
     {
       "cniVersion": "{{ cifmw_ci_multus_cniversion }}",
       "name": "{{ network_name }}",
-{% if cifmw_ci_multus_default_nad_type == "macvlan" %}
-      "type": "macvlan",
+      "type": "{{ multus_type }}",
+{% if multus_type == "macvlan" %}
       "master": "{{ network_details.interface_name }}",
 {% endif %}
-{% if cifmw_ci_multus_default_nad_type == "bridge" %}
-      "type": "bridge",
+{% if multus_type == "bridge" %}
       "bridge": "{{ network_details.interface_name }}",
 {% endif %}
       "ipam": {

tests/unit/module_utils/test_files/networking-definition-valid-all-tools-full-map-out.json

@@ -28,7 +28,8 @@
           ],
           "ipv6_ranges": [],
           "ipv4_routes": [],
-          "ipv6_routes": []
+          "ipv6_routes": [],
+          "multus_type": "macvlan"
         },
         "netconfig": {
           "ipv4_ranges": [
@@ -88,7 +89,8 @@
               "gateway": "192.168.122.1"
             }
           ],
-          "ipv6_routes": []
+          "ipv6_routes": [],
+          "multus_type": "bridge"
         },
         "netconfig": {
           "ipv4_ranges": [

tests/unit/module_utils/test_files/networking-definition-valid-all-tools-networks-out.json

@@ -27,7 +27,8 @@
         ],
         "ipv6_ranges": [],
         "ipv4_routes": [],
-        "ipv6_routes": []
+        "ipv6_routes": [],
+        "multus_type": "macvlan"
       },
       "netconfig": {
         "ipv4_ranges": [
@@ -87,7 +88,8 @@
             "gateway": "192.168.122.1"
           }
         ],
-        "ipv6_routes": []
+        "ipv6_routes": [],
+        "multus_type": "bridge"
       },
       "netconfig": {
         "ipv4_ranges": [

tests/unit/module_utils/test_files/networking-definition-valid-all-tools-partial-map-out.json

@@ -28,7 +28,8 @@
           ],
           "ipv6_ranges": [],
           "ipv4_routes": [],
-          "ipv6_routes": []
+          "ipv6_routes": [],
+          "multus_type": "macvlan"
         },
         "netconfig": {
           "ipv4_ranges": [
@@ -88,7 +89,8 @@
               "gateway": "192.168.122.1"
             }
           ],
-          "ipv6_routes": []
+          "ipv6_routes": [],
+          "multus_type": "bridge"
         },
         "netconfig": {
           "ipv4_ranges": [

tests/unit/module_utils/test_files/networking-definition-valid-all-tools.yml

@@ -4,6 +4,7 @@ networks:
     mtu: 1500
     tools:
       multus:
+        type: macvlan
         ranges:
           - start: 30
             end: 39
@@ -26,6 +27,7 @@ networks:
         ranges:
           - start: 30
             end: 39
+        type: bridge
         routes:
           - destination: "192.168.121.0/24"
             gateway: "192.168.122.1"