PyPI - pulumi-vsphere - Versions diffs - 4.10.0a1710245029__py3-none-any.whl → 4.13.0a1736849827__py3-none-any.whl - Mend

pulumi-vsphere 4.10.0a1710245029py3-none-any.whl → 4.13.0a1736849827py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (85) hide show

pulumi_vsphere/__init__.py +28 -0
pulumi_vsphere/_inputs.py +1816 -277
pulumi_vsphere/_utilities.py +41 -5
pulumi_vsphere/compute_cluster.py +937 -1488
pulumi_vsphere/compute_cluster_host_group.py +67 -2
pulumi_vsphere/compute_cluster_vm_affinity_rule.py +69 -34
pulumi_vsphere/compute_cluster_vm_anti_affinity_rule.py +41 -2
pulumi_vsphere/compute_cluster_vm_dependency_rule.py +205 -2
pulumi_vsphere/compute_cluster_vm_group.py +198 -2
pulumi_vsphere/compute_cluster_vm_host_rule.py +73 -2
pulumi_vsphere/config/__init__.pyi +5 -0
pulumi_vsphere/config/vars.py +5 -0
pulumi_vsphere/content_library.py +113 -12
pulumi_vsphere/content_library_item.py +143 -2
pulumi_vsphere/custom_attribute.py +77 -2
pulumi_vsphere/datacenter.py +48 -40
pulumi_vsphere/datastore_cluster.py +217 -366
pulumi_vsphere/datastore_cluster_vm_anti_affinity_rule.py +159 -2
pulumi_vsphere/distributed_port_group.py +416 -189
pulumi_vsphere/distributed_virtual_switch.py +571 -830
pulumi_vsphere/dpm_host_override.py +63 -2
pulumi_vsphere/drs_vm_override.py +67 -2
pulumi_vsphere/entity_permissions.py +64 -38
pulumi_vsphere/file.py +21 -24
pulumi_vsphere/folder.py +148 -30
pulumi_vsphere/get_compute_cluster.py +16 -9
pulumi_vsphere/get_compute_cluster_host_group.py +36 -25
pulumi_vsphere/get_content_library.py +23 -15
pulumi_vsphere/get_content_library_item.py +29 -13
pulumi_vsphere/get_custom_attribute.py +14 -9
pulumi_vsphere/get_datacenter.py +30 -12
pulumi_vsphere/get_datastore.py +29 -21
pulumi_vsphere/get_datastore_cluster.py +31 -10
pulumi_vsphere/get_datastore_stats.py +63 -57
pulumi_vsphere/get_distributed_virtual_switch.py +18 -9
pulumi_vsphere/get_dynamic.py +35 -25
pulumi_vsphere/get_folder.py +23 -11
pulumi_vsphere/get_guest_os_customization.py +26 -52
pulumi_vsphere/get_host.py +16 -9
pulumi_vsphere/get_host_base_images.py +104 -0
pulumi_vsphere/get_host_pci_device.py +28 -19
pulumi_vsphere/get_host_thumbprint.py +41 -25
pulumi_vsphere/get_host_vgpu_profile.py +20 -15
pulumi_vsphere/get_license.py +20 -10
pulumi_vsphere/get_network.py +80 -24
pulumi_vsphere/get_ovf_vm_template.py +56 -5
pulumi_vsphere/get_policy.py +13 -9
pulumi_vsphere/get_resource_pool.py +29 -23
pulumi_vsphere/get_role.py +23 -13
pulumi_vsphere/get_tag.py +16 -9
pulumi_vsphere/get_tag_category.py +16 -9
pulumi_vsphere/get_vapp_container.py +15 -9
pulumi_vsphere/get_virtual_machine.py +205 -48
pulumi_vsphere/get_vmfs_disks.py +18 -9
pulumi_vsphere/guest_os_customization.py +60 -5
pulumi_vsphere/ha_vm_override.py +352 -380
pulumi_vsphere/host.py +244 -64
pulumi_vsphere/host_port_group.py +27 -24
pulumi_vsphere/host_virtual_switch.py +209 -289
pulumi_vsphere/license.py +5 -32
pulumi_vsphere/nas_datastore.py +74 -9
pulumi_vsphere/offline_software_depot.py +185 -0
pulumi_vsphere/outputs.py +717 -270
pulumi_vsphere/provider.py +7 -6
pulumi_vsphere/pulumi-plugin.json +2 -1
pulumi_vsphere/resource_pool.py +168 -411
pulumi_vsphere/role.py +33 -2
pulumi_vsphere/storage_drs_vm_override.py +133 -2
pulumi_vsphere/supervisor.py +967 -0
pulumi_vsphere/tag.py +159 -2
pulumi_vsphere/tag_category.py +83 -2
pulumi_vsphere/vapp_container.py +163 -2
pulumi_vsphere/vapp_entity.py +147 -2
pulumi_vsphere/virtual_disk.py +123 -36
pulumi_vsphere/virtual_machine.py +698 -829
pulumi_vsphere/virtual_machine_class.py +447 -0
pulumi_vsphere/virtual_machine_snapshot.py +13 -12
pulumi_vsphere/vm_storage_policy.py +120 -127
pulumi_vsphere/vmfs_datastore.py +271 -2
pulumi_vsphere/vnic.py +104 -105
{pulumi_vsphere-4.10.0a1710245029.dist-info → pulumi_vsphere-4.13.0a1736849827.dist-info}/METADATA +7 -6
pulumi_vsphere-4.13.0a1736849827.dist-info/RECORD +86 -0
{pulumi_vsphere-4.10.0a1710245029.dist-info → pulumi_vsphere-4.13.0a1736849827.dist-info}/WHEEL +1 -1
pulumi_vsphere-4.10.0a1710245029.dist-info/RECORD +0 -82
{pulumi_vsphere-4.10.0a1710245029.dist-info → pulumi_vsphere-4.13.0a1736849827.dist-info}/top_level.txt +0 -0

pulumi_vsphere/distributed_port_group.py CHANGED Viewed

@@ -4,9 +4,14 @@
 import copy
 import warnings
+import sys
 import pulumi
 import pulumi.runtime
 from typing import Any, Mapping, Optional, Sequence, Union, overload
+if sys.version_info >= (3, 11):
+    from typing import NotRequired, TypedDict, TypeAlias
+else:
+    from typing_extensions import NotRequired, TypedDict, TypeAlias
 from . import _utilities
 from . import outputs
 from ._inputs import *
@@ -78,11 +83,17 @@ class DistributedPortGroupArgs:
                may lead to errors when the port count grows past the amount specified.  If you
                specify `number_of_ports`, you may wish to set `auto_expand` to `false`.
         :param pulumi.Input[bool] block_all_ports: Indicates whether to block all ports by default.
-        :param pulumi.Input[bool] block_override_allowed: Allow the port shutdown
-               policy to be overridden on an individual port.
+        :param pulumi.Input[bool] block_override_allowed: Allow the blocked setting of an individual port to override the setting in the portgroup.
         :param pulumi.Input[bool] check_beacon: Enable beacon probing on the ports this policy applies to.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to attribute
