pulumi-vsphere 4.11.0a1719961236__tar.gz → 4.11.0a1720619049__tar.gz

{pulumi_vsphere-4.11.0a1719961236 → pulumi_vsphere-4.11.0a1720619049}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulumi_vsphere
-Version: 4.11.0a1719961236
+Version: 4.11.0a1720619049
 Summary: A Pulumi package for creating vsphere resources
 License: Apache-2.0
 Project-URL: Homepage, https://pulumi.io

{pulumi_vsphere-4.11.0a1719961236 → pulumi_vsphere-4.11.0a1720619049}/pulumi_vsphere/_inputs.py

@@ -675,9 +675,12 @@ class EntityPermissionsPermissionArgs:
                  role_id: pulumi.Input[str],
                  user_or_group: pulumi.Input[str]):
         """
-        :param pulumi.Input[bool] is_group: Whether user_or_group field refers to a user or a group. True for a group and false for a user.
-        :param pulumi.Input[bool] propagate: Whether or not this permission propagates down the hierarchy to sub-entities.
-        :param pulumi.Input[str] role_id: The role id of the role to be given to the user on the specified entity.
+        :param pulumi.Input[bool] is_group: Whether `user_or_group` field refers to a user or a
+               group. True for a group and false for a user.
+        :param pulumi.Input[bool] propagate: Whether or not this permission propagates down the
+               hierarchy to sub-entities.
+        :param pulumi.Input[str] role_id: The role id of the role to be given to the user on
+               the specified entity.
         :param pulumi.Input[str] user_or_group: The user/group getting the permission.
         """
         pulumi.set(__self__, "is_group", is_group)
@@ -689,7 +692,8 @@ class EntityPermissionsPermissionArgs:
     @pulumi.getter(name="isGroup")
     def is_group(self) -> pulumi.Input[bool]:
         """
-        Whether user_or_group field refers to a user or a group. True for a group and false for a user.
+        Whether `user_or_group` field refers to a user or a
+        group. True for a group and false for a user.
         """
         return pulumi.get(self, "is_group")
 
@@ -701,7 +705,8 @@ class EntityPermissionsPermissionArgs:
     @pulumi.getter
     def propagate(self) -> pulumi.Input[bool]:
         """
-        Whether or not this permission propagates down the hierarchy to sub-entities.
+        Whether or not this permission propagates down the
+        hierarchy to sub-entities.
         """
         return pulumi.get(self, "propagate")
 
@@ -713,7 +718,8 @@ class EntityPermissionsPermissionArgs:
     @pulumi.getter(name="roleId")
     def role_id(self) -> pulumi.Input[str]:
         """
-        The role id of the role to be given to the user on the specified entity.
+        The role id of the role to be given to the user on
+        the specified entity.
         """
         return pulumi.get(self, "role_id")
 

{pulumi_vsphere-4.11.0a1719961236 → pulumi_vsphere-4.11.0a1720619049}/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-4.11.0a1719961236 → pulumi_vsphere-4.11.0a1720619049}/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-4.11.0a1719961236 → pulumi_vsphere-4.11.0a1720619049}/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-4.11.0a1719961236 → pulumi_vsphere-4.11.0a1720619049}/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")
 

{pulumi_vsphere-4.11.0a1719961236 → pulumi_vsphere-4.11.0a1720619049}/pulumi_vsphere/distributed_virtual_switch.py

@@ -181,8 +181,7 @@ class DistributedVirtualSwitchArgs:
                with the VDS. Can be one of `legacyFiltering` or `snooping`.
         :param pulumi.Input[str] name: The name of the VDS.
         :param pulumi.Input[int] netflow_active_flow_timeout: The number of seconds after which active flows are forced to be exported to the collector.
-        :param pulumi.Input[str] netflow_collector_ip_address: IP address for the netflow collector, using IPv4 or IPv6. IPv6 is supported in vSphere Distributed Switch Version 6.0 or
-               later.
+        :param pulumi.Input[str] netflow_collector_ip_address: IP address for the netflow collector, using IPv4 or IPv6.
         :param pulumi.Input[int] netflow_collector_port: The port for the netflow collector.
         :param pulumi.Input[bool] netflow_enabled: Indicates whether to enable netflow on all ports.
         :param pulumi.Input[int] netflow_idle_flow_timeout: The number of seconds after which idle flows are forced to be exported to the collector.
@@ -201,8 +200,6 @@ class DistributedVirtualSwitchArgs:
         :param pulumi.Input[Sequence[pulumi.Input['DistributedVirtualSwitchPvlanMappingArgs']]] pvlan_mappings: A private VLAN (PVLAN) mapping.
         :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: The IDs of any tags to attach to this resource.
-               
-               > **NOTE:** Tagging support requires vCenter Server 6.0 or higher.
         :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] 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
@@ -1086,8 +1083,7 @@ class DistributedVirtualSwitchArgs:
     @pulumi.getter(name="netflowCollectorIpAddress")
     def netflow_collector_ip_address(self) -> Optional[pulumi.Input[str]]:
         """
-        IP address for the netflow collector, using IPv4 or IPv6. IPv6 is supported in vSphere Distributed Switch Version 6.0 or
-        later.
+        IP address for the netflow collector, using IPv4 or IPv6.
         """
         return pulumi.get(self, "netflow_collector_ip_address")
 
