Merge pull request #84239 from stevsmit/11974

OSDOCS-11974:reorg of multi nwt docs

Author: stevsmit

_topic_maps/_topic_map.yml

@@ -1514,22 +1514,38 @@ Topics:
   Topics:
   - Name: Understanding multiple networks
     File: understanding-multiple-networks
-  - Name: Understanding user defined networks
-    File: understanding-user-defined-network
-  - Name: Configuring an additional network
-    File: configuring-additional-network
+  - Name: Primary networks
+    Dir: primary_networks
+    Distros: openshift-enterprise, openshift-origin
+    Topics:
+    - Name: UserDefinedNetwork CR
+      File: about-user-defined-networks
+    - Name: NetworkAttachmentDefinition CR
+      File: about-primary-nwt-nad
+  - Name: Secondary networks
+    Dir: secondary_networks
+    Distros: openshift-enterprise, openshift-origin
+    Topics:
+    - Name: Creating secondary networks on OVN-Kubernetes
+      File: creating-secondary-nwt-ovnk
+    - Name: Creating secondary networks with other CNI plugins
+      File: creating-secondary-nwt-other-cni
+    - Name: Attaching a pod to an additional network
+      File: attaching-pod
+    - Name: Configuring multi-network policies
+      File: configuring-multi-network-policy
+    - Name: Removing a pod from an additional network
+      File: removing-pod
+    - Name: Editing an additional network
+      File: editing-additional-network
+    - Name: Configuring IP address assignment for secondary networks
+      File: configuring-ip-secondary-nwt
+    - Name: Configuring the master interface in the container network namespace
+      File: configuring-master-interface
+    - Name: Removing an additional network
+      File: removing-additional-network
   - Name: About virtual routing and forwarding
     File: about-virtual-routing-and-forwarding
-  - Name: Configuring multi-network policy
-    File: configuring-multi-network-policy
-  - Name: Attaching a pod to an additional network
-    File: attaching-pod
-  - Name: Removing a pod from an additional network
-    File: removing-pod
-  - Name: Editing an additional network
-    File: edit-additional-network
-  - Name: Removing an additional network
-    File: remove-additional-network
   - Name: Assigning a secondary network to a VRF
     File: assigning-a-secondary-network-to-a-vrf
 - Name: Hardware networks

installing/installing_openstack/installing-openstack-installer-ovs-dpdk.adoc

@@ -59,9 +59,9 @@ include::modules/networking-osp-enabling-vfio-noiommu.adoc[leveloffset=+1]
 include::modules/installation-osp-dpdk-binding-vfio-pci.adoc[leveloffset=+1]
 include::modules/installation-osp-dpdk-exposing-host-interface.adoc[leveloffset=+1]
 
-.Additional resources
+.Additional resource
 
-* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-host-device-object_configuring-additional-network[Creating an additional network attachment with the Cluster Network Operator]
+* xref:../../networking/multiple_networks/primary_networks/creating-primary-nad.adoc#creating-primary-nad[Creating an additional network attachment with the Cluster Network Operator]
 
 The cluster is installed and prepared for configuration. You must now perform the OVS-DPDK configuration tasks in <<next-steps_installing-openstack-installer-ovs-dpdk, Next steps>>.
 

modules/nw-nad-cr.adoc

@@ -0,0 +1,30 @@
+// Module included in the following assemblies:
+//
+// * networking/multiple_networks/creating-primary-nad.adoc
+
+:_mod-docs-content-type: REFERENCE
+[id="nw-nad-cr_{context}"]
+== Configuration for an additional network attachment
+
+An additional network is configured by using the `NetworkAttachmentDefinition` API in the `k8s.cni.cncf.io` API group.
+
+The configuration for the API is described in the following table:
+
+.`NetworkAttachmentDefinition` API fields
+[cols=".^3,.^2,.^5",options="header"]
+|====
+|Field|Type|Description
+
+|`metadata.name`
+|`string`
+|The name for the additional network.
+
+|`metadata.namespace`
+|`string`
+|The namespace that the object is associated with.
+
+|`spec.config`
+|`string`
+|The CNI plugin configuration in JSON format.
+
+|====

modules/nw-udn-benefits.adoc

@@ -0,0 +1,32 @@
+//module included in the following assembly:
+//
+// *networking/multiple_networks/about-user-defined-networks.adoc
+:_mod-docs-content-type: REFERENCE
+[id="nw-udn-benefits_{context}"]
+= Benefits of a user-defined network
+
+User-defined networks provide the following benefits:
+
+. Enhanced network isolation for security
++
+* **Tenant isolation**: Namespaces can have their own isolated primary network, similar to how tenants are isolated in {rh-openstack-first}. This improves security by reducing the risk of cross-tenant traffic.
+
+. Network flexibility
++
+* **Layer 2 and layer 3 support**: Cluster administrators can configure primary networks as layer 2 or layer 3 network types. This provides the flexibility of a secondary network to the primary network.
+
+. Simplified network management
++
+* **Reduced network configuration complexity**: With user-defined networks, the need for complex network policies are eliminated because isolation can be achieved by grouping workloads in different networks.
+
+. Advanced capabilities
++
+* **Consistent and selectable IP addressing**: Users can specify and reuse IP subnets across different namespaces and clusters, providing a consistent networking environment.
++
+* **Support for multiple networks**: The user-defined networking feature allows administrators to connect multiple namespaces to a single network, or to create distinct networks for different sets of namespaces.
+
+. Simplification of application migration from {rh-openstack-first}
++
+* **Network parity**: With user-defined networking, the migration of applications from OpenStack to {product-title} is simplified by providing similar network isolation and configuration options.
+
+Developers and administrators can create a user-defined network that is namespace scoped using the custom resource. An overview of the process is: create a namespace, create and configure the custom resource, create pods in the namespace.

