pulumi-vsphere 4.10.1__py3-none-any.whl → 4.10.2__py3-none-any.whl

pulumi_vsphere/_utilities.py

@@ -4,6 +4,7 @@
 
 
 import asyncio
+import functools
 import importlib.metadata
 import importlib.util
 import inspect
@@ -11,6 +12,7 @@ import json
 import os
 import sys
 import typing
+import warnings
 
 import pulumi
 import pulumi.runtime
@@ -19,6 +21,8 @@ from pulumi.runtime.sync_await import _sync_await
 from semver import VersionInfo as SemverVersion
 from parver import Version as PEP440Version
 
+C = typing.TypeVar("C", bound=typing.Callable)
+
 
 def get_env(*args):
     for v in args:
@@ -287,5 +291,36 @@ async def _await_output(o: pulumi.Output[typing.Any]) -> typing.Tuple[object, bo
         await o._resources,
     )
 
+
+# This is included to provide an upgrade path for users who are using a version
+# of the Pulumi SDK (<3.121.0) that does not include the `deprecated` decorator.
+def deprecated(message: str) -> typing.Callable[[C], C]:
+    """
+    Decorator to indicate a function is deprecated.
+
+    As well as inserting appropriate statements to indicate that the function is
+    deprecated, this decorator also tags the function with a special attribute
+    so that Pulumi code can detect that it is deprecated and react appropriately
+    in certain situations.
+
+    message is the deprecation message that should be printed if the function is called.
+    """
+
+    def decorator(fn: C) -> C:
+        if not callable(fn):
+            raise TypeError("Expected fn to be callable")
+
+        @functools.wraps(fn)
+        def deprecated_fn(*args, **kwargs):
+            warnings.warn(message)
+            pulumi.warn(f"{fn.__name__} is deprecated: {message}")
+
+            return fn(*args, **kwargs)
+
+        deprecated_fn.__dict__["_pulumi_deprecated_callable"] = fn
+        return typing.cast(C, deprecated_fn)
+
+    return decorator
+
 def get_plugin_download_url():
 	return None

pulumi_vsphere/compute_cluster.py

@@ -61,6 +61,7 @@ class ComputeClusterArgs:
                  ha_vm_restart_priority: Optional[pulumi.Input[str]] = None,
                  ha_vm_restart_timeout: Optional[pulumi.Input[int]] = None,
                  host_cluster_exit_timeout: Optional[pulumi.Input[int]] = None,
+                 host_image: Optional[pulumi.Input['ComputeClusterHostImageArgs']] = None,
                  host_managed: Optional[pulumi.Input[bool]] = None,
                  host_system_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
@@ -176,6 +177,7 @@ class ComputeClusterArgs:
         :param pulumi.Input[int] ha_vm_restart_timeout: The maximum time, in seconds, that vSphere HA will wait for virtual machines in one priority to be ready before
                proceeding with the next priority.
         :param pulumi.Input[int] host_cluster_exit_timeout: The timeout for each host maintenance mode operation when removing hosts from a cluster.
+        :param pulumi.Input['ComputeClusterHostImageArgs'] host_image: Details about the host image which should be applied to the cluster.
         :param pulumi.Input[bool] host_managed: Must be set if cluster enrollment is managed from host resource.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] host_system_ids: The managed object IDs of the hosts to put in the cluster.
         :param pulumi.Input[str] name: The name of the cluster.
@@ -291,6 +293,8 @@ class ComputeClusterArgs:
             pulumi.set(__self__, "ha_vm_restart_timeout", ha_vm_restart_timeout)
         if host_cluster_exit_timeout is not None:
             pulumi.set(__self__, "host_cluster_exit_timeout", host_cluster_exit_timeout)
+        if host_image is not None:
+            pulumi.set(__self__, "host_image", host_image)
         if host_managed is not None:
             pulumi.set(__self__, "host_managed", host_managed)
         if host_system_ids is not None:
@@ -923,6 +927,18 @@ class ComputeClusterArgs:
     def host_cluster_exit_timeout(self, value: Optional[pulumi.Input[int]]):
         pulumi.set(self, "host_cluster_exit_timeout", value)
 
+    @property
+    @pulumi.getter(name="hostImage")
+    def host_image(self) -> Optional[pulumi.Input['ComputeClusterHostImageArgs']]:
+        """
+        Details about the host image which should be applied to the cluster.
+        """
+        return pulumi.get(self, "host_image")
+
+    @host_image.setter
+    def host_image(self, value: Optional[pulumi.Input['ComputeClusterHostImageArgs']]):
+        pulumi.set(self, "host_image", value)
+
     @property
     @pulumi.getter(name="hostManaged")
     def host_managed(self) -> Optional[pulumi.Input[bool]]:
