Multus ipv6 on vsphere

shyRozen · shyRozen · commit 2b0a2a68a316 · 2025-01-06T21:58:50.000+02:00
Signed-off-by: Shay Rozen &lt;shay.rozen@gmail.com&gt;
diff --git a/ocs_ci/deployment/deployment.py b/ocs_ci/deployment/deployment.py
@@ -1144,8 +1144,11 @@ def deploy_ocs_via_operator(self, image=None):
                         node_obj.exec_oc_debug_cmd(node=node, cmd_list=[ip_link_cmd])
 
             if create_public_net:
+                nad_to_load = constants.MULTUS_PUBLIC_NET_YAML
                 logger.info("Creating Multus public network")
-                public_net_data = templating.load_yaml(constants.MULTUS_PUBLIC_NET_YAML)
+                if config.DEPLOYMENT.get("ipv6"):
+                    nad_to_load = constants.MULTUS_PUBLIC_NET_IPV6_YAML
+                public_net_data = templating.load_yaml(nad_to_load)
                 public_net_data["metadata"]["name"] = config.ENV_DATA.get(
                     "multus_public_net_name"
                 )
@@ -1157,9 +1160,14 @@ def deploy_ocs_via_operator(self, image=None):
                 public_net_config_dict["master"] = config.ENV_DATA.get(
                     "multus_public_net_interface"
                 )
-                public_net_config_dict["ipam"]["range"] = config.ENV_DATA.get(
-                    "multus_public_net_range"
-                )
+                if not config.DEPLOYMENT.get("ipv6"):
+                    public_net_config_dict["ipam"]["range"] = config.ENV_DATA.get(
+                        "multus_public_net_range"
+                    )
+                else:
+                    public_net_config_dict["ipam"]["range"] = config.ENV_DATA.get(
+                        "multus_public_ipv6_net_range"
+                    )
                 public_net_config_dict["type"] = config.ENV_DATA.get(
                     "multus_public_net_type"
                 )
@@ -1175,6 +1183,10 @@ def deploy_ocs_via_operator(self, image=None):
 
             if create_cluster_net:
                 logger.info("Creating Multus cluster network")
+                if config.DEPLOYMENT.get("ipv6"):
+                    constants.MULTUS_CLUSTER_NET_YAML = (
+                        constants.MULTUS_CLUSTER_NET_IPV6_YAML
+                    )
                 cluster_net_data = templating.load_yaml(
                     constants.MULTUS_CLUSTER_NET_YAML
                 )
@@ -1189,12 +1201,14 @@ def deploy_ocs_via_operator(self, image=None):
                 cluster_net_config_dict["master"] = config.ENV_DATA.get(
                     "multus_cluster_net_interface"
                 )
-                cluster_net_config_dict["ipam"]["range"] = config.ENV_DATA.get(
-                    "multus_cluster_net_range"
-                )
-                cluster_net_config_dict["type"] = config.ENV_DATA.get(
-                    "multus_cluster_net_type"
-                )
+                if not config.DEPLOYMENT.get("ipv6"):
+                    cluster_net_config_dict["ipam"]["range"] = config.ENV_DATA.get(
+                        "multus_cluster_net_range"
+                    )
+                else:
+                    cluster_net_config_dict["type"] = config.ENV_DATA.get(
+                        "multus_cluster_ipv6_net_type"
+                    )
                 cluster_net_config_dict["mode"] = config.ENV_DATA.get(
                     "multus_cluster_net_mode"
                 )
diff --git a/ocs_ci/framework/conf/default_config.yaml b/ocs_ci/framework/conf/default_config.yaml
@@ -264,13 +264,15 @@ ENV_DATA:
   multus_public_net_namespace: "openshift-storage"
   multus_public_net_interface: "br-ex"
   multus_public_net_range: "192.168.20.0/24"
