Merge pull request #102663 from SNiemann15/ocpvirt_ibmz_osa_note

[CNV#72324] Extend OSA notes to Roce and Hipersockets

Author: abrennan89

modules/virt-attaching-vm-secondary-network-cli.adoc

@@ -31,16 +31,19 @@ spec:
         devices:
           interfaces:
             - bridge: {}
-              name: bridge-net <1>
+              name: bridge-net
 # ...
       networks:
-        - name: bridge-net <2>
+        - name: bridge-net
           multus:
-            networkName: bridge-network <3>
+            networkName: bridge-network
 ----
-<1> The name of the bridge interface.
-<2> The name of the network. This value must match the `name` value of the corresponding `spec.template.spec.domain.devices.interfaces` entry.
-<3> The name of the network attachment definition.
++
+where:
+
+`spec.template.spec.domain.devices.interface`:: Specifies the name of the bridge interface.
+`spec.template.spec.networks.name`:: Specifies the name of the network. This value must match the `name` value of the corresponding `spec.template.spec.domain.devices.interfaces` entry.
+`spec.template.spec.networks.multus.networkName`:: Specifies the name of the network attachment definition. 
 
 . Apply the configuration:
 +
@@ -53,5 +56,5 @@ $ oc apply -f example-vm.yaml
 +
 [NOTE]
 ====
-When running {VirtProductName} on {ibm-z-name} using an OSA card, you must register the MAC address of the device. For more information, see link:https://www.ibm.com/docs/en/linux-on-systems?topic=choices-osa-interface-traffic-forwarding[OSA interface traffic forwarding] (IBM documentation).
-====
+When running {VirtProductName} on {ibm-z-name} using OSA, RoCE, or HiperSockets interfaces, you must register the MAC address of the device. For more information, see link:https://www.ibm.com/docs/en/linux-on-systems?topic=choices-osa-interface-traffic-forwarding[OSA interface traffic forwarding] (IBM documentation).
+====

modules/virt-attaching-vm-to-secondary-udn.adoc

@@ -15,37 +15,38 @@ You can connect a virtual machine (VM) to multiple secondary cluster-scoped user
 .Procedure
 . Edit the `VirtualMachine` manifest to add the CUDN interface details, as in the following example:
 +
-.Example `VirtualMachine` manifest
 [source,yaml]
 ----
 apiVersion: kubevirt.io/v1
 kind: VirtualMachine
 metadata:
   name: example-vm
-  namespace: red # <1>
+  namespace: red
 spec:
   template:
     spec:
       domain:
         devices:
           interfaces:
-            - name: secondary_localnet # <2>
+            - name: secondary_localnet
               bridge: {}
         machine:
           type: ""
         resources:
           requests:
             memory: 2048M
       networks:
-      - name: secondary_localnet # <3>
+      - name: secondary_localnet
         multus:
-          networkName: <localnet_cudn_name> # <4>
-# ...
+          networkName: <localnet_cudn_name>
 ----
-<1> The namespace in which the VM is located. This value must match a namespace that is associated with the secondary CUDN.
-<2> The name of the secondary user-defined network interface.
-<3> The name of the network. This must match the value of the `spec.template.spec.domain.devices.interfaces.name` field.
-<4> The name of the localnet `ClusterUserDefinedNetwork` object that you previously created.
++
+where:
+
+`metadata.namespace`:: Specifies the namespace in which the VM is located. This value must match a namespace that is associated with the secondary CUDN.
+`spec.template.spec.domain.devices.interfaces.name`:: Specifies the name of the secondary user-defined network interface.
+`spec.template.spec.networks.name`:: Specifies the name of the network. This value must match the value of the `spec.template.spec.domain.devices.interfaces.name` field.
+`spec.template.spec.networks.multus.networkName`:: Specifies the name of the localnet `ClusterUserDefinedNetwork` object that you previously created.
 
 . Apply the `VirtualMachine` manifest by running the following command:
 +
@@ -57,8 +58,8 @@ $ oc apply -f <filename>.yaml
 where:
 
 <filename>:: Specifies the name of your `VirtualMachine` manifest YAML file.
-
++
 [NOTE]
 ====
-When running {VirtProductName} on {ibm-z-name} using an OSA card, be aware that the OSA card only forwards network traffic to devices that are registered with the OSA device. As a result, any traffic destined for unregistered devices is not forwarded.
+When running {VirtProductName} on {ibm-z-name}, be aware that certain network interfaces, such as OSA, RoCE, and HiperSockets, only forward network traffic to devices that are registered with the respective interface. As a result, any traffic that is destined for unregistered devices is not forwarded. For more information, see link:https://www.ibm.com/docs/en/linux-on-systems?topic=choices-osa-interface-traffic-forwarding[OSA interface traffic forwarding] (IBM documentation).
 ====

virt/vm_networking/virt-connecting-vm-to-linux-bridge.adoc

@@ -1,11 +1,13 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="virt-connecting-vm-to-linux-bridge"]
 = Connecting a virtual machine to a Linux bridge network
+
 include::_attributes/common-attributes.adoc[]
 :context: virt-connecting-vm-to-linux-bridge
 
 toc::[]
 
+[role="_abstract"]
 By default, {VirtProductName} is installed with a single, internal pod network.
 
 You can create a Linux bridge network and attach a virtual machine (VM) to the network by performing the following steps:
@@ -46,7 +48,6 @@ You can configure a virtual machine (VM) network interface by using the {product
 
 include::modules/virt-vm-creating-nic-web.adoc[leveloffset=+2]
 
-[discrete]
 include::modules/virt-networking-wizard-fields-web.adoc[leveloffset=+3]
 
 include::modules/virt-attaching-vm-secondary-network-cli.adoc[leveloffset=+2]

virt/vm_networking/virt-connecting-vm-to-secondary-udn.adoc

@@ -26,6 +26,4 @@ include::modules/virt-attaching-vm-to-secondary-udn.adoc[leveloffset=+1]
 [role="_additional-resources"]
 [id="additional-resources_{context}"]
 == Additional resources
-* xref:../../networking/multiple_networks/primary_networks/about-user-defined-networks.adoc#about-cudn_about-user-defined-networks[About the `ClusterUserDefinedNetwork` CR]
-
-* link:https://www.ibm.com/docs/en/linux-on-systems?topic=choices-osa-interface-traffic-forwarding[OSA interface traffic forwarding]
+* xref:../../networking/multiple_networks/primary_networks/about-user-defined-networks.adoc#about-cudn_about-user-defined-networks[About the `ClusterUserDefinedNetwork` CR]