@@ -1293,8 +1289,6 @@ class DistributedVirtualSwitchArgs:
     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 Server 6.0 or higher.
         """
         return pulumi.get(self, "tags")
 
@@ -1743,8 +1737,7 @@ class _DistributedVirtualSwitchState:
                with the VDS. Can be one of `legacyFiltering` or `snooping`.
         :param pulumi.Input[str] name: The name of the VDS.
         :param pulumi.Input[int] netflow_active_flow_timeout: The number of seconds after which active flows are forced to be exported to the collector.
-        :param pulumi.Input[str] netflow_collector_ip_address: IP address for the netflow collector, using IPv4 or IPv6. IPv6 is supported in vSphere Distributed Switch Version 6.0 or
-               later.
+        :param pulumi.Input[str] netflow_collector_ip_address: IP address for the netflow collector, using IPv4 or IPv6.
         :param pulumi.Input[int] netflow_collector_port: The port for the netflow collector.
         :param pulumi.Input[bool] netflow_enabled: Indicates whether to enable netflow on all ports.
         :param pulumi.Input[int] netflow_idle_flow_timeout: The number of seconds after which idle flows are forced to be exported to the collector.
@@ -1763,8 +1756,6 @@ class _DistributedVirtualSwitchState:
         :param pulumi.Input[Sequence[pulumi.Input['DistributedVirtualSwitchPvlanMappingArgs']]] pvlan_mappings: A private VLAN (PVLAN) mapping.
         :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: The IDs of any tags to attach to this resource.
-               
-               > **NOTE:** Tagging support requires vCenter Server 6.0 or higher.
         :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] 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
@@ -2664,8 +2655,7 @@ class _DistributedVirtualSwitchState:
     @pulumi.getter(name="netflowCollectorIpAddress")
     def netflow_collector_ip_address(self) -> Optional[pulumi.Input[str]]:
         """
-        IP address for the netflow collector, using IPv4 or IPv6. IPv6 is supported in vSphere Distributed Switch Version 6.0 or
-        later.
+        IP address for the netflow collector, using IPv4 or IPv6.
         """
         return pulumi.get(self, "netflow_collector_ip_address")
 
@@ -2871,8 +2861,6 @@ class _DistributedVirtualSwitchState:
     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 Server 6.0 or higher.
         """
         return pulumi.get(self, "tags")
 
@@ -3323,8 +3311,7 @@ class DistributedVirtualSwitch(pulumi.CustomResource):
                with the VDS. Can be one of `legacyFiltering` or `snooping`.
         :param pulumi.Input[str] name: The name of the VDS.
         :param pulumi.Input[int] netflow_active_flow_timeout: The number of seconds after which active flows are forced to be exported to the collector.
-        :param pulumi.Input[str] netflow_collector_ip_address: IP address for the netflow collector, using IPv4 or IPv6. IPv6 is supported in vSphere Distributed Switch Version 6.0 or
-               later.
+        :param pulumi.Input[str] netflow_collector_ip_address: IP address for the netflow collector, using IPv4 or IPv6.
         :param pulumi.Input[int] netflow_collector_port: The port for the netflow collector.
         :param pulumi.Input[bool] netflow_enabled: Indicates whether to enable netflow on all ports.
         :param pulumi.Input[int] netflow_idle_flow_timeout: The number of seconds after which idle flows are forced to be exported to the collector.
@@ -3343,8 +3330,6 @@ class DistributedVirtualSwitch(pulumi.CustomResource):
         :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DistributedVirtualSwitchPvlanMappingArgs']]]] pvlan_mappings: A private VLAN (PVLAN) mapping.
         :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: The IDs of any tags to attach to this resource.
-               
-               > **NOTE:** Tagging support requires vCenter Server 6.0 or higher.
         :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] 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
@@ -3779,8 +3764,7 @@ class DistributedVirtualSwitch(pulumi.CustomResource):
                with the VDS. Can be one of `legacyFiltering` or `snooping`.
         :param pulumi.Input[str] name: The name of the VDS.
         :param pulumi.Input[int] netflow_active_flow_timeout: The number of seconds after which active flows are forced to be exported to the collector.
-        :param pulumi.Input[str] netflow_collector_ip_address: IP address for the netflow collector, using IPv4 or IPv6. IPv6 is supported in vSphere Distributed Switch Version 6.0 or
-               later.
+        :param pulumi.Input[str] netflow_collector_ip_address: IP address for the netflow collector, using IPv4 or IPv6.
         :param pulumi.Input[int] netflow_collector_port: The port for the netflow collector.
         :param pulumi.Input[bool] netflow_enabled: Indicates whether to enable netflow on all ports.
         :param pulumi.Input[int] netflow_idle_flow_timeout: The number of seconds after which idle flows are forced to be exported to the collector.
@@ -3799,8 +3783,6 @@ class DistributedVirtualSwitch(pulumi.CustomResource):
         :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DistributedVirtualSwitchPvlanMappingArgs']]]] pvlan_mappings: A private VLAN (PVLAN) mapping.
         :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: The IDs of any tags to attach to this resource.
-               
-               > **NOTE:** Tagging support requires vCenter Server 6.0 or higher.
         :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] 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
@@ -4390,8 +4372,7 @@ class DistributedVirtualSwitch(pulumi.CustomResource):
     @pulumi.getter(name="netflowCollectorIpAddress")
     def netflow_collector_ip_address(self) -> pulumi.Output[Optional[str]]:
         """
-        IP address for the netflow collector, using IPv4 or IPv6. IPv6 is supported in vSphere Distributed Switch Version 6.0 or
-        later.
+        IP address for the netflow collector, using IPv4 or IPv6.
         """
         return pulumi.get(self, "netflow_collector_ip_address")
 
@@ -4529,8 +4510,6 @@ class DistributedVirtualSwitch(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 Server 6.0 or higher.
         """
         return pulumi.get(self, "tags")