+  multus_public_ipv6_net_range: "fd01:db8:1:1::/96"
   multus_public_net_type: "macvlan"
   multus_public_net_mode: "bridge"
   multus_create_cluster_net: true
   multus_cluster_net_name: "private-net"
   multus_cluster_net_namespace: "openshift-storage"
   multus_cluster_net_interface: "br-ex"
   multus_cluster_net_range: "192.168.30.0/24"
+  multus_cluster__ipv6_net_range: "fd01:db8:2:1::/96"
   multus_cluster_net_type: "macvlan"
   multus_cluster_net_mode: "bridge"
   multus_destination_route: "192.168.252.0/24"
diff --git a/ocs_ci/helpers/helpers.py b/ocs_ci/helpers/helpers.py
@@ -4870,6 +4870,8 @@ def add_route_public_nad():
     ]
     nad_config_dict_string = json.dumps(nad_config_dict)
     logger.info("Creating Multus public network")
+    if config.DEPLOYMENT.get("ipv6"):
+        constants.MULTUS_PUBLIC_NET_YAML = constants.MULTUS_PUBLIC_NET_IPV6_YAML
     public_net_data = templating.load_yaml(constants.MULTUS_PUBLIC_NET_YAML)
     public_net_data["metadata"]["name"] = config.ENV_DATA.get("multus_public_net_name")
     public_net_data["metadata"]["namespace"] = config.ENV_DATA.get(
@@ -4959,6 +4961,15 @@ def configure_node_network_configuration_policy_on_all_worker_nodes():
     # This function require changes for compact mode
     logger.info("Configure NodeNetworkConfigurationPolicy on all worker nodes")
     worker_node_names = get_worker_nodes()
+    ip_version = "ipv4"
+    if (
+        config.DEPLOYMENT.get("ipv6")
+        and config.ENV_DATA.get("platform") == constants.VSPHERE_PLATFORM
+    ):
+        constants.NODE_NETWORK_CONFIGURATION_POLICY = (
+            constants.NODE_NETWORK_CONFIGURATION_POLICY_IPV6
+        )
+        ip_version = "ipv6"
     interface_num = 0
     for worker_node_name in worker_node_names:
         node_network_configuration_policy = templating.load_yaml(
@@ -5001,13 +5012,13 @@ def configure_node_network_configuration_policy_on_all_worker_nodes():
             ] = f"ceph-public-net-shim-{worker_node_name}"
             shim_default_ip = node_network_configuration_policy["spec"]["desiredState"][
                 "interfaces"
-            ][0]["ipv4"]["address"][0]["ip"]
+            ][0][ip_version]["address"][0]["ip"]
 
             shim_ip = str(ipaddress.ip_address(shim_default_ip) + interface_num)
             interface_num += 1
 
             node_network_configuration_policy["spec"]["desiredState"]["interfaces"][0][
-                "ipv4"
+                ip_version
             ]["address"][0]["ip"] = shim_ip
 
             node_network_configuration_policy["spec"]["desiredState"]["interfaces"][0][
diff --git a/ocs_ci/ocs/constants.py b/ocs_ci/ocs/constants.py
@@ -1047,6 +1047,18 @@
 NODE_NETWORK_CONFIGURATION_POLICY = os.path.join(
     TEMPLATE_DEPLOYMENT_DIR, "node_network_configuration_policy.yaml"
 )
+
+MULTUS_PUBLIC_NET_IPV6_YAML = os.path.join(
+    TEMPLATE_DEPLOYMENT_DIR, "multus-public-net-ipv6.yaml"
+)
+MULTUS_CLUSTER_NET_IPV6_YAML = os.path.join(
+    TEMPLATE_DEPLOYMENT_DIR, "multus-cluster-net-ipv6.yaml"
+)
+NODE_NETWORK_CONFIGURATION_POLICY_IPV6 = os.path.join(
+    TEMPLATE_DEPLOYMENT_DIR, "node_network_configuration_policy_ipv6.yaml"
+)
+
+
 NETWORK_ATTACHEMENT_DEFINITION = "network-attachment-definitions.k8s.cni.cncf.io"
 VSPHERE_MULTUS_INTERFACE = "ens224"
 
diff --git a/ocs_ci/templates/ocs-deployment/multus-cluster-net-ipv6.yaml b/ocs_ci/templates/ocs-deployment/multus-cluster-net-ipv6.yaml
@@ -0,0 +1,19 @@
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
+metadata:
+  name: cluster-net
+  namespace: openshift-storage
+  labels: {}
+  annotations: {}
+spec:
+  config: '{
+      "cniVersion": "0.3.1",
+      "type": "macvlan",
+      "master": "br-ex",
+      "mode": "bridge",
+      "ipam": {
+            "type": "whereabouts",
+            "range": "fd01:db8:2:1::/96",
+            "routes": [{"dst": "fd01:db8:3:1::/96"}]
+      }
+  }'
diff --git a/ocs_ci/templates/ocs-deployment/multus-cluster-net.yaml b/ocs_ci/templates/ocs-deployment/multus-cluster-net.yaml
@@ -13,6 +13,7 @@ spec:
       "mode": "bridge",
       "ipam": {
             "type": "whereabouts",
-            "range": "192.168.30.0/24"
+            "range": "192.168.30.0/24",
+            "routes": [{"dst": "192.168.252.0/24"}]
       }
   }'
