Merge pull request #54126 from apinnick/CNV-18880-update-vm-network-sriov

CNV-18880: Update virt SR-IOV network

Author: apinnick

_topic_maps/_topic_map.yml

@@ -3442,26 +3442,22 @@ Topics:
   - Name: Virtual machine networking
     Dir: vm_networking
     Topics:
-    - Name: Configuring the virtual machine for the default pod network
+    - Name: Configuring a virtual machine for the default pod network
       File: virt-using-the-default-pod-network-with-virt
       Distros: openshift-enterprise
-    - Name: Configuring the virtual machine for the default pod network with OKD Virtualization
+    - Name: Configuring a virtual machine for the default pod network with OKD Virtualization
       File: virt-using-the-default-pod-network-with-virt
       Distros: openshift-origin
     - Name: Creating a service to expose a virtual machine
       File: virt-creating-service-vm
-    - Name: Attaching a virtual machine to a Linux bridge network
+    - Name: Connecting a virtual machine to a Linux bridge network
       File: virt-attaching-vm-multiple-networks
+    - Name: Connecting a virtual machine to an SR-IOV network
+      File: virt-attaching-vm-to-sriov-network
+    - Name: Connecting a virtual machine to a service mesh
+      File: virt-connecting-vm-to-service-mesh
     - Name: Configuring IP addresses for virtual machines
       File: virt-configuring-ip-for-vms
-    - Name: Configuring an SR-IOV network device for virtual machines
-      File: virt-configuring-sriov-device-for-vms
-    - Name: Connecting virtual machines to a service mesh
-      File: virt-connecting-vm-to-service-mesh
-    - Name: Defining an SR-IOV network
-      File: virt-defining-an-sriov-network
-    - Name: Attaching a virtual machine to an SR-IOV network
-      File: virt-attaching-vm-to-sriov-network
     - Name: Viewing the IP address of NICs on a virtual machine
       File: virt-viewing-ip-of-vm-nic
     - Name: Using a MAC address pool for virtual machines

installing/installing_bare_metal/preparing-to-install-on-bare-metal.adoc