+               <<<<<<< HEAD
+               value string to set for port group. See [here][docs-setting-custom-attributes]
+               for a reference on how to set values for custom attributes.
+               [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
+               =======
                value string to set for port group.
+               >>>>>>> 69c6e040 (fork)
                > **NOTE:** Custom attributes are not supported on direct ESXi host
                connections and require vCenter Server.
@@ -99,52 +110,38 @@ class DistributedPortGroupArgs:
         :param pulumi.Input[int] ingress_shaping_peak_bandwidth: The peak ingress bandwidth during bursts in bits per second if ingress traffic shaping is enabled on the port.
         :param pulumi.Input[bool] lacp_enabled: Whether or not to enable LACP on all uplink ports.
         :param pulumi.Input[str] lacp_mode: The uplink LACP mode to use. Can be one of active or passive.
-        :param pulumi.Input[bool] live_port_moving_allowed: Allow a port in this port group to be
-               moved to another port group while it is connected.
+        :param pulumi.Input[bool] live_port_moving_allowed: Allow a live port to be moved in and out of the portgroup.
         :param pulumi.Input[str] name: The name of the port group.
         :param pulumi.Input[bool] netflow_enabled: Indicates whether to enable netflow on all ports.
-        :param pulumi.Input[bool] netflow_override_allowed: Allow the
-               [Netflow policy][netflow-policy] on this port group to be overridden on an
-               individual port.
+        :param pulumi.Input[bool] netflow_override_allowed: Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
         :param pulumi.Input[str] network_resource_pool_key: The key of a network resource pool
                to associate with this port group. The default is `-1`, which implies no
                association.
-        :param pulumi.Input[bool] network_resource_pool_override_allowed: Allow the network
-               resource pool set on this port group to be overridden on an individual port.
+        :param pulumi.Input[bool] network_resource_pool_override_allowed: Allow the network resource pool of an individual port to override the setting in the portgroup.
         :param pulumi.Input[bool] notify_switches: If true, the teaming policy will notify the broadcast network of a NIC failover, triggering cache updates.
         :param pulumi.Input[int] number_of_ports: The number of ports available on this port
                group. Cannot be decreased below the amount of used ports on the port group.
-        :param pulumi.Input[bool] port_config_reset_at_disconnect: Reset a port's settings to the
-               settings defined on this port group policy when the port disconnects.
+        :param pulumi.Input[bool] port_config_reset_at_disconnect: Reset the setting of any ports in this portgroup back to the default setting when the port disconnects.
         :param pulumi.Input[str] port_name_format: An optional formatting policy for naming of
                the ports in this port group. See the `portNameFormat` attribute listed
                [here][ext-vsphere-portname-format] for details on the format syntax.
-               [ext-vsphere-portname-format]: https://vdc-download.vmware.com/vmwb-repository/dcr-public/b50dcbbf-051d-4204-a3e7-e1b618c1e384/538cf2ec-b34f-4bae-a332-3820ef9e7773/vim.dvs.DistributedVirtualPortgroup.ConfigInfo.html#portNameFormat
+               [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
         :param pulumi.Input[int] port_private_secondary_vlan_id: The secondary VLAN ID for this port.
-        :param pulumi.Input[bool] security_policy_override_allowed: Allow the
-               [security policy settings][sec-policy-settings] defined in this port group
-               policy to be overridden on an individual port.
-        :param pulumi.Input[bool] shaping_override_allowed: Allow the
-               [traffic shaping options][traffic-shaping-settings] on this port group policy
-               to be overridden on an individual port.
+        :param pulumi.Input[bool] security_policy_override_allowed: Allow security policy settings on a port to override those on the portgroup.
+        :param pulumi.Input[bool] shaping_override_allowed: Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] standby_uplinks: List of standby uplinks used for load balancing, matching the names of the uplinks assigned in the DVS.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: A list of tag IDs to apply to this object.
         :param pulumi.Input[str] teaming_policy: The network adapter teaming policy. Can be one of loadbalance_ip, loadbalance_srcmac, loadbalance_srcid,
                failover_explicit, or loadbalance_loadbased.
-        :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any traffic filters on
-               this port group to be overridden on an individual port.
+        :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any filter policies set on the individual port to override those in the portgroup.
         :param pulumi.Input[bool] tx_uplink: If true, a copy of packets sent to the switch will always be forwarded to an uplink in addition to the regular packet
                forwarded done by the switch.
         :param pulumi.Input[str] type: The port group type. Can be one of `earlyBinding` (static
                binding) or `ephemeral`. Default: `earlyBinding`.
-        :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the
-               [uplink teaming options][uplink-teaming-settings] on this port group to be
-               overridden on an individual port.
+        :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the uplink teaming policies on a port to override those on the portgroup.
         :param pulumi.Input[int] vlan_id: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
-        :param pulumi.Input[bool] vlan_override_allowed: Allow the
-               [VLAN settings][vlan-settings] on this port group to be overridden on an
-               individual port.
+        :param pulumi.Input[bool] vlan_override_allowed: Allow the VLAN configuration on a port to override those on the portgroup.
         :param pulumi.Input[Sequence[pulumi.Input['DistributedPortGroupVlanRangeArgs']]] vlan_ranges: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
         """
         pulumi.set(__self__, "distributed_virtual_switch_uuid", distributed_virtual_switch_uuid)
@@ -334,8 +331,7 @@ class DistributedPortGroupArgs:
     @pulumi.getter(name="blockOverrideAllowed")
     def block_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the port shutdown
-        policy to be overridden on an individual port.
+        Allow the blocked setting of an individual port to override the setting in the portgroup.
         """
         return pulumi.get(self, "block_override_allowed")
@@ -360,7 +356,14 @@ class DistributedPortGroupArgs:
     def custom_attributes(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]:
         """
         Map of custom attribute ids to attribute
+        <<<<<<< HEAD
+        value string to set for port group. See [here][docs-setting-custom-attributes]
+        for a reference on how to set values for custom attributes.
+        [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
+        =======
         value string to set for port group.
+        >>>>>>> 69c6e040 (fork)
         > **NOTE:** Custom attributes are not supported on direct ESXi host
         connections and require vCenter Server.
@@ -531,8 +534,7 @@ class DistributedPortGroupArgs:
     @pulumi.getter(name="livePortMovingAllowed")
     def live_port_moving_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow a port in this port group to be
-        moved to another port group while it is connected.
+        Allow a live port to be moved in and out of the portgroup.
         """
         return pulumi.get(self, "live_port_moving_allowed")
@@ -568,9 +570,7 @@ class DistributedPortGroupArgs:
     @pulumi.getter(name="netflowOverrideAllowed")
     def netflow_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the
-        [Netflow policy][netflow-policy] on this port group to be overridden on an
-        individual port.
+        Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
         """
         return pulumi.get(self, "netflow_override_allowed")
@@ -596,8 +596,7 @@ class DistributedPortGroupArgs:
     @pulumi.getter(name="networkResourcePoolOverrideAllowed")
     def network_resource_pool_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the network
-        resource pool set on this port group to be overridden on an individual port.
+        Allow the network resource pool of an individual port to override the setting in the portgroup.
         """
         return pulumi.get(self, "network_resource_pool_override_allowed")
@@ -634,8 +633,7 @@ class DistributedPortGroupArgs:
     @pulumi.getter(name="portConfigResetAtDisconnect")
     def port_config_reset_at_disconnect(self) -> Optional[pulumi.Input[bool]]:
         """
-        Reset a port's settings to the
-        settings defined on this port group policy when the port disconnects.
+        Reset the setting of any ports in this portgroup back to the default setting when the port disconnects.
         """
         return pulumi.get(self, "port_config_reset_at_disconnect")
@@ -651,7 +649,7 @@ class DistributedPortGroupArgs:
         the ports in this port group. See the `portNameFormat` attribute listed
         [here][ext-vsphere-portname-format] for details on the format syntax.
-        [ext-vsphere-portname-format]: https://vdc-download.vmware.com/vmwb-repository/dcr-public/b50dcbbf-051d-4204-a3e7-e1b618c1e384/538cf2ec-b34f-4bae-a332-3820ef9e7773/vim.dvs.DistributedVirtualPortgroup.ConfigInfo.html#portNameFormat
+        [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
         """
         return pulumi.get(self, "port_name_format")
@@ -675,9 +673,7 @@ class DistributedPortGroupArgs:
     @pulumi.getter(name="securityPolicyOverrideAllowed")
     def security_policy_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the
-        [security policy settings][sec-policy-settings] defined in this port group
-        policy to be overridden on an individual port.
+        Allow security policy settings on a port to override those on the portgroup.
         """
         return pulumi.get(self, "security_policy_override_allowed")
@@ -689,9 +685,7 @@ class DistributedPortGroupArgs:
     @pulumi.getter(name="shapingOverrideAllowed")
     def shaping_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the
-        [traffic shaping options][traffic-shaping-settings] on this port group policy
-        to be overridden on an individual port.
+        Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
         """
         return pulumi.get(self, "shaping_override_allowed")
@@ -740,8 +734,7 @@ class DistributedPortGroupArgs:
     @pulumi.getter(name="trafficFilterOverrideAllowed")
     def traffic_filter_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow any traffic filters on
-        this port group to be overridden on an individual port.
+        Allow any filter policies set on the individual port to override those in the portgroup.
         """
         return pulumi.get(self, "traffic_filter_override_allowed")
@@ -779,9 +772,7 @@ class DistributedPortGroupArgs:
     @pulumi.getter(name="uplinkTeamingOverrideAllowed")
     def uplink_teaming_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the
-        [uplink teaming options][uplink-teaming-settings] on this port group to be
-        overridden on an individual port.
+        Allow the uplink teaming policies on a port to override those on the portgroup.
         """
         return pulumi.get(self, "uplink_teaming_override_allowed")
@@ -805,9 +796,7 @@ class DistributedPortGroupArgs:
     @pulumi.getter(name="vlanOverrideAllowed")
     def vlan_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the
-        [VLAN settings][vlan-settings] on this port group to be overridden on an
-        individual port.
+        Allow the VLAN configuration on a port to override those on the portgroup.
         """
         return pulumi.get(self, "vlan_override_allowed")
@@ -893,13 +882,19 @@ class _DistributedPortGroupState:
                may lead to errors when the port count grows past the amount specified.  If you
                specify `number_of_ports`, you may wish to set `auto_expand` to `false`.
         :param pulumi.Input[bool] block_all_ports: Indicates whether to block all ports by default.
-        :param pulumi.Input[bool] block_override_allowed: Allow the port shutdown
-               policy to be overridden on an individual port.
+        :param pulumi.Input[bool] block_override_allowed: Allow the blocked setting of an individual port to override the setting in the portgroup.
         :param pulumi.Input[bool] check_beacon: Enable beacon probing on the ports this policy applies to.
         :param pulumi.Input[str] config_version: The current version of the port group configuration,
                incremented by subsequent updates to the port group.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to attribute
+               <<<<<<< HEAD
+               value string to set for port group. See [here][docs-setting-custom-attributes]
+               for a reference on how to set values for custom attributes.
+               [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
+               =======
                value string to set for port group.
+               >>>>>>> 69c6e040 (fork)
                > **NOTE:** Custom attributes are not supported on direct ESXi host
                connections and require vCenter Server.
@@ -919,52 +914,38 @@ class _DistributedPortGroupState:
         :param pulumi.Input[str] key: The generated UUID of the port group.
         :param pulumi.Input[bool] lacp_enabled: Whether or not to enable LACP on all uplink ports.
         :param pulumi.Input[str] lacp_mode: The uplink LACP mode to use. Can be one of active or passive.
-        :param pulumi.Input[bool] live_port_moving_allowed: Allow a port in this port group to be
-               moved to another port group while it is connected.
+        :param pulumi.Input[bool] live_port_moving_allowed: Allow a live port to be moved in and out of the portgroup.
         :param pulumi.Input[str] name: The name of the port group.
         :param pulumi.Input[bool] netflow_enabled: Indicates whether to enable netflow on all ports.
-        :param pulumi.Input[bool] netflow_override_allowed: Allow the
-               [Netflow policy][netflow-policy] on this port group to be overridden on an
-               individual port.
+        :param pulumi.Input[bool] netflow_override_allowed: Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
         :param pulumi.Input[str] network_resource_pool_key: The key of a network resource pool
                to associate with this port group. The default is `-1`, which implies no
                association.
-        :param pulumi.Input[bool] network_resource_pool_override_allowed: Allow the network
-               resource pool set on this port group to be overridden on an individual port.
+        :param pulumi.Input[bool] network_resource_pool_override_allowed: Allow the network resource pool of an individual port to override the setting in the portgroup.
         :param pulumi.Input[bool] notify_switches: If true, the teaming policy will notify the broadcast network of a NIC failover, triggering cache updates.
         :param pulumi.Input[int] number_of_ports: The number of ports available on this port
                group. Cannot be decreased below the amount of used ports on the port group.
-        :param pulumi.Input[bool] port_config_reset_at_disconnect: Reset a port's settings to the
-               settings defined on this port group policy when the port disconnects.
+        :param pulumi.Input[bool] port_config_reset_at_disconnect: Reset the setting of any ports in this portgroup back to the default setting when the port disconnects.
         :param pulumi.Input[str] port_name_format: An optional formatting policy for naming of
                the ports in this port group. See the `portNameFormat` attribute listed
                [here][ext-vsphere-portname-format] for details on the format syntax.
-               [ext-vsphere-portname-format]: https://vdc-download.vmware.com/vmwb-repository/dcr-public/b50dcbbf-051d-4204-a3e7-e1b618c1e384/538cf2ec-b34f-4bae-a332-3820ef9e7773/vim.dvs.DistributedVirtualPortgroup.ConfigInfo.html#portNameFormat
+               [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
         :param pulumi.Input[int] port_private_secondary_vlan_id: The secondary VLAN ID for this port.
-        :param pulumi.Input[bool] security_policy_override_allowed: Allow the
-               [security policy settings][sec-policy-settings] defined in this port group
-               policy to be overridden on an individual port.
-        :param pulumi.Input[bool] shaping_override_allowed: Allow the
-               [traffic shaping options][traffic-shaping-settings] on this port group policy
-               to be overridden on an individual port.
+        :param pulumi.Input[bool] security_policy_override_allowed: Allow security policy settings on a port to override those on the portgroup.
+        :param pulumi.Input[bool] shaping_override_allowed: Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] standby_uplinks: List of standby uplinks used for load balancing, matching the names of the uplinks assigned in the DVS.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: A list of tag IDs to apply to this object.
         :param pulumi.Input[str] teaming_policy: The network adapter teaming policy. Can be one of loadbalance_ip, loadbalance_srcmac, loadbalance_srcid,
                failover_explicit, or loadbalance_loadbased.
-        :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any traffic filters on
-               this port group to be overridden on an individual port.
+        :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any filter policies set on the individual port to override those in the portgroup.
         :param pulumi.Input[bool] tx_uplink: If true, a copy of packets sent to the switch will always be forwarded to an uplink in addition to the regular packet
                forwarded done by the switch.
         :param pulumi.Input[str] type: The port group type. Can be one of `earlyBinding` (static
                binding) or `ephemeral`. Default: `earlyBinding`.
-        :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the
-               [uplink teaming options][uplink-teaming-settings] on this port group to be
-               overridden on an individual port.
+        :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the uplink teaming policies on a port to override those on the portgroup.
         :param pulumi.Input[int] vlan_id: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
-        :param pulumi.Input[bool] vlan_override_allowed: Allow the
-               [VLAN settings][vlan-settings] on this port group to be overridden on an
-               individual port.
+        :param pulumi.Input[bool] vlan_override_allowed: Allow the VLAN configuration on a port to override those on the portgroup.
         :param pulumi.Input[Sequence[pulumi.Input['DistributedPortGroupVlanRangeArgs']]] vlan_ranges: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
         """
         if active_uplinks is not None:
@@ -1146,8 +1127,7 @@ class _DistributedPortGroupState:
     @pulumi.getter(name="blockOverrideAllowed")
     def block_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the port shutdown
-        policy to be overridden on an individual port.
+        Allow the blocked setting of an individual port to override the setting in the portgroup.
         """
         return pulumi.get(self, "block_override_allowed")
@@ -1185,7 +1165,14 @@ class _DistributedPortGroupState:
     def custom_attributes(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]:
         """
         Map of custom attribute ids to attribute
+        <<<<<<< HEAD
+        value string to set for port group. See [here][docs-setting-custom-attributes]
+        for a reference on how to set values for custom attributes.
+        [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
+        =======
         value string to set for port group.
+        >>>>>>> 69c6e040 (fork)
         > **NOTE:** Custom attributes are not supported on direct ESXi host
         connections and require vCenter Server.
@@ -1381,8 +1368,7 @@ class _DistributedPortGroupState:
     @pulumi.getter(name="livePortMovingAllowed")
     def live_port_moving_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow a port in this port group to be
-        moved to another port group while it is connected.
+        Allow a live port to be moved in and out of the portgroup.
         """
         return pulumi.get(self, "live_port_moving_allowed")
@@ -1418,9 +1404,7 @@ class _DistributedPortGroupState:
     @pulumi.getter(name="netflowOverrideAllowed")
     def netflow_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the
-        [Netflow policy][netflow-policy] on this port group to be overridden on an
-        individual port.
+        Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
         """
         return pulumi.get(self, "netflow_override_allowed")
@@ -1446,8 +1430,7 @@ class _DistributedPortGroupState:
     @pulumi.getter(name="networkResourcePoolOverrideAllowed")
     def network_resource_pool_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the network
-        resource pool set on this port group to be overridden on an individual port.
+        Allow the network resource pool of an individual port to override the setting in the portgroup.
         """
         return pulumi.get(self, "network_resource_pool_override_allowed")
@@ -1484,8 +1467,7 @@ class _DistributedPortGroupState:
     @pulumi.getter(name="portConfigResetAtDisconnect")
     def port_config_reset_at_disconnect(self) -> Optional[pulumi.Input[bool]]:
         """
-        Reset a port's settings to the
-        settings defined on this port group policy when the port disconnects.
+        Reset the setting of any ports in this portgroup back to the default setting when the port disconnects.
         """
         return pulumi.get(self, "port_config_reset_at_disconnect")
@@ -1501,7 +1483,7 @@ class _DistributedPortGroupState:
         the ports in this port group. See the `portNameFormat` attribute listed
         [here][ext-vsphere-portname-format] for details on the format syntax.
-        [ext-vsphere-portname-format]: https://vdc-download.vmware.com/vmwb-repository/dcr-public/b50dcbbf-051d-4204-a3e7-e1b618c1e384/538cf2ec-b34f-4bae-a332-3820ef9e7773/vim.dvs.DistributedVirtualPortgroup.ConfigInfo.html#portNameFormat
+        [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
         """
         return pulumi.get(self, "port_name_format")
@@ -1525,9 +1507,7 @@ class _DistributedPortGroupState:
     @pulumi.getter(name="securityPolicyOverrideAllowed")
     def security_policy_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the
-        [security policy settings][sec-policy-settings] defined in this port group
-        policy to be overridden on an individual port.
+        Allow security policy settings on a port to override those on the portgroup.
         """
         return pulumi.get(self, "security_policy_override_allowed")
@@ -1539,9 +1519,7 @@ class _DistributedPortGroupState:
     @pulumi.getter(name="shapingOverrideAllowed")
     def shaping_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the
-        [traffic shaping options][traffic-shaping-settings] on this port group policy
-        to be overridden on an individual port.
+        Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
         """
         return pulumi.get(self, "shaping_override_allowed")
@@ -1590,8 +1568,7 @@ class _DistributedPortGroupState:
     @pulumi.getter(name="trafficFilterOverrideAllowed")
     def traffic_filter_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow any traffic filters on
-        this port group to be overridden on an individual port.
+        Allow any filter policies set on the individual port to override those in the portgroup.
         """
         return pulumi.get(self, "traffic_filter_override_allowed")
@@ -1629,9 +1606,7 @@ class _DistributedPortGroupState:
     @pulumi.getter(name="uplinkTeamingOverrideAllowed")
     def uplink_teaming_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the
-        [uplink teaming options][uplink-teaming-settings] on this port group to be
-        overridden on an individual port.
+        Allow the uplink teaming policies on a port to override those on the portgroup.
         """
         return pulumi.get(self, "uplink_teaming_override_allowed")
@@ -1655,9 +1630,7 @@ class _DistributedPortGroupState:
     @pulumi.getter(name="vlanOverrideAllowed")
     def vlan_override_allowed(self) -> Optional[pulumi.Input[bool]]:
         """
-        Allow the
-        [VLAN settings][vlan-settings] on this port group to be overridden on an
-        individual port.
+        Allow the VLAN configuration on a port to override those on the portgroup.
         """
         return pulumi.get(self, "vlan_override_allowed")
@@ -1728,10 +1701,149 @@ class DistributedPortGroup(pulumi.CustomResource):
                  uplink_teaming_override_allowed: Optional[pulumi.Input[bool]] = None,
                  vlan_id: Optional[pulumi.Input[int]] = None,
                  vlan_override_allowed: Optional[pulumi.Input[bool]] = None,
-                 vlan_ranges: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DistributedPortGroupVlanRangeArgs']]]]] = None,
+                 vlan_ranges: Optional[pulumi.Input[Sequence[pulumi.Input[Union['DistributedPortGroupVlanRangeArgs', 'DistributedPortGroupVlanRangeArgsDict']]]]] = None,
                  __props__=None):
         """
-        Create a DistributedPortGroup resource with the given unique name, props, and options.
+        The `DistributedPortGroup` resource can be used to manage
+        distributed port groups connected to vSphere Distributed Switches (VDS).
+        A vSphere Distributed Switch can be managed by the
+        `DistributedVirtualSwitch` resource.
+        Distributed port groups can be used as networks for virtual machines, allowing
+        the virtual machines to use the networking supplied by a vSphere Distributed
+        Switch, with a set of policies that apply to that individual network, if
+        desired.
+        * For an overview on vSphere networking concepts, refer to the vSphere
+        [product documentation][ref-vsphere-net-concepts].
+        * For more information on distributed port groups, refer to the vSphere
+        [product documentation][ref-vsphere-dvportgroup].
+        [ref-vsphere-net-concepts]: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.networking.doc/GUID-2B11DBB8-CB3C-4AFF-8885-EFEA0FC562F4.html
+        [ref-vsphere-dvportgroup]: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.networking.doc/GUID-69933F6E-2442-46CF-AA17-1196CB9A0A09.html
+        > **NOTE:** This resource requires vCenter and is not available on
+        direct ESXi host connections.
+        ## Example Usage
+        The configuration below builds on the example given in the
+        `DistributedVirtualSwitch` resource by
+        adding the `DistributedPortGroup` resource, attaching itself to the
+        vSphere Distributed Switch and assigning VLAN ID 1000.
+        ```python
+        import pulumi
+        import pulumi_vsphere as vsphere
+        config = pulumi.Config()
+        hosts = config.get_object("hosts")
+        if hosts is None:
+            hosts = [
+                "esxi-01.example.com",
+                "esxi-02.example.com",
+                "esxi-03.example.com",
+            ]
+        network_interfaces = config.get_object("networkInterfaces")
+        if network_interfaces is None:
+            network_interfaces = [
+                "vmnic0",
+                "vmnic1",
+                "vmnic2",
+                "vmnic3",
+            ]
+        datacenter = vsphere.get_datacenter(name="dc-01")
+        host = [vsphere.get_host(name=hosts[__index],
+            datacenter_id=datacenter.id) for __index in range(len(hosts))]
+        vds = vsphere.DistributedVirtualSwitch("vds",
+            name="vds-01",
+            datacenter_id=datacenter.id,
+            uplinks=[
+                "uplink1",
+                "uplink2",
+                "uplink3",
+                "uplink4",
+            ],
+            active_uplinks=[
+                "uplink1",
+                "uplink2",
+            ],
+            standby_uplinks=[
+                "uplink3",
+                "uplink4",
+            ],
+            hosts=[
+                {
+                    "host_system_id": host[0].id,
+                    "devices": [network_interfaces],
+                },
+                {
+                    "host_system_id": host[1].id,
+                    "devices": [network_interfaces],
+                },
+                {
+                    "host_system_id": host[2].id,
+                    "devices": [network_interfaces],
+                },
+            ])
+        pg = vsphere.DistributedPortGroup("pg",
+            name="pg-01",
+            distributed_virtual_switch_uuid=vds.id,
+            vlan_id=1000)
+        ```
+        ### Overriding VDS policies
+        All of the default port policies available in the
+        `DistributedVirtualSwitch` resource can be overridden on the port
+        group level by specifying new settings for them.
+        As an example, we also take this example from the
+        `DistributedVirtualSwitch` resource where we manually specify our
+        uplink count and uplink order. While the vSphere Distributed Switch has a
+        default policy of using the first uplink as an active uplink and the second
+        one as a standby, the overridden port group policy means that both uplinks
+        will be used as active uplinks in this specific port group.
+        ```python
+        import pulumi
+        import pulumi_vsphere as vsphere
+        vds = vsphere.DistributedVirtualSwitch("vds",
+            name="vds-01",
+            datacenter_id=datacenter["id"],
+            uplinks=[
+                "uplink1",
+                "uplink2",
+            ],
+            active_uplinks=["uplink1"],
+            standby_uplinks=["uplink2"])
+        pg = vsphere.DistributedPortGroup("pg",
+            name="pg-01",
+            distributed_virtual_switch_uuid=vds.id,
+            vlan_id=1000,
+            active_uplinks=[
+                "uplink1",
+                "uplink2",
+            ],
+            standby_uplinks=[])
+        ```
+        ## Import
+        An existing port group can be imported into this resource using
+        the managed object id of the port group, via the following command:
+        ```sh
+        $ pulumi import vsphere:index/distributedPortGroup:DistributedPortGroup pg /dc-01/network/pg-01
+        ```
+        The above would import the port group named `pg-01` that is located in the `dc-01`
+        datacenter.
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] active_uplinks: List of active uplinks used for load balancing, matching the names of the uplinks assigned in the DVS.
@@ -1746,11 +1858,17 @@ class DistributedPortGroup(pulumi.CustomResource):
                may lead to errors when the port count grows past the amount specified.  If you
                specify `number_of_ports`, you may wish to set `auto_expand` to `false`.
         :param pulumi.Input[bool] block_all_ports: Indicates whether to block all ports by default.
-        :param pulumi.Input[bool] block_override_allowed: Allow the port shutdown
-               policy to be overridden on an individual port.
+        :param pulumi.Input[bool] block_override_allowed: Allow the blocked setting of an individual port to override the setting in the portgroup.
         :param pulumi.Input[bool] check_beacon: Enable beacon probing on the ports this policy applies to.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to attribute
+               <<<<<<< HEAD
+               value string to set for port group. See [here][docs-setting-custom-attributes]
+               for a reference on how to set values for custom attributes.
+               [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
+               =======
                value string to set for port group.
+               >>>>>>> 69c6e040 (fork)
                > **NOTE:** Custom attributes are not supported on direct ESXi host
                connections and require vCenter Server.
@@ -1769,53 +1887,39 @@ class DistributedPortGroup(pulumi.CustomResource):
         :param pulumi.Input[int] ingress_shaping_peak_bandwidth: The peak ingress bandwidth during bursts in bits per second if ingress traffic shaping is enabled on the port.
         :param pulumi.Input[bool] lacp_enabled: Whether or not to enable LACP on all uplink ports.
         :param pulumi.Input[str] lacp_mode: The uplink LACP mode to use. Can be one of active or passive.
-        :param pulumi.Input[bool] live_port_moving_allowed: Allow a port in this port group to be
-               moved to another port group while it is connected.
+        :param pulumi.Input[bool] live_port_moving_allowed: Allow a live port to be moved in and out of the portgroup.
         :param pulumi.Input[str] name: The name of the port group.
         :param pulumi.Input[bool] netflow_enabled: Indicates whether to enable netflow on all ports.
-        :param pulumi.Input[bool] netflow_override_allowed: Allow the
-               [Netflow policy][netflow-policy] on this port group to be overridden on an
-               individual port.
+        :param pulumi.Input[bool] netflow_override_allowed: Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
         :param pulumi.Input[str] network_resource_pool_key: The key of a network resource pool
                to associate with this port group. The default is `-1`, which implies no
                association.
-        :param pulumi.Input[bool] network_resource_pool_override_allowed: Allow the network
-               resource pool set on this port group to be overridden on an individual port.
+        :param pulumi.Input[bool] network_resource_pool_override_allowed: Allow the network resource pool of an individual port to override the setting in the portgroup.
         :param pulumi.Input[bool] notify_switches: If true, the teaming policy will notify the broadcast network of a NIC failover, triggering cache updates.
         :param pulumi.Input[int] number_of_ports: The number of ports available on this port
                group. Cannot be decreased below the amount of used ports on the port group.
-        :param pulumi.Input[bool] port_config_reset_at_disconnect: Reset a port's settings to the
-               settings defined on this port group policy when the port disconnects.
+        :param pulumi.Input[bool] port_config_reset_at_disconnect: Reset the setting of any ports in this portgroup back to the default setting when the port disconnects.
         :param pulumi.Input[str] port_name_format: An optional formatting policy for naming of
                the ports in this port group. See the `portNameFormat` attribute listed
                [here][ext-vsphere-portname-format] for details on the format syntax.
-               [ext-vsphere-portname-format]: https://vdc-download.vmware.com/vmwb-repository/dcr-public/b50dcbbf-051d-4204-a3e7-e1b618c1e384/538cf2ec-b34f-4bae-a332-3820ef9e7773/vim.dvs.DistributedVirtualPortgroup.ConfigInfo.html#portNameFormat
+               [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
         :param pulumi.Input[int] port_private_secondary_vlan_id: The secondary VLAN ID for this port.
-        :param pulumi.Input[bool] security_policy_override_allowed: Allow the
-               [security policy settings][sec-policy-settings] defined in this port group
-               policy to be overridden on an individual port.
-        :param pulumi.Input[bool] shaping_override_allowed: Allow the
-               [traffic shaping options][traffic-shaping-settings] on this port group policy
-               to be overridden on an individual port.
+        :param pulumi.Input[bool] security_policy_override_allowed: Allow security policy settings on a port to override those on the portgroup.
+        :param pulumi.Input[bool] shaping_override_allowed: Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] standby_uplinks: List of standby uplinks used for load balancing, matching the names of the uplinks assigned in the DVS.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: A list of tag IDs to apply to this object.
         :param pulumi.Input[str] teaming_policy: The network adapter teaming policy. Can be one of loadbalance_ip, loadbalance_srcmac, loadbalance_srcid,
                failover_explicit, or loadbalance_loadbased.
-        :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any traffic filters on
-               this port group to be overridden on an individual port.
+        :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any filter policies set on the individual port to override those in the portgroup.
         :param pulumi.Input[bool] tx_uplink: If true, a copy of packets sent to the switch will always be forwarded to an uplink in addition to the regular packet
                forwarded done by the switch.
         :param pulumi.Input[str] type: The port group type. Can be one of `earlyBinding` (static
                binding) or `ephemeral`. Default: `earlyBinding`.
-        :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the
-               [uplink teaming options][uplink-teaming-settings] on this port group to be
-               overridden on an individual port.
+        :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the uplink teaming policies on a port to override those on the portgroup.
         :param pulumi.Input[int] vlan_id: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
-        :param pulumi.Input[bool] vlan_override_allowed: Allow the
-               [VLAN settings][vlan-settings] on this port group to be overridden on an
-               individual port.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DistributedPortGroupVlanRangeArgs']]]] vlan_ranges: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
+        :param pulumi.Input[bool] vlan_override_allowed: Allow the VLAN configuration on a port to override those on the portgroup.
+        :param pulumi.Input[Sequence[pulumi.Input[Union['DistributedPortGroupVlanRangeArgs', 'DistributedPortGroupVlanRangeArgsDict']]]] vlan_ranges: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
         """
         ...
     @overload
@@ -1824,7 +1928,146 @@ class DistributedPortGroup(pulumi.CustomResource):
                  args: DistributedPortGroupArgs,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
-        Create a DistributedPortGroup resource with the given unique name, props, and options.
+        The `DistributedPortGroup` resource can be used to manage
+        distributed port groups connected to vSphere Distributed Switches (VDS).
+        A vSphere Distributed Switch can be managed by the
+        `DistributedVirtualSwitch` resource.
+        Distributed port groups can be used as networks for virtual machines, allowing
+        the virtual machines to use the networking supplied by a vSphere Distributed
+        Switch, with a set of policies that apply to that individual network, if
+        desired.
+        * For an overview on vSphere networking concepts, refer to the vSphere
+        [product documentation][ref-vsphere-net-concepts].
+        * For more information on distributed port groups, refer to the vSphere
+        [product documentation][ref-vsphere-dvportgroup].
+        [ref-vsphere-net-concepts]: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.networking.doc/GUID-2B11DBB8-CB3C-4AFF-8885-EFEA0FC562F4.html
+        [ref-vsphere-dvportgroup]: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.networking.doc/GUID-69933F6E-2442-46CF-AA17-1196CB9A0A09.html
+        > **NOTE:** This resource requires vCenter and is not available on
+        direct ESXi host connections.
+        ## Example Usage
+        The configuration below builds on the example given in the
+        `DistributedVirtualSwitch` resource by
+        adding the `DistributedPortGroup` resource, attaching itself to the
+        vSphere Distributed Switch and assigning VLAN ID 1000.
+        ```python
+        import pulumi
+        import pulumi_vsphere as vsphere
+        config = pulumi.Config()
+        hosts = config.get_object("hosts")
+        if hosts is None:
+            hosts = [
+                "esxi-01.example.com",
+                "esxi-02.example.com",
+                "esxi-03.example.com",
+            ]
+        network_interfaces = config.get_object("networkInterfaces")
+        if network_interfaces is None:
+            network_interfaces = [
+                "vmnic0",
+                "vmnic1",
+                "vmnic2",
+                "vmnic3",
+            ]
+        datacenter = vsphere.get_datacenter(name="dc-01")
+        host = [vsphere.get_host(name=hosts[__index],
+            datacenter_id=datacenter.id) for __index in range(len(hosts))]
+        vds = vsphere.DistributedVirtualSwitch("vds",
+            name="vds-01",
+            datacenter_id=datacenter.id,
+            uplinks=[
+                "uplink1",
+                "uplink2",
+                "uplink3",
+                "uplink4",
+            ],
+            active_uplinks=[
+                "uplink1",
+                "uplink2",
+            ],
+            standby_uplinks=[
+                "uplink3",
+                "uplink4",
+            ],
+            hosts=[
+                {
+                    "host_system_id": host[0].id,
+                    "devices": [network_interfaces],
+                },
+                {
+                    "host_system_id": host[1].id,
+                    "devices": [network_interfaces],
+                },
+                {
+                    "host_system_id": host[2].id,
+                    "devices": [network_interfaces],
+                },
+            ])
+        pg = vsphere.DistributedPortGroup("pg",
+            name="pg-01",
+            distributed_virtual_switch_uuid=vds.id,
+            vlan_id=1000)
+        ```
+        ### Overriding VDS policies
+        All of the default port policies available in the
+        `DistributedVirtualSwitch` resource can be overridden on the port
+        group level by specifying new settings for them.
+        As an example, we also take this example from the
+        `DistributedVirtualSwitch` resource where we manually specify our
+        uplink count and uplink order. While the vSphere Distributed Switch has a
+        default policy of using the first uplink as an active uplink and the second
+        one as a standby, the overridden port group policy means that both uplinks
+        will be used as active uplinks in this specific port group.
+        ```python
+        import pulumi
+        import pulumi_vsphere as vsphere
+        vds = vsphere.DistributedVirtualSwitch("vds",
+            name="vds-01",
+            datacenter_id=datacenter["id"],
+            uplinks=[
+                "uplink1",
+                "uplink2",
+            ],
+            active_uplinks=["uplink1"],
+            standby_uplinks=["uplink2"])
+        pg = vsphere.DistributedPortGroup("pg",
+            name="pg-01",
+            distributed_virtual_switch_uuid=vds.id,
+            vlan_id=1000,
+            active_uplinks=[
+                "uplink1",
+                "uplink2",
+            ],
+            standby_uplinks=[])
+        ```
+        ## Import
+        An existing port group can be imported into this resource using
+        the managed object id of the port group, via the following command:
+        ```sh
+        $ pulumi import vsphere:index/distributedPortGroup:DistributedPortGroup pg /dc-01/network/pg-01
+        ```
+        The above would import the port group named `pg-01` that is located in the `dc-01`
+        datacenter.
         :param str resource_name: The name of the resource.
         :param DistributedPortGroupArgs args: The arguments to use to populate this resource's properties.
         :param pulumi.ResourceOptions opts: Options for the resource.
@@ -1885,7 +2128,7 @@ class DistributedPortGroup(pulumi.CustomResource):
                  uplink_teaming_override_allowed: Optional[pulumi.Input[bool]] = None,
                  vlan_id: Optional[pulumi.Input[int]] = None,
                  vlan_override_allowed: Optional[pulumi.Input[bool]] = None,
-                 vlan_ranges: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DistributedPortGroupVlanRangeArgs']]]]] = None,
+                 vlan_ranges: Optional[pulumi.Input[Sequence[pulumi.Input[Union['DistributedPortGroupVlanRangeArgs', 'DistributedPortGroupVlanRangeArgsDict']]]]] = None,
                  __props__=None):
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
         if not isinstance(opts, pulumi.ResourceOptions):
@@ -2002,7 +2245,7 @@ class DistributedPortGroup(pulumi.CustomResource):
             uplink_teaming_override_allowed: Optional[pulumi.Input[bool]] = None,
             vlan_id: Optional[pulumi.Input[int]] = None,
             vlan_override_allowed: Optional[pulumi.Input[bool]] = None,
-            vlan_ranges: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DistributedPortGroupVlanRangeArgs']]]]] = None) -> 'DistributedPortGroup':
+            vlan_ranges: Optional[pulumi.Input[Sequence[pulumi.Input[Union['DistributedPortGroupVlanRangeArgs', 'DistributedPortGroupVlanRangeArgsDict']]]]] = None) -> 'DistributedPortGroup':
         """
         Get an existing DistributedPortGroup resource's state with the given name, id, and optional extra
         properties used to qualify the lookup.
@@ -2022,13 +2265,19 @@ class DistributedPortGroup(pulumi.CustomResource):
                may lead to errors when the port count grows past the amount specified.  If you
                specify `number_of_ports`, you may wish to set `auto_expand` to `false`.
         :param pulumi.Input[bool] block_all_ports: Indicates whether to block all ports by default.
-        :param pulumi.Input[bool] block_override_allowed: Allow the port shutdown
-               policy to be overridden on an individual port.
+        :param pulumi.Input[bool] block_override_allowed: Allow the blocked setting of an individual port to override the setting in the portgroup.
         :param pulumi.Input[bool] check_beacon: Enable beacon probing on the ports this policy applies to.
         :param pulumi.Input[str] config_version: The current version of the port group configuration,
                incremented by subsequent updates to the port group.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to attribute
+               <<<<<<< HEAD
+               value string to set for port group. See [here][docs-setting-custom-attributes]
+               for a reference on how to set values for custom attributes.
+               [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
+               =======
                value string to set for port group.
+               >>>>>>> 69c6e040 (fork)
                > **NOTE:** Custom attributes are not supported on direct ESXi host
                connections and require vCenter Server.
@@ -2048,53 +2297,39 @@ class DistributedPortGroup(pulumi.CustomResource):
         :param pulumi.Input[str] key: The generated UUID of the port group.
         :param pulumi.Input[bool] lacp_enabled: Whether or not to enable LACP on all uplink ports.
         :param pulumi.Input[str] lacp_mode: The uplink LACP mode to use. Can be one of active or passive.
-        :param pulumi.Input[bool] live_port_moving_allowed: Allow a port in this port group to be
-               moved to another port group while it is connected.
+        :param pulumi.Input[bool] live_port_moving_allowed: Allow a live port to be moved in and out of the portgroup.
         :param pulumi.Input[str] name: The name of the port group.
         :param pulumi.Input[bool] netflow_enabled: Indicates whether to enable netflow on all ports.
-        :param pulumi.Input[bool] netflow_override_allowed: Allow the
-               [Netflow policy][netflow-policy] on this port group to be overridden on an
-               individual port.
+        :param pulumi.Input[bool] netflow_override_allowed: Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
         :param pulumi.Input[str] network_resource_pool_key: The key of a network resource pool
                to associate with this port group. The default is `-1`, which implies no
                association.
-        :param pulumi.Input[bool] network_resource_pool_override_allowed: Allow the network
-               resource pool set on this port group to be overridden on an individual port.
+        :param pulumi.Input[bool] network_resource_pool_override_allowed: Allow the network resource pool of an individual port to override the setting in the portgroup.
         :param pulumi.Input[bool] notify_switches: If true, the teaming policy will notify the broadcast network of a NIC failover, triggering cache updates.
         :param pulumi.Input[int] number_of_ports: The number of ports available on this port
                group. Cannot be decreased below the amount of used ports on the port group.
-        :param pulumi.Input[bool] port_config_reset_at_disconnect: Reset a port's settings to the
-               settings defined on this port group policy when the port disconnects.
+        :param pulumi.Input[bool] port_config_reset_at_disconnect: Reset the setting of any ports in this portgroup back to the default setting when the port disconnects.
         :param pulumi.Input[str] port_name_format: An optional formatting policy for naming of
                the ports in this port group. See the `portNameFormat` attribute listed
                [here][ext-vsphere-portname-format] for details on the format syntax.
-               [ext-vsphere-portname-format]: https://vdc-download.vmware.com/vmwb-repository/dcr-public/b50dcbbf-051d-4204-a3e7-e1b618c1e384/538cf2ec-b34f-4bae-a332-3820ef9e7773/vim.dvs.DistributedVirtualPortgroup.ConfigInfo.html#portNameFormat
+               [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
         :param pulumi.Input[int] port_private_secondary_vlan_id: The secondary VLAN ID for this port.
-        :param pulumi.Input[bool] security_policy_override_allowed: Allow the
-               [security policy settings][sec-policy-settings] defined in this port group
-               policy to be overridden on an individual port.
-        :param pulumi.Input[bool] shaping_override_allowed: Allow the
-               [traffic shaping options][traffic-shaping-settings] on this port group policy
-               to be overridden on an individual port.
+        :param pulumi.Input[bool] security_policy_override_allowed: Allow security policy settings on a port to override those on the portgroup.
+        :param pulumi.Input[bool] shaping_override_allowed: Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] standby_uplinks: List of standby uplinks used for load balancing, matching the names of the uplinks assigned in the DVS.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: A list of tag IDs to apply to this object.
         :param pulumi.Input[str] teaming_policy: The network adapter teaming policy. Can be one of loadbalance_ip, loadbalance_srcmac, loadbalance_srcid,
                failover_explicit, or loadbalance_loadbased.
-        :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any traffic filters on
-               this port group to be overridden on an individual port.
+        :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any filter policies set on the individual port to override those in the portgroup.
         :param pulumi.Input[bool] tx_uplink: If true, a copy of packets sent to the switch will always be forwarded to an uplink in addition to the regular packet
                forwarded done by the switch.
         :param pulumi.Input[str] type: The port group type. Can be one of `earlyBinding` (static
                binding) or `ephemeral`. Default: `earlyBinding`.
-        :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the
-               [uplink teaming options][uplink-teaming-settings] on this port group to be
-               overridden on an individual port.
+        :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the uplink teaming policies on a port to override those on the portgroup.
         :param pulumi.Input[int] vlan_id: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
-        :param pulumi.Input[bool] vlan_override_allowed: Allow the
-               [VLAN settings][vlan-settings] on this port group to be overridden on an
-               individual port.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DistributedPortGroupVlanRangeArgs']]]] vlan_ranges: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
+        :param pulumi.Input[bool] vlan_override_allowed: Allow the VLAN configuration on a port to override those on the portgroup.
+        :param pulumi.Input[Sequence[pulumi.Input[Union['DistributedPortGroupVlanRangeArgs', 'DistributedPortGroupVlanRangeArgsDict']]]] vlan_ranges: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
         """
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
@@ -2208,8 +2443,7 @@ class DistributedPortGroup(pulumi.CustomResource):
     @pulumi.getter(name="blockOverrideAllowed")
     def block_override_allowed(self) -> pulumi.Output[Optional[bool]]:
         """
-        Allow the port shutdown
-        policy to be overridden on an individual port.
+        Allow the blocked setting of an individual port to override the setting in the portgroup.
         """
         return pulumi.get(self, "block_override_allowed")
@@ -2235,7 +2469,14 @@ class DistributedPortGroup(pulumi.CustomResource):
     def custom_attributes(self) -> pulumi.Output[Optional[Mapping[str, str]]]:
         """
         Map of custom attribute ids to attribute
+        <<<<<<< HEAD
+        value string to set for port group. See [here][docs-setting-custom-attributes]
+        for a reference on how to set values for custom attributes.
+        [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
+        =======
         value string to set for port group.
+        >>>>>>> 69c6e040 (fork)
         > **NOTE:** Custom attributes are not supported on direct ESXi host
         connections and require vCenter Server.
@@ -2367,8 +2608,7 @@ class DistributedPortGroup(pulumi.CustomResource):
     @pulumi.getter(name="livePortMovingAllowed")
     def live_port_moving_allowed(self) -> pulumi.Output[Optional[bool]]:
         """
-        Allow a port in this port group to be
-        moved to another port group while it is connected.
+        Allow a live port to be moved in and out of the portgroup.
         """
         return pulumi.get(self, "live_port_moving_allowed")
@@ -2392,9 +2632,7 @@ class DistributedPortGroup(pulumi.CustomResource):
     @pulumi.getter(name="netflowOverrideAllowed")
     def netflow_override_allowed(self) -> pulumi.Output[Optional[bool]]:
         """
-        Allow the
-        [Netflow policy][netflow-policy] on this port group to be overridden on an
-        individual port.
+        Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
         """
         return pulumi.get(self, "netflow_override_allowed")
@@ -2412,8 +2650,7 @@ class DistributedPortGroup(pulumi.CustomResource):
     @pulumi.getter(name="networkResourcePoolOverrideAllowed")
     def network_resource_pool_override_allowed(self) -> pulumi.Output[Optional[bool]]:
         """
-        Allow the network
-        resource pool set on this port group to be overridden on an individual port.
+        Allow the network resource pool of an individual port to override the setting in the portgroup.
         """
         return pulumi.get(self, "network_resource_pool_override_allowed")
@@ -2438,8 +2675,7 @@ class DistributedPortGroup(pulumi.CustomResource):
     @pulumi.getter(name="portConfigResetAtDisconnect")
     def port_config_reset_at_disconnect(self) -> pulumi.Output[Optional[bool]]:
         """
-        Reset a port's settings to the
-        settings defined on this port group policy when the port disconnects.
+        Reset the setting of any ports in this portgroup back to the default setting when the port disconnects.
         """
         return pulumi.get(self, "port_config_reset_at_disconnect")
@@ -2451,7 +2687,7 @@ class DistributedPortGroup(pulumi.CustomResource):
         the ports in this port group. See the `portNameFormat` attribute listed
         [here][ext-vsphere-portname-format] for details on the format syntax.
-        [ext-vsphere-portname-format]: https://vdc-download.vmware.com/vmwb-repository/dcr-public/b50dcbbf-051d-4204-a3e7-e1b618c1e384/538cf2ec-b34f-4bae-a332-3820ef9e7773/vim.dvs.DistributedVirtualPortgroup.ConfigInfo.html#portNameFormat
+        [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
         """
         return pulumi.get(self, "port_name_format")
@@ -2467,9 +2703,7 @@ class DistributedPortGroup(pulumi.CustomResource):
     @pulumi.getter(name="securityPolicyOverrideAllowed")
     def security_policy_override_allowed(self) -> pulumi.Output[Optional[bool]]:
         """
-        Allow the
-        [security policy settings][sec-policy-settings] defined in this port group
-        policy to be overridden on an individual port.
+        Allow security policy settings on a port to override those on the portgroup.
         """
         return pulumi.get(self, "security_policy_override_allowed")
@@ -2477,9 +2711,7 @@ class DistributedPortGroup(pulumi.CustomResource):
     @pulumi.getter(name="shapingOverrideAllowed")
     def shaping_override_allowed(self) -> pulumi.Output[Optional[bool]]:
         """
-        Allow the
-        [traffic shaping options][traffic-shaping-settings] on this port group policy
-        to be overridden on an individual port.
+        Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
         """
         return pulumi.get(self, "shaping_override_allowed")
@@ -2512,8 +2744,7 @@ class DistributedPortGroup(pulumi.CustomResource):
     @pulumi.getter(name="trafficFilterOverrideAllowed")
     def traffic_filter_override_allowed(self) -> pulumi.Output[Optional[bool]]:
         """
-        Allow any traffic filters on
-        this port group to be overridden on an individual port.
+        Allow any filter policies set on the individual port to override those in the portgroup.
         """
         return pulumi.get(self, "traffic_filter_override_allowed")
@@ -2539,9 +2770,7 @@ class DistributedPortGroup(pulumi.CustomResource):
     @pulumi.getter(name="uplinkTeamingOverrideAllowed")
     def uplink_teaming_override_allowed(self) -> pulumi.Output[Optional[bool]]:
         """
-        Allow the
-        [uplink teaming options][uplink-teaming-settings] on this port group to be
-        overridden on an individual port.
+        Allow the uplink teaming policies on a port to override those on the portgroup.
         """
         return pulumi.get(self, "uplink_teaming_override_allowed")
@@ -2557,9 +2786,7 @@ class DistributedPortGroup(pulumi.CustomResource):
     @pulumi.getter(name="vlanOverrideAllowed")
     def vlan_override_allowed(self) -> pulumi.Output[Optional[bool]]:
         """
-        Allow the
-        [VLAN settings][vlan-settings] on this port group to be overridden on an
-        individual port.
+        Allow the VLAN configuration on a port to override those on the portgroup.
         """
         return pulumi.get(self, "vlan_override_allowed")

pulumi-vsphere 4.10.0a1710245029__py3-none-any.whl → 4.13.0a1736849827__py3-none-any.whl

pulumi-vsphere 4.10.0a1710245029py3-none-any.whl → 4.13.0a1736849827py3-none-any.whl