@@ -1250,6 +1266,7 @@ class _ComputeClusterState:
                  ha_vm_restart_priority: Optional[pulumi.Input[str]] = None,
                  ha_vm_restart_timeout: Optional[pulumi.Input[int]] = None,
                  host_cluster_exit_timeout: Optional[pulumi.Input[int]] = None,
+                 host_image: Optional[pulumi.Input['ComputeClusterHostImageArgs']] = None,
                  host_managed: Optional[pulumi.Input[bool]] = None,
                  host_system_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
@@ -1366,6 +1383,7 @@ class _ComputeClusterState:
         :param pulumi.Input[int] ha_vm_restart_timeout: The maximum time, in seconds, that vSphere HA will wait for virtual machines in one priority to be ready before
                proceeding with the next priority.
         :param pulumi.Input[int] host_cluster_exit_timeout: The timeout for each host maintenance mode operation when removing hosts from a cluster.
+        :param pulumi.Input['ComputeClusterHostImageArgs'] host_image: Details about the host image which should be applied to the cluster.
         :param pulumi.Input[bool] host_managed: Must be set if cluster enrollment is managed from host resource.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] host_system_ids: The managed object IDs of the hosts to put in the cluster.
         :param pulumi.Input[str] name: The name of the cluster.
@@ -1487,6 +1505,8 @@ class _ComputeClusterState:
             pulumi.set(__self__, "ha_vm_restart_timeout", ha_vm_restart_timeout)
         if host_cluster_exit_timeout is not None:
             pulumi.set(__self__, "host_cluster_exit_timeout", host_cluster_exit_timeout)
+        if host_image is not None:
+            pulumi.set(__self__, "host_image", host_image)
         if host_managed is not None:
             pulumi.set(__self__, "host_managed", host_managed)
         if host_system_ids is not None:
@@ -2121,6 +2141,18 @@ class _ComputeClusterState:
     def host_cluster_exit_timeout(self, value: Optional[pulumi.Input[int]]):
         pulumi.set(self, "host_cluster_exit_timeout", value)
 
+    @property
+    @pulumi.getter(name="hostImage")
+    def host_image(self) -> Optional[pulumi.Input['ComputeClusterHostImageArgs']]:
+        """
+        Details about the host image which should be applied to the cluster.
+        """
+        return pulumi.get(self, "host_image")
+
+    @host_image.setter
+    def host_image(self, value: Optional[pulumi.Input['ComputeClusterHostImageArgs']]):
+        pulumi.set(self, "host_image", value)
+
     @property
     @pulumi.getter(name="hostManaged")
     def host_managed(self) -> Optional[pulumi.Input[bool]]:
@@ -2466,6 +2498,7 @@ class ComputeCluster(pulumi.CustomResource):
                  ha_vm_restart_priority: Optional[pulumi.Input[str]] = None,
                  ha_vm_restart_timeout: Optional[pulumi.Input[int]] = None,
                  host_cluster_exit_timeout: Optional[pulumi.Input[int]] = None,
+                 host_image: Optional[pulumi.Input[pulumi.InputType['ComputeClusterHostImageArgs']]] = None,
                  host_managed: Optional[pulumi.Input[bool]] = None,
                  host_system_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
@@ -2584,6 +2617,7 @@ class ComputeCluster(pulumi.CustomResource):
         :param pulumi.Input[int] ha_vm_restart_timeout: The maximum time, in seconds, that vSphere HA will wait for virtual machines in one priority to be ready before
                proceeding with the next priority.
         :param pulumi.Input[int] host_cluster_exit_timeout: The timeout for each host maintenance mode operation when removing hosts from a cluster.
+        :param pulumi.Input[pulumi.InputType['ComputeClusterHostImageArgs']] host_image: Details about the host image which should be applied to the cluster.
         :param pulumi.Input[bool] host_managed: Must be set if cluster enrollment is managed from host resource.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] host_system_ids: The managed object IDs of the hosts to put in the cluster.
         :param pulumi.Input[str] name: The name of the cluster.
@@ -2678,6 +2712,7 @@ class ComputeCluster(pulumi.CustomResource):
                  ha_vm_restart_priority: Optional[pulumi.Input[str]] = None,
                  ha_vm_restart_timeout: Optional[pulumi.Input[int]] = None,
                  host_cluster_exit_timeout: Optional[pulumi.Input[int]] = None,