@@ -19,7 +19,7 @@ include::modules/virt-planning-bare-metal-cluster-for-ocp-virt.adoc[leveloffset=
 
 * xref:../../virt/install/preparing-cluster-for-virt.adoc#preparing-cluster-for-virt[Preparing your cluster for {VirtProductName}]
 * xref:../../networking/hardware_networks/about-sriov.adoc#about-sriov[About Single Root I/O Virtualization (SR-IOV) hardware networks]
-* xref:../../virt/virtual_machines/vm_networking/virt-configuring-sriov-device-for-vms.adoc#virt-configuring-sriov-device-for-vms[Configuring an SR-IOV network device for virtual machines]
+* xref:../../virt/virtual_machines/vm_networking/virt-attaching-vm-to-sriov-network.adoc#virt-attaching-vm-to-sriov-network[Connecting a virtual machine to an SR-IOV network]
 
 [id="choosing-a-method-to-install-ocp-on-bare-metal"]
 == Choosing a method to install {product-title} on bare metal

installing/installing_bare_metal_ipi/ipi-install-prerequisites.adoc

@@ -28,7 +28,7 @@ include::modules/virt-planning-bare-metal-cluster-for-ocp-virt.adoc[leveloffset=
 
 * xref:../../virt/install/preparing-cluster-for-virt.adoc#preparing-cluster-for-virt[Preparing your cluster for {VirtProductName}]
 * xref:../../networking/hardware_networks/about-sriov.adoc#about-sriov[About Single Root I/O Virtualization (SR-IOV) hardware networks]
-* xref:../../virt/virtual_machines/vm_networking/virt-configuring-sriov-device-for-vms.adoc#virt-configuring-sriov-device-for-vms[Configuring an SR-IOV network device for virtual machines]
+* xref:../../virt/virtual_machines/vm_networking/virt-attaching-vm-to-sriov-network.adoc#virt-attaching-vm-to-sriov-network[Connecting a virtual machine to an SR-IOV network]
 
 include::modules/ipi-install-firmware-requirements-for-installing-with-virtual-media.adoc[leveloffset=+1]
 

modules/nw-sriov-configuring-device.adoc

@@ -1,13 +1,13 @@
 // Module included in the following assemblies:
 //
 // * networking/hardware_networks/configuring-sriov-device.adoc
-// * virt/node_network/virt-configuring-sriov-device-for-vms.adoc
+// * virt/vm_networking/virt-attaching-vm-to-sriov-network.adoc
 
 ifeval::["{context}" == "configuring-sriov-device"]
 :ocp-sriov:
 endif::[]
 
-ifeval::["{context}" == "virt-configuring-sriov-device-for-vms"]
+ifeval::["{context}" == "virt-attaching-vm-to-sriov-network"]
 :virt-sriov:
 endif::[]
 

modules/nw-sriov-network-attachment.adoc

@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
 // * networking/hardware_networks/configuring-sriov-net-attach.adoc
-// * virt/virtual_machines/vm_networking/virt-defining-an-sriov-network.adoc
+// * virt/virtual_machines/vm_networking/virt-attaching-vm-to-sriov-network.adoc
 
 // Note: IB does not support ipam with `type=dhcp`.
 
@@ -17,7 +17,7 @@ ifeval::["{context}" == "configuring-sriov-ib-attach"]
 :object: pods
 endif::[]
 
-ifeval::["{context}" == "virt-defining-an-sriov-network"]
+ifeval::["{context}" == "virt-attaching-vm-to-sriov-network"]
 :rs: SriovNetwork
 :virt-sriov-net:
 :object: pods or virtual machines
@@ -28,16 +28,12 @@ ifdef::ocp-sriov-net[]
 [id="nw-sriov-network-attachment_{context}"]
 = Configuring SR-IOV additional network
 
-You can configure an additional network that uses SR-IOV hardware by creating a `{rs}` object.
-When you create a `{rs}` object, the SR-IOV Operator automatically creates a `NetworkAttachmentDefinition` object.
-
-ifdef::virt-sriov-net[]
-Users can then attach virtual machines to the SR-IOV network by specifying the network in the virtual machine configurations.
-endif::virt-sriov-net[]
+You can configure an additional network that uses SR-IOV hardware by creating an `{rs}` object.
+When you create an `{rs}` object, the SR-IOV Network Operator automatically creates a `NetworkAttachmentDefinition` object.
 
 [NOTE]
 =====
-Do not modify or delete a `{rs}` object if it is attached to any {object} in the `running` state.
+Do not modify or delete an `{rs}` object if it is attached to any {object} in a `running` state.
 =====
 
 .Prerequisites
@@ -91,16 +87,13 @@ ifdef::virt-sriov-net[]
 [id="nw-sriov-network-attachment_{context}"]
 = Configuring SR-IOV additional network
 
-You can configure an additional network that uses SR-IOV hardware by creating a `SriovNetwork` object.
-When you create a `SriovNetwork` object, the SR-IOV Operator automatically creates a `NetworkAttachmentDefinition` object.
+You can configure an additional network that uses SR-IOV hardware by creating an `{rs}` object.
 
-ifdef::virt-sriov-net[]
-Users can then attach virtual machines to the SR-IOV network by specifying the network in the virtual machine configurations.
+When you create an `{rs}` object, the SR-IOV Network Operator automatically creates a `NetworkAttachmentDefinition` object.
 
-endif::virt-sriov-net[]
 [NOTE]
 =====
-Do not modify or delete a `SriovNetwork` object if it is attached to any {object} in the `running` state.
+Do not modify or delete an `{rs}` object if it is attached to {object} in a `running` state.
 =====
 
 .Prerequisites

modules/virt-attaching-vm-to-sriov-network.adoc

@@ -4,13 +4,13 @@
 
 :_content-type: PROCEDURE
 [id="virt-attaching-vm-to-sriov-network_{context}"]
-= Attaching a virtual machine to an SR-IOV network
+= Connecting a virtual machine to an SR-IOV network
 
-You can attach the virtual machine to the SR-IOV network by including the network details in the virtual machine configuration. 
+You can connect the virtual machine (VM) to the SR-IOV network by including the network details in the VM configuration.
 
 .Procedure
 
-. Include the SR-IOV network details in the `spec.domain.devices.interfaces` and `spec.networks` of the virtual machine configuration:
+. Include the SR-IOV network details in the `spec.domain.devices.interfaces` and `spec.networks` of the VM configuration:
 +
 [source,yaml]
 ----

networking/hardware_networks/about-sriov.adoc

@@ -89,6 +89,6 @@ include::modules/nw-sriov-huge-pages.adoc[leveloffset=+2]
 * xref:../../networking/hardware_networks/installing-sriov-operator.adoc#installing-sriov-operator[Installing the SR-IOV Network Operator]
 * Optional: xref:../../networking/hardware_networks/configuring-sriov-operator.adoc#configuring-sriov-operator[Configuring the SR-IOV Network Operator]
 * xref:../../networking/hardware_networks/configuring-sriov-device.adoc#configuring-sriov-device[Configuring an SR-IOV network device]
-* If you use {VirtProductName}: xref:../../virt/virtual_machines/vm_networking/virt-configuring-sriov-device-for-vms.adoc#virt-configuring-sriov-device-for-vms[Configuring an SR-IOV network device for virtual machines]
+* If you use {VirtProductName}: xref:../../virt/virtual_machines/vm_networking/virt-attaching-vm-to-sriov-network.adoc#virt-attaching-vm-to-sriov-network[Connecting a virtual machine to an SR-IOV network]
 * xref:../../networking/hardware_networks/configuring-sriov-net-attach.adoc#configuring-sriov-net-attach[Configuring an SR-IOV network attachment]
 * xref:../../networking/hardware_networks/add-pod.adoc#add-pod[Adding a pod to an SR-IOV additional network]

virt/virt-getting-started.adoc

@@ -33,23 +33,6 @@ Plan and install {VirtProductName} on an {product-title} cluster:
 * xref:../virt/virtual_machines/advanced_vm_management/virt-specifying-nodes-for-vms.adoc#virt-specifying-nodes-for-vms[Specifying nodes for virtual machines].
 * xref:../virt/virt-using-the-cli-tools.adoc#virt-virtctl-commands_virt-using-the-cli-tools[`Virtctl` commands].
 
-[id='configuring-networks_{context}']
-=== Configuring secondary networks
-
-Configuring a secondary network is optional. VMs are connected to the default pod network.
-
-Configure a Linux bridge network:
-
-* xref:../virt/virtual_machines/vm_networking/virt-attaching-vm-multiple-networks.adoc#virt-creating-linux-bridge-nncp_virt-attaching-vm-multiple-networks[Create a node network configuration policy].
-* xref:../virt/virtual_machines/vm_networking/virt-attaching-vm-multiple-networks.adoc#virt-creating-linux-bridge-nad-web_virt-attaching-vm-multiple-networks[Create a network attachment definition for the Linux bridge network].
-* xref:../virt/virtual_machines/vm_networking/virt-attaching-vm-multiple-networks.adoc#virt-vm-creating-nic-web_virt-attaching-vm-multiple-networks[Attach a VM to the Linux bridge network].
-
-Configure an SR-IOV network:
-
-* xref:../networking/hardware_networks/installing-sriov-operator.adoc#installing-sriov-operator[Install the SR-IOV Operator].
-* xref:../virt/virtual_machines/vm_networking/virt-configuring-sriov-device-for-vms.adoc#virt-configuring-sriov-device-for-vms[Configure an SR-IOV network device].
-* xref:../virt/virtual_machines/vm_networking/virt-attaching-vm-to-sriov-network.adoc#virt-attaching-vm-to-sriov-network[Attach a VM to the SR-IOV network].
-
 [id="creating-and-managing-vms_{context}"]
 == Creating and managing virtual machines
 
@@ -64,14 +47,24 @@ Connect to the VMs:
 * xref:../virt/virtual_machines/virt-accessing-vm-consoles.adoc#virt-accessing-vmi-ssh_virt-accessing-vm-consoles[Connect to a VM by using SSH].
 * xref:../virt/virtual_machines/virt-accessing-vm-consoles.adoc#virt-vm-rdp-console-web_virt-accessing-vm-consoles[Connect to a Windows VM by using RDP].
 
-Manage VM states:
+Manage the VMs:
 
 * xref:../virt/virtual_machines/virt-controlling-vm-states.adoc#virt-controlling-vm-states[Stop, start, pause, and restart a VM by using the web console].
 * xref:../virt/virt-using-the-cli-tools.adoc#virt-virtctl-commands_virt-using-the-cli-tools[Manage a VM, expose a port, or connect to the serial console by using the `virtctl` CLI tool].
 
 [id="next-steps"]
 == Next steps
 
+* Connect the VMs to secondary networks:
+
+** xref:../virt/virtual_machines/vm_networking/virt-attaching-vm-multiple-networks.adoc#virt-attaching-vm-multiple-networks[Connect a VM to a Linux bridge network].
+** xref:../virt/virtual_machines/vm_networking/virt-attaching-vm-to-sriov-network.adoc#virt-attaching-vm-to-sriov-network[Connect a VM to an SR-IOV network].
++
+[NOTE]
+====
+VMs are connected to the pod network by default. You must configure a secondary network, such as Linux bridge or SR-IOV, and then add the network to the VM configuration.
+====
+
 * xref:../virt/logging_events_monitoring/virt-reviewing-virtualization-overview.adoc#virt-reviewing-virtualization-overview[Monitor resources, details, status, and top consumers by using the web console].
 * xref:../virt/logging_events_monitoring/virt-viewing-information-about-vm-workloads.adoc#virt-viewing-information-about-vm-workloads[View high-level information about VM workloads by using the web console].
 * xref:../virt/logging_events_monitoring/virt-logs.adoc#virt-logs[View {VirtProductName} logs by using the CLI].

virt/virtual_machines/virt-create-vms.adoc

@@ -73,5 +73,4 @@ The KubeVirt API Reference is the upstream project reference and might contain p
 * See xref:../../virt/virtual_machines/virtual_disks/virt-using-container-disks-with-vms.adoc#virt-using-container-disks-with-vms[Prepare a container disk] before adding it to a virtual machine as a `containerDisk` volume.
 * See xref:../../machine_management/deploying-machine-health-checks.adoc#machine-health-checks-about_deploying-machine-health-checks[Deploying machine health checks] for further details on deploying and enabling machine health checks.
 * See xref:../../installing/installing_bare_metal_ipi/ipi-install-overview.adoc#ipi-install-overview[Installer-provisioned infrastructure overview] for further details on installer-provisioned infrastructure.
-* See xref:../../virt/virtual_machines/vm_networking/virt-configuring-sriov-device-for-vms.adoc#virt-configuring-sriov-device-for-vms[Configuring the SR-IOV Network Operator] for further details on the SR-IOV Network Operator.
 * xref:../../virt/virtual_machines/virtual_disks/virt-creating-data-volumes.adoc#virt-customizing-storage-profile_virt-creating-data-volumes[Customizing the storage profile]

virt/virtual_machines/vm_networking/virt-attaching-vm-multiple-networks.adoc

@@ -1,6 +1,6 @@
 :_content-type: ASSEMBLY
 [id="virt-attaching-vm-multiple-networks"]
-= Attaching a virtual machine to a Linux bridge network
+= Connecting a virtual machine to a Linux bridge network
 include::_attributes/common-attributes.adoc[]
 :context: virt-attaching-vm-multiple-networks