diff --git a/ocs_ci/templates/ocs-deployment/multus-public-net-ipv6.yaml b/ocs_ci/templates/ocs-deployment/multus-public-net-ipv6.yaml
@@ -0,0 +1,19 @@
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
+metadata:
+  name: public-net
+  namespace: openshift-storage
+  labels: {}
+  annotations: {}
+spec:
+  config: '{
+      "cniVersion": "0.3.1",
+      "type": "macvlan",
+      "master": "br-ex",
+      "mode": "bridge",
+      "ipam": {
+            "type": "whereabouts",
+            "range": "fd01:db8:1:1::/96",
+            "routes": [{"dst": "fd01:db8:3:1::/96"}]
+      }
+  }'
diff --git a/ocs_ci/templates/ocs-deployment/node_network_configuration_policy_ipv6.yaml b/ocs_ci/templates/ocs-deployment/node_network_configuration_policy_ipv6.yaml
@@ -0,0 +1,31 @@
+apiVersion: nmstate.io/v1
+kind: NodeNetworkConfigurationPolicy
+metadata:
+  name: ceph-public-net-shim-worker-node
+  namespace: openshift-storage
+spec:
+  nodeSelector:
+    node-role.kubernetes.io/worker: ""
+    kubernetes.io/hostname: worker-node
+  desiredState:
+    interfaces:
+      - name: odf-pub-shim
+        description: Shim interface used to connect host to OpenShift Data Foundation public Multus network
+        type: mac-vlan
+        state: up
+        mac-vlan:
+          base-iface: enp1s0f1
+          mode: bridge
+          promiscuous: true
+        ipv6:
+          enabled: true
+          dhcp: false
+          address:
+            - ip: fd01:db8:3:1::1 # STATIC IP FOR worker node
+              prefix-length: 96
+    routes:
+      config:
+        - destination: fd01:db8:1:1::/96
+          next-hop-interface: odf-pub-shim
+        - destination: fd01:db8:2:1::/96
+          next-hop-interface: odf-pub-shim

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ spec:`
`13`	`13`	`"mode": "bridge",`
`14`	`14`	`"ipam": {`
`15`	`15`	`"type": "whereabouts",`
`16`		`- "range": "192.168.30.0/24"`
	`16`	`+ "range": "192.168.30.0/24",`
	`17`	`+ "routes": [{"dst": "192.168.252.0/24"}]`
`17`	`18`	`}`
`18`	`19`	`}'`