+                 host_image: Optional[pulumi.Input[pulumi.InputType['ComputeClusterHostImageArgs']]] = None,
                  host_managed: Optional[pulumi.Input[bool]] = None,
                  host_system_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
@@ -2757,6 +2792,7 @@ class ComputeCluster(pulumi.CustomResource):
             __props__.__dict__["ha_vm_restart_priority"] = ha_vm_restart_priority
             __props__.__dict__["ha_vm_restart_timeout"] = ha_vm_restart_timeout
             __props__.__dict__["host_cluster_exit_timeout"] = host_cluster_exit_timeout
+            __props__.__dict__["host_image"] = host_image
             __props__.__dict__["host_managed"] = host_managed
             __props__.__dict__["host_system_ids"] = host_system_ids
             __props__.__dict__["name"] = name
@@ -2836,6 +2872,7 @@ class ComputeCluster(pulumi.CustomResource):
             ha_vm_restart_priority: Optional[pulumi.Input[str]] = None,
             ha_vm_restart_timeout: Optional[pulumi.Input[int]] = None,
             host_cluster_exit_timeout: Optional[pulumi.Input[int]] = None,
+            host_image: Optional[pulumi.Input[pulumi.InputType['ComputeClusterHostImageArgs']]] = None,
             host_managed: Optional[pulumi.Input[bool]] = None,
             host_system_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
             name: Optional[pulumi.Input[str]] = None,
@@ -2957,6 +2994,7 @@ class ComputeCluster(pulumi.CustomResource):
         :param pulumi.Input[int] ha_vm_restart_timeout: The maximum time, in seconds, that vSphere HA will wait for virtual machines in one priority to be ready before
                proceeding with the next priority.
         :param pulumi.Input[int] host_cluster_exit_timeout: The timeout for each host maintenance mode operation when removing hosts from a cluster.
+        :param pulumi.Input[pulumi.InputType['ComputeClusterHostImageArgs']] host_image: Details about the host image which should be applied to the cluster.
         :param pulumi.Input[bool] host_managed: Must be set if cluster enrollment is managed from host resource.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] host_system_ids: The managed object IDs of the hosts to put in the cluster.
         :param pulumi.Input[str] name: The name of the cluster.
@@ -3037,6 +3075,7 @@ class ComputeCluster(pulumi.CustomResource):
         __props__.__dict__["ha_vm_restart_priority"] = ha_vm_restart_priority
         __props__.__dict__["ha_vm_restart_timeout"] = ha_vm_restart_timeout
         __props__.__dict__["host_cluster_exit_timeout"] = host_cluster_exit_timeout
+        __props__.__dict__["host_image"] = host_image
         __props__.__dict__["host_managed"] = host_managed
         __props__.__dict__["host_system_ids"] = host_system_ids
         __props__.__dict__["name"] = name
@@ -3468,6 +3507,14 @@ class ComputeCluster(pulumi.CustomResource):
         """
         return pulumi.get(self, "host_cluster_exit_timeout")
 
+    @property
+    @pulumi.getter(name="hostImage")
+    def host_image(self) -> pulumi.Output[Optional['outputs.ComputeClusterHostImage']]:
+        """
+        Details about the host image which should be applied to the cluster.
+        """
+        return pulumi.get(self, "host_image")
+
     @property
     @pulumi.getter(name="hostManaged")
     def host_managed(self) -> pulumi.Output[Optional[bool]]:

pulumi_vsphere/compute_cluster_vm_affinity_rule.py

@@ -249,8 +249,6 @@ class ComputeClusterVmAffinityRule(pulumi.CustomResource):
         > **NOTE:** This resource requires vCenter Server and is not available on
         direct ESXi host connections.
 
-        > **NOTE:** vSphere DRS requires a vSphere Enterprise Plus license.
-
         ## Example Usage
 
         The following example creates two virtual machines in a cluster using the
@@ -367,8 +365,6 @@ class ComputeClusterVmAffinityRule(pulumi.CustomResource):
         > **NOTE:** This resource requires vCenter Server and is not available on
         direct ESXi host connections.
 
-        > **NOTE:** vSphere DRS requires a vSphere Enterprise Plus license.
-
         ## Example Usage
 
         The following example creates two virtual machines in a cluster using the

pulumi_vsphere/datacenter.py

@@ -20,7 +20,7 @@ class DatacenterArgs:
                  tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None):
         """
         The set of arguments for constructing a Datacenter resource.
-        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to value 
+        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to value
                strings to set for datacenter resource. See
                [here][docs-setting-custom-attributes] for a reference on how to set values
                for custom attributes.
