Merge "vmware does't support VirtualSriovEthernetCard"

Author: Zuul

api-ref/source/v2/samples/metadef-properties-list-response.json

@@ -59,7 +59,7 @@
             "type": "integer"
         },
         "hw_vif_model": {
-            "description": "Specifies the model of virtual network interface device to use. The valid options depend on the configured hypervisor. KVM and QEMU: e1000, ne2k_pci, pcnet, rtl8139, virtio, e1000e and vmxnet3. VMware: e1000, e1000e, VirtualE1000, VirtualE1000e, VirtualPCNet32, VirtualSriovEthernetCard, and VirtualVmxnet. Xen: e1000, netfront, ne2k_pci, pcnet, and rtl8139.",
+            "description": "Specifies the model of virtual network interface device to use. The valid options depend on the configured hypervisor. KVM and QEMU: e1000, ne2k_pci, pcnet, rtl8139, virtio, e1000e and vmxnet3. VMware: e1000, e1000e, VirtualE1000, VirtualE1000e, VirtualPCNet32,  and VirtualVmxnet. Xen: e1000, netfront, ne2k_pci, pcnet, and rtl8139.",
             "enum": [
                 "e1000",
                 "ne2k_pci",
@@ -71,7 +71,6 @@
                 "VirtualE1000",
                 "VirtualE1000e",
                 "VirtualPCNet32",
-                "VirtualSriovEthernetCard",
                 "VirtualVmxnet",
                 "netfront",
                 "ne2k_pci"

doc/source/admin/useful-image-properties.rst

@@ -639,8 +639,7 @@ Here is a list of useful image properties and the values they expect.
   * ``KVM`` and ``QEMU``: ``e1000``, ``e1000e``, ``ne2k_pci``, ``pcnet``,
     ``rtl8139``, ``virtio`` and vmxnet3``.
   * VMware: ``e1000``, ``e1000e``, ``VirtualE1000``, ``VirtualE1000e``,
-    ``VirtualPCNet32``, ``VirtualSriovEthernetCard``, ``VirtualVmxnet``
-    and ``VirtualVmxnet3``.
+    ``VirtualPCNet32``, ``VirtualVmxnet`` and ``VirtualVmxnet3``.
   * Xen: ``e1000``, ``netfront``, ``ne2k_pci``, ``pcnet``, and
     ``rtl8139``.
 

etc/metadefs/compute-vmware.json

@@ -193,15 +193,14 @@
         },
         "hw_vif_model": {
             "title": "Virtual Network Interface",
-            "description": "Specifies the model of virtual network interface device to use. The valid options depend on the hypervisor. VMware driver supported options: e1000, e1000e, VirtualE1000, VirtualE1000e, VirtualPCNet32, VirtualSriovEthernetCard, and VirtualVmxnet.",
+            "description": "Specifies the model of virtual network interface device to use. The valid options depend on the hypervisor. VMware driver supported options: e1000, e1000e, VirtualE1000, VirtualE1000e, VirtualPCNet32, and VirtualVmxnet.",
             "type": "string",
             "enum": [
                 "e1000",
                 "e1000e",
                 "VirtualE1000",
                 "VirtualE1000e",
                 "VirtualPCNet32",
-                "VirtualSriovEthernetCard",
                 "VirtualVmxnet",
                 "VirtualVmxnet3"
             ],