networking/hardware_networks/about-sriov.adoc

@@ -90,7 +90,7 @@ include::modules/nw-sriov-huge-pages.adoc[leveloffset=+2]
 [id="configure-multi-networks-additional-resources"]
 == Additional resources
 
-* xref:../../networking/multiple_networks/configuring-multi-network-policy.adoc#configuring-multi-network-policy[Configuring multi-network policy]
+* xref:../../networking/multiple_networks/secondary_networks/configuring-multi-network-policy.adoc#configuring-multi-network-policy[Configuring multi-network policy]
 
 [id="about-sriov-next-steps"]
 == Next steps

networking/hardware_networks/configuring-sriov-ib-attach.adoc

@@ -21,7 +21,7 @@ include::modules/nw-multus-configure-dualstack-ip-address.adoc[leveloffset=+2]
 
 [role="_additional-resources"]
 .Additional resources
-* xref:../../networking/multiple_networks/attaching-pod.html#nw-multus-add-pod_attaching-pod[Attaching a pod to an additional network]
+* xref:../../networking/multiple_networks/secondary_networks/attaching-pod.adoc#attaching-pod[Attaching a pod to an additional network]
 
 // Configuring SR-IOV additional network
 include::modules/nw-sriov-network-attachment.adoc[leveloffset=+1]

networking/hardware_networks/configuring-sriov-net-attach.adoc

@@ -17,7 +17,7 @@ include::modules/nw-multus-configure-dualstack-ip-address.adoc[leveloffset=+2]
 
 [role="_additional-resources"]
 .Additional resources
-* xref:../../networking/multiple_networks/attaching-pod.html#nw-multus-add-pod_attaching-pod[Attaching a pod to an additional network]
+* xref:../../networking/multiple_networks/secondary_networks/attaching-pod.adoc#attaching-pod[Attaching a pod to an additional network]
 
 include::modules/nw-sriov-network-attachment.adoc[leveloffset=+1]
 

networking/hardware_networks/configuring-sriov-qinq-support.adoc

@@ -15,6 +15,6 @@ include::modules/nw-sriov-about-qinq.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-vlan-object_configuring-additional-network[Configuration for an VLAN additional network]
+xref:../../networking/multiple_networks/secondary_networks/creating-secondary-nwt-other-cni.adoc#nw-multus-vlan-object_configuring-additional-network-cni[Configuration for an VLAN additional network]
 
 include::modules/nw-configuring-qinq-sriov-proc.adoc[leveloffset=+1]

networking/hardware_networks/using-dpdk-and-rdma.adoc

@@ -22,7 +22,7 @@ include::modules/nw-running-dpdk-rootless-tap.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-enable-container_use_devices_configuring-additional-network[Enabling the container_use_devices boolean]
+// I can't seem to find this in 4.16 or 4.15 * xr3f:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-enable-container_use_devices_configuring-additional-network[Enabling the container_use_devices boolean]
 
 * xref:../../scalability_and_performance/low_latency_tuning/cnf-tuning-low-latency-nodes-with-perf-profile.adoc#cnf-create-performance-profiles[Creating a performance profile]
 
@@ -68,9 +68,7 @@ include::modules/nw-openstack-hw-offload-testpmd-pod.adoc[leveloffset=+1]
 * xref:../../networking/networking_operators/sr-iov-operator/installing-sriov-operator.adoc#installing-sriov-operator[Installing the SR-IOV Network Operator]
 
 * xref:../../networking/hardware_networks/configuring-sriov-device.adoc#nw-sriov-networknodepolicy-object_configuring-sriov-device[Configuring an SR-IOV network device]
-
-* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-whereabouts_configuring-additional-network[Dynamic IP address assignment configuration with Whereabouts]
-
+* xref:../../networking/multiple_networks/secondary_networks/configuring-ip-secondary-nwt.adoc#nw-multus-whereabouts_configuring-additional-network[Dynamic IP address assignment configuration with Whereabouts]
 * xref:../../scalability_and_performance/low_latency_tuning/cnf-provisioning-low-latency-workloads.adoc#disabling-interrupt-processing-for-individual-pods_cnf-provisioning-low-latency[Disabling interrupt processing for individual pods]
 
 * xref:../../networking/hardware_networks/configuring-sriov-net-attach.adoc#configuring-sriov-net-attach[Configuring an SR-IOV Ethernet network attachment]

networking/multiple_networks/about-virtual-routing-and-forwarding.adoc

@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
-[id="about-virtual-routing-and-forwarding"]
-= About virtual routing and forwarding
+[id="virtual-routing-and-forwarding"]
+= Virtual routing and forwarding
 include::_attributes/common-attributes.adoc[]
 :context: about-virtual-routing-and-forwarding