@@ -34,9 +34,6 @@ class DatacenterArgs:
         :param pulumi.Input[str] name: The name of the datacenter. This name needs to be unique
                within the folder. Forces a new resource if changed.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: The IDs of any tags to attach to this resource.
-               
-               > **NOTE:** Tagging support is unsupported on direct ESXi connections and
-               requires vCenter 6.0 or higher.
         """
         if custom_attributes is not None:
             pulumi.set(__self__, "custom_attributes", custom_attributes)
@@ -51,7 +48,7 @@ class DatacenterArgs:
     @pulumi.getter(name="customAttributes")
     def custom_attributes(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]:
         """
-        Map of custom attribute ids to value 
+        Map of custom attribute ids to value
         strings to set for datacenter resource. See
         [here][docs-setting-custom-attributes] for a reference on how to set values
         for custom attributes.
@@ -98,9 +95,6 @@ class DatacenterArgs:
     def tags(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
         The IDs of any tags to attach to this resource.
-
-        > **NOTE:** Tagging support is unsupported on direct ESXi connections and
-        requires vCenter 6.0 or higher.
         """
         return pulumi.get(self, "tags")
 
@@ -119,7 +113,7 @@ class _DatacenterState:
                  tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None):
         """
         Input properties used for looking up and filtering Datacenter resources.
-        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to value 
+        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to value
                strings to set for datacenter resource. See
                [here][docs-setting-custom-attributes] for a reference on how to set values
                for custom attributes.
@@ -134,9 +128,6 @@ class _DatacenterState:
         :param pulumi.Input[str] name: The name of the datacenter. This name needs to be unique
                within the folder. Forces a new resource if changed.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: The IDs of any tags to attach to this resource.
-               
-               > **NOTE:** Tagging support is unsupported on direct ESXi connections and
-               requires vCenter 6.0 or higher.
         """
         if custom_attributes is not None:
             pulumi.set(__self__, "custom_attributes", custom_attributes)
@@ -153,7 +144,7 @@ class _DatacenterState:
     @pulumi.getter(name="customAttributes")
     def custom_attributes(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]:
         """
-        Map of custom attribute ids to value 
+        Map of custom attribute ids to value
         strings to set for datacenter resource. See
         [here][docs-setting-custom-attributes] for a reference on how to set values
         for custom attributes.
@@ -212,9 +203,6 @@ class _DatacenterState:
     def tags(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
         The IDs of any tags to attach to this resource.
-
-        > **NOTE:** Tagging support is unsupported on direct ESXi connections and
-        requires vCenter 6.0 or higher.
         """
         return pulumi.get(self, "tags")
 
@@ -270,7 +258,7 @@ class Datacenter(pulumi.CustomResource):
 
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
-        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to value 
+        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to value
                strings to set for datacenter resource. See
                [here][docs-setting-custom-attributes] for a reference on how to set values
                for custom attributes.
@@ -284,9 +272,6 @@ class Datacenter(pulumi.CustomResource):
         :param pulumi.Input[str] name: The name of the datacenter. This name needs to be unique
                within the folder. Forces a new resource if changed.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: The IDs of any tags to attach to this resource.
-               
-               > **NOTE:** Tagging support is unsupported on direct ESXi connections and
-               requires vCenter 6.0 or higher.
         """
         ...
     @overload
@@ -384,7 +369,7 @@ class Datacenter(pulumi.CustomResource):
         :param str resource_name: The unique name of the resulting resource.
         :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
         :param pulumi.ResourceOptions opts: Options for the resource.
-        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to value 
+        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to value
                strings to set for datacenter resource. See
                [here][docs-setting-custom-attributes] for a reference on how to set values
                for custom attributes.
@@ -399,9 +384,6 @@ class Datacenter(pulumi.CustomResource):
         :param pulumi.Input[str] name: The name of the datacenter. This name needs to be unique
                within the folder. Forces a new resource if changed.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: The IDs of any tags to attach to this resource.
-               
-               > **NOTE:** Tagging support is unsupported on direct ESXi connections and
-               requires vCenter 6.0 or higher.
         """
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
 
@@ -418,7 +400,7 @@ class Datacenter(pulumi.CustomResource):
     @pulumi.getter(name="customAttributes")
     def custom_attributes(self) -> pulumi.Output[Optional[Mapping[str, str]]]:
         """
-        Map of custom attribute ids to value 
+        Map of custom attribute ids to value
         strings to set for datacenter resource. See
         [here][docs-setting-custom-attributes] for a reference on how to set values
         for custom attributes.
@@ -461,9 +443,6 @@ class Datacenter(pulumi.CustomResource):
     def tags(self) -> pulumi.Output[Optional[Sequence[str]]]:
         """
         The IDs of any tags to attach to this resource.
-
-        > **NOTE:** Tagging support is unsupported on direct ESXi connections and
-        requires vCenter 6.0 or higher.
         """
         return pulumi.get(self, "tags")
 

pulumi_vsphere/datastore_cluster.py

@@ -88,8 +88,6 @@ class DatastoreClusterArgs:
         :param pulumi.Input[int] sdrs_space_utilization_threshold: The threshold, in percent of used space, that storage DRS uses to make decisions to migrate VMs out of a datastore.
         :param pulumi.Input[str] sdrs_vm_evacuation_automation_level: Overrides the default automation settings when generating recommendations for datastore evacuation.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: The IDs of any tags to attach to this resource.
-               
-               > **NOTE:** Tagging support requires vCenter 6.0 or higher.
         """
         pulumi.set(__self__, "datacenter_id", datacenter_id)
         if custom_attributes is not None:
@@ -456,8 +454,6 @@ class DatastoreClusterArgs:
     def tags(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
         The IDs of any tags to attach to this resource.
-
-        > **NOTE:** Tagging support requires vCenter 6.0 or higher.
         """
         return pulumi.get(self, "tags")
 
@@ -543,8 +539,6 @@ class _DatastoreClusterState:
         :param pulumi.Input[int] sdrs_space_utilization_threshold: The threshold, in percent of used space, that storage DRS uses to make decisions to migrate VMs out of a datastore.
         :param pulumi.Input[str] sdrs_vm_evacuation_automation_level: Overrides the default automation settings when generating recommendations for datastore evacuation.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: The IDs of any tags to attach to this resource.
-               
-               > **NOTE:** Tagging support requires vCenter 6.0 or higher.
         """
         if custom_attributes is not None:
             pulumi.set(__self__, "custom_attributes", custom_attributes)
@@ -912,8 +906,6 @@ class _DatastoreClusterState:
     def tags(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
         The IDs of any tags to attach to this resource.
-
-        > **NOTE:** Tagging support requires vCenter 6.0 or higher.
         """
         return pulumi.get(self, "tags")
 
@@ -1004,8 +996,6 @@ class DatastoreCluster(pulumi.CustomResource):
         :param pulumi.Input[int] sdrs_space_utilization_threshold: The threshold, in percent of used space, that storage DRS uses to make decisions to migrate VMs out of a datastore.
         :param pulumi.Input[str] sdrs_vm_evacuation_automation_level: Overrides the default automation settings when generating recommendations for datastore evacuation.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: The IDs of any tags to attach to this resource.
-               
-               > **NOTE:** Tagging support requires vCenter 6.0 or higher.
         """
         ...
     @overload
@@ -1180,8 +1170,6 @@ class DatastoreCluster(pulumi.CustomResource):
         :param pulumi.Input[int] sdrs_space_utilization_threshold: The threshold, in percent of used space, that storage DRS uses to make decisions to migrate VMs out of a datastore.
         :param pulumi.Input[str] sdrs_vm_evacuation_automation_level: Overrides the default automation settings when generating recommendations for datastore evacuation.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: The IDs of any tags to attach to this resource.
-               
-               > **NOTE:** Tagging support requires vCenter 6.0 or higher.
         """
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
 
@@ -1433,8 +1421,6 @@ class DatastoreCluster(pulumi.CustomResource):
     def tags(self) -> pulumi.Output[Optional[Sequence[str]]]:
         """
         The IDs of any tags to attach to this resource.
-
-        > **NOTE:** Tagging support requires vCenter 6.0 or higher.
         """
         return pulumi.get(self, "tags")
 

pulumi_vsphere/distributed_port_group.py

@@ -81,7 +81,14 @@ class DistributedPortGroupArgs:
         :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.
@@ -114,7 +121,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/
         :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 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.
@@ -344,7 +351,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.
@@ -630,7 +644,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")
 
@@ -868,7 +882,14 @@ class _DistributedPortGroupState:
         :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.
@@ -904,7 +925,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/
         :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 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.
@@ -1139,7 +1160,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.
@@ -1450,7 +1478,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")
 
@@ -1689,7 +1717,14 @@ class DistributedPortGroup(pulumi.CustomResource):
         :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.
@@ -1724,7 +1759,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/
         :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 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.
@@ -1952,7 +1987,14 @@ class DistributedPortGroup(pulumi.CustomResource):
         :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.
@@ -1988,7 +2030,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/
         :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 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.
@@ -2144,7 +2186,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.
@@ -2355,7 +2404,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")