pulumi-vsphere 4.10.0a1710245029__py3-none-any.whl → 4.10.2__py3-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.

Potentially problematic release.

This version of pulumi-vsphere might be problematic. Click here for more details.

Files changed (64) hide show
  1. pulumi_vsphere/__init__.py +28 -0
  2. pulumi_vsphere/_inputs.py +566 -236
  3. pulumi_vsphere/_utilities.py +35 -0
  4. pulumi_vsphere/compute_cluster.py +747 -1477
  5. pulumi_vsphere/compute_cluster_vm_affinity_rule.py +28 -20
  6. pulumi_vsphere/datacenter.py +33 -40
  7. pulumi_vsphere/datastore_cluster.py +154 -364
  8. pulumi_vsphere/distributed_port_group.py +126 -182
  9. pulumi_vsphere/distributed_virtual_switch.py +301 -819
  10. pulumi_vsphere/entity_permissions.py +56 -35
  11. pulumi_vsphere/file.py +16 -24
  12. pulumi_vsphere/folder.py +7 -28
  13. pulumi_vsphere/get_compute_cluster.py +0 -4
  14. pulumi_vsphere/get_compute_cluster_host_group.py +20 -20
  15. pulumi_vsphere/get_content_library.py +10 -10
  16. pulumi_vsphere/get_content_library_item.py +12 -8
  17. pulumi_vsphere/get_custom_attribute.py +0 -4
  18. pulumi_vsphere/get_datacenter.py +0 -4
  19. pulumi_vsphere/get_datastore.py +9 -13
  20. pulumi_vsphere/get_datastore_cluster.py +0 -4
  21. pulumi_vsphere/get_datastore_stats.py +38 -44
  22. pulumi_vsphere/get_distributed_virtual_switch.py +2 -4
  23. pulumi_vsphere/get_dynamic.py +18 -20
  24. pulumi_vsphere/get_folder.py +10 -6
  25. pulumi_vsphere/get_guest_os_customization.py +8 -47
  26. pulumi_vsphere/get_host.py +0 -4
  27. pulumi_vsphere/get_host_base_images.py +97 -0
  28. pulumi_vsphere/get_host_pci_device.py +8 -14
  29. pulumi_vsphere/get_host_thumbprint.py +12 -16
  30. pulumi_vsphere/get_host_vgpu_profile.py +4 -10
  31. pulumi_vsphere/get_license.py +2 -5
  32. pulumi_vsphere/get_network.py +14 -18
  33. pulumi_vsphere/get_policy.py +0 -4
  34. pulumi_vsphere/get_resource_pool.py +14 -18
  35. pulumi_vsphere/get_role.py +4 -8
  36. pulumi_vsphere/get_tag.py +0 -4
  37. pulumi_vsphere/get_tag_category.py +0 -4
  38. pulumi_vsphere/get_vapp_container.py +0 -4
  39. pulumi_vsphere/get_virtual_machine.py +58 -41
  40. pulumi_vsphere/get_vmfs_disks.py +0 -4
  41. pulumi_vsphere/guest_os_customization.py +50 -0
  42. pulumi_vsphere/ha_vm_override.py +189 -378
  43. pulumi_vsphere/host.py +0 -20
  44. pulumi_vsphere/host_port_group.py +12 -24
  45. pulumi_vsphere/host_virtual_switch.py +140 -287
  46. pulumi_vsphere/license.py +0 -32
  47. pulumi_vsphere/nas_datastore.py +7 -7
  48. pulumi_vsphere/offline_software_depot.py +180 -0
  49. pulumi_vsphere/outputs.py +591 -270
  50. pulumi_vsphere/provider.py +2 -6
  51. pulumi_vsphere/pulumi-plugin.json +2 -1
  52. pulumi_vsphere/resource_pool.py +50 -24
  53. pulumi_vsphere/supervisor.py +962 -0
  54. pulumi_vsphere/virtual_disk.py +14 -20
  55. pulumi_vsphere/virtual_machine.py +580 -809
  56. pulumi_vsphere/virtual_machine_class.py +442 -0
  57. pulumi_vsphere/virtual_machine_snapshot.py +8 -12
  58. pulumi_vsphere/vm_storage_policy.py +74 -86
  59. pulumi_vsphere/vnic.py +61 -77
  60. {pulumi_vsphere-4.10.0a1710245029.dist-info → pulumi_vsphere-4.10.2.dist-info}/METADATA +1 -1
  61. pulumi_vsphere-4.10.2.dist-info/RECORD +86 -0
  62. {pulumi_vsphere-4.10.0a1710245029.dist-info → pulumi_vsphere-4.10.2.dist-info}/WHEEL +1 -1
  63. pulumi_vsphere-4.10.0a1710245029.dist-info/RECORD +0 -82
  64. {pulumi_vsphere-4.10.0a1710245029.dist-info → pulumi_vsphere-4.10.2.dist-info}/top_level.txt +0 -0
pulumi_vsphere/distributed_port_group.py CHANGED
@@ -78,11 +78,17 @@ class DistributedPortGroupArgs:
78
78
  may lead to errors when the port count grows past the amount specified. If you
79
79
  specify `number_of_ports`, you may wish to set `auto_expand` to `false`.
80
80
  :param pulumi.Input[bool] block_all_ports: Indicates whether to block all ports by default.
81
- :param pulumi.Input[bool] block_override_allowed: Allow the port shutdown
82
- policy to be overridden on an individual port.
81
+ :param pulumi.Input[bool] block_override_allowed: Allow the blocked setting of an individual port to override the setting in the portgroup.
83
82
  :param pulumi.Input[bool] check_beacon: Enable beacon probing on the ports this policy applies to.
84
83
  :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to attribute
84
+ <<<<<<< HEAD
85
+ value string to set for port group. See [here][docs-setting-custom-attributes]
86
+ for a reference on how to set values for custom attributes.
87
+
88
+ [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
89
+ =======
85
90
  value string to set for port group.
91
+ >>>>>>> 69c6e040 (fork)
86
92
 
87
93
  > **NOTE:** Custom attributes are not supported on direct ESXi host
88
94
  connections and require vCenter Server.
@@ -99,52 +105,38 @@ class DistributedPortGroupArgs:
99
105
  :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.
100
106
  :param pulumi.Input[bool] lacp_enabled: Whether or not to enable LACP on all uplink ports.
101
107
  :param pulumi.Input[str] lacp_mode: The uplink LACP mode to use. Can be one of active or passive.
102
- :param pulumi.Input[bool] live_port_moving_allowed: Allow a port in this port group to be
103
- moved to another port group while it is connected.
108
+ :param pulumi.Input[bool] live_port_moving_allowed: Allow a live port to be moved in and out of the portgroup.
104
109
  :param pulumi.Input[str] name: The name of the port group.
105
110
  :param pulumi.Input[bool] netflow_enabled: Indicates whether to enable netflow on all ports.
106
- :param pulumi.Input[bool] netflow_override_allowed: Allow the
107
- [Netflow policy][netflow-policy] on this port group to be overridden on an
108
- individual port.
111
+ :param pulumi.Input[bool] netflow_override_allowed: Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
109
112
  :param pulumi.Input[str] network_resource_pool_key: The key of a network resource pool
110
113
  to associate with this port group. The default is `-1`, which implies no
111
114
  association.
112
- :param pulumi.Input[bool] network_resource_pool_override_allowed: Allow the network
113
- resource pool set on this port group to be overridden on an individual port.
115
+ :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.
114
116
  :param pulumi.Input[bool] notify_switches: If true, the teaming policy will notify the broadcast network of a NIC failover, triggering cache updates.
115
117
  :param pulumi.Input[int] number_of_ports: The number of ports available on this port
116
118
  group. Cannot be decreased below the amount of used ports on the port group.
117
- :param pulumi.Input[bool] port_config_reset_at_disconnect: Reset a port's settings to the
118
- settings defined on this port group policy when the port disconnects.
119
+ :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.
119
120
  :param pulumi.Input[str] port_name_format: An optional formatting policy for naming of
120
121
  the ports in this port group. See the `portNameFormat` attribute listed
121
122
  [here][ext-vsphere-portname-format] for details on the format syntax.
122
123
 
123
- [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
124
+ [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
124
125
  :param pulumi.Input[int] port_private_secondary_vlan_id: The secondary VLAN ID for this port.
125
- :param pulumi.Input[bool] security_policy_override_allowed: Allow the
126
- [security policy settings][sec-policy-settings] defined in this port group
127
- policy to be overridden on an individual port.
128
- :param pulumi.Input[bool] shaping_override_allowed: Allow the
129
- [traffic shaping options][traffic-shaping-settings] on this port group policy
130
- to be overridden on an individual port.
126
+ :param pulumi.Input[bool] security_policy_override_allowed: Allow security policy settings on a port to override those on the portgroup.
127
+ :param pulumi.Input[bool] shaping_override_allowed: Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
131
128
  :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.
132
129
  :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: A list of tag IDs to apply to this object.
133
130
  :param pulumi.Input[str] teaming_policy: The network adapter teaming policy. Can be one of loadbalance_ip, loadbalance_srcmac, loadbalance_srcid,
134
131
  failover_explicit, or loadbalance_loadbased.
135
- :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any traffic filters on
136
- this port group to be overridden on an individual port.
132
+ :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any filter policies set on the individual port to override those in the portgroup.
137
133
  :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
138
134
  forwarded done by the switch.
139
135
  :param pulumi.Input[str] type: The port group type. Can be one of `earlyBinding` (static
140
136
  binding) or `ephemeral`. Default: `earlyBinding`.
141
- :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the
142
- [uplink teaming options][uplink-teaming-settings] on this port group to be
143
- overridden on an individual port.
137
+ :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the uplink teaming policies on a port to override those on the portgroup.
144
138
  :param pulumi.Input[int] vlan_id: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
145
- :param pulumi.Input[bool] vlan_override_allowed: Allow the
146
- [VLAN settings][vlan-settings] on this port group to be overridden on an
147
- individual port.
139
+ :param pulumi.Input[bool] vlan_override_allowed: Allow the VLAN configuration on a port to override those on the portgroup.
148
140
  :param pulumi.Input[Sequence[pulumi.Input['DistributedPortGroupVlanRangeArgs']]] vlan_ranges: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
149
141
  """
150
142
  pulumi.set(__self__, "distributed_virtual_switch_uuid", distributed_virtual_switch_uuid)
@@ -334,8 +326,7 @@ class DistributedPortGroupArgs:
334
326
  @pulumi.getter(name="blockOverrideAllowed")
335
327
  def block_override_allowed(self) -> Optional[pulumi.Input[bool]]:
336
328
  """
337
- Allow the port shutdown
338
- policy to be overridden on an individual port.
329
+ Allow the blocked setting of an individual port to override the setting in the portgroup.
339
330
  """
340
331
  return pulumi.get(self, "block_override_allowed")
341
332
 
@@ -360,7 +351,14 @@ class DistributedPortGroupArgs:
360
351
  def custom_attributes(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]:
361
352
  """
362
353
  Map of custom attribute ids to attribute
354
+ <<<<<<< HEAD
355
+ value string to set for port group. See [here][docs-setting-custom-attributes]
356
+ for a reference on how to set values for custom attributes.
357
+
358
+ [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
359
+ =======
363
360
  value string to set for port group.
361
+ >>>>>>> 69c6e040 (fork)
364
362
 
365
363
  > **NOTE:** Custom attributes are not supported on direct ESXi host
366
364
  connections and require vCenter Server.
@@ -531,8 +529,7 @@ class DistributedPortGroupArgs:
531
529
  @pulumi.getter(name="livePortMovingAllowed")
532
530
  def live_port_moving_allowed(self) -> Optional[pulumi.Input[bool]]:
533
531
  """
534
- Allow a port in this port group to be
535
- moved to another port group while it is connected.
532
+ Allow a live port to be moved in and out of the portgroup.
536
533
  """
537
534
  return pulumi.get(self, "live_port_moving_allowed")
538
535
 
@@ -568,9 +565,7 @@ class DistributedPortGroupArgs:
568
565
  @pulumi.getter(name="netflowOverrideAllowed")
569
566
  def netflow_override_allowed(self) -> Optional[pulumi.Input[bool]]:
570
567
  """
571
- Allow the
572
- [Netflow policy][netflow-policy] on this port group to be overridden on an
573
- individual port.
568
+ Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
574
569
  """
575
570
  return pulumi.get(self, "netflow_override_allowed")
576
571
 
@@ -596,8 +591,7 @@ class DistributedPortGroupArgs:
596
591
  @pulumi.getter(name="networkResourcePoolOverrideAllowed")
597
592
  def network_resource_pool_override_allowed(self) -> Optional[pulumi.Input[bool]]:
598
593
  """
599
- Allow the network
600
- resource pool set on this port group to be overridden on an individual port.
594
+ Allow the network resource pool of an individual port to override the setting in the portgroup.
601
595
  """
602
596
  return pulumi.get(self, "network_resource_pool_override_allowed")
603
597
 
@@ -634,8 +628,7 @@ class DistributedPortGroupArgs:
634
628
  @pulumi.getter(name="portConfigResetAtDisconnect")
635
629
  def port_config_reset_at_disconnect(self) -> Optional[pulumi.Input[bool]]:
636
630
  """
637
- Reset a port's settings to the
638
- settings defined on this port group policy when the port disconnects.
631
+ Reset the setting of any ports in this portgroup back to the default setting when the port disconnects.
639
632
  """
640
633
  return pulumi.get(self, "port_config_reset_at_disconnect")
641
634
 
@@ -651,7 +644,7 @@ class DistributedPortGroupArgs:
651
644
  the ports in this port group. See the `portNameFormat` attribute listed
652
645
  [here][ext-vsphere-portname-format] for details on the format syntax.
653
646
 
654
- [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
647
+ [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
655
648
  """
656
649
  return pulumi.get(self, "port_name_format")
657
650
 
@@ -675,9 +668,7 @@ class DistributedPortGroupArgs:
675
668
  @pulumi.getter(name="securityPolicyOverrideAllowed")
676
669
  def security_policy_override_allowed(self) -> Optional[pulumi.Input[bool]]:
677
670
  """
678
- Allow the
679
- [security policy settings][sec-policy-settings] defined in this port group
680
- policy to be overridden on an individual port.
671
+ Allow security policy settings on a port to override those on the portgroup.
681
672
  """
682
673
  return pulumi.get(self, "security_policy_override_allowed")
683
674
 
@@ -689,9 +680,7 @@ class DistributedPortGroupArgs:
689
680
  @pulumi.getter(name="shapingOverrideAllowed")
690
681
  def shaping_override_allowed(self) -> Optional[pulumi.Input[bool]]:
691
682
  """
692
- Allow the
693
- [traffic shaping options][traffic-shaping-settings] on this port group policy
694
- to be overridden on an individual port.
683
+ Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
695
684
  """
696
685
  return pulumi.get(self, "shaping_override_allowed")
697
686
 
@@ -740,8 +729,7 @@ class DistributedPortGroupArgs:
740
729
  @pulumi.getter(name="trafficFilterOverrideAllowed")
741
730
  def traffic_filter_override_allowed(self) -> Optional[pulumi.Input[bool]]:
742
731
  """
743
- Allow any traffic filters on
744
- this port group to be overridden on an individual port.
732
+ Allow any filter policies set on the individual port to override those in the portgroup.
745
733
  """
746
734
  return pulumi.get(self, "traffic_filter_override_allowed")
747
735
 
@@ -779,9 +767,7 @@ class DistributedPortGroupArgs:
779
767
  @pulumi.getter(name="uplinkTeamingOverrideAllowed")
780
768
  def uplink_teaming_override_allowed(self) -> Optional[pulumi.Input[bool]]:
781
769
  """
782
- Allow the
783
- [uplink teaming options][uplink-teaming-settings] on this port group to be
784
- overridden on an individual port.
770
+ Allow the uplink teaming policies on a port to override those on the portgroup.
785
771
  """
786
772
  return pulumi.get(self, "uplink_teaming_override_allowed")
787
773
 
@@ -805,9 +791,7 @@ class DistributedPortGroupArgs:
805
791
  @pulumi.getter(name="vlanOverrideAllowed")
806
792
  def vlan_override_allowed(self) -> Optional[pulumi.Input[bool]]:
807
793
  """
808
- Allow the
809
- [VLAN settings][vlan-settings] on this port group to be overridden on an
810
- individual port.
794
+ Allow the VLAN configuration on a port to override those on the portgroup.
811
795
  """
812
796
  return pulumi.get(self, "vlan_override_allowed")
813
797
 
@@ -893,13 +877,19 @@ class _DistributedPortGroupState:
893
877
  may lead to errors when the port count grows past the amount specified. If you
894
878
  specify `number_of_ports`, you may wish to set `auto_expand` to `false`.
895
879
  :param pulumi.Input[bool] block_all_ports: Indicates whether to block all ports by default.
896
- :param pulumi.Input[bool] block_override_allowed: Allow the port shutdown
897
- policy to be overridden on an individual port.
880
+ :param pulumi.Input[bool] block_override_allowed: Allow the blocked setting of an individual port to override the setting in the portgroup.
898
881
  :param pulumi.Input[bool] check_beacon: Enable beacon probing on the ports this policy applies to.
899
882
  :param pulumi.Input[str] config_version: The current version of the port group configuration,
900
883
  incremented by subsequent updates to the port group.
901
884
  :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to attribute
885
+ <<<<<<< HEAD
886
+ value string to set for port group. See [here][docs-setting-custom-attributes]
887
+ for a reference on how to set values for custom attributes.
888
+
889
+ [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
890
+ =======
902
891
  value string to set for port group.
892
+ >>>>>>> 69c6e040 (fork)
903
893
 
904
894
  > **NOTE:** Custom attributes are not supported on direct ESXi host
905
895
  connections and require vCenter Server.
@@ -919,52 +909,38 @@ class _DistributedPortGroupState:
919
909
  :param pulumi.Input[str] key: The generated UUID of the port group.
920
910
  :param pulumi.Input[bool] lacp_enabled: Whether or not to enable LACP on all uplink ports.
921
911
  :param pulumi.Input[str] lacp_mode: The uplink LACP mode to use. Can be one of active or passive.
922
- :param pulumi.Input[bool] live_port_moving_allowed: Allow a port in this port group to be
923
- moved to another port group while it is connected.
912
+ :param pulumi.Input[bool] live_port_moving_allowed: Allow a live port to be moved in and out of the portgroup.
924
913
  :param pulumi.Input[str] name: The name of the port group.
925
914
  :param pulumi.Input[bool] netflow_enabled: Indicates whether to enable netflow on all ports.
926
- :param pulumi.Input[bool] netflow_override_allowed: Allow the
927
- [Netflow policy][netflow-policy] on this port group to be overridden on an
928
- individual port.
915
+ :param pulumi.Input[bool] netflow_override_allowed: Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
929
916
  :param pulumi.Input[str] network_resource_pool_key: The key of a network resource pool
930
917
  to associate with this port group. The default is `-1`, which implies no
931
918
  association.
932
- :param pulumi.Input[bool] network_resource_pool_override_allowed: Allow the network
933
- resource pool set on this port group to be overridden on an individual port.
919
+ :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.
934
920
  :param pulumi.Input[bool] notify_switches: If true, the teaming policy will notify the broadcast network of a NIC failover, triggering cache updates.
935
921
  :param pulumi.Input[int] number_of_ports: The number of ports available on this port
936
922
  group. Cannot be decreased below the amount of used ports on the port group.
937
- :param pulumi.Input[bool] port_config_reset_at_disconnect: Reset a port's settings to the
938
- settings defined on this port group policy when the port disconnects.
923
+ :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.
939
924
  :param pulumi.Input[str] port_name_format: An optional formatting policy for naming of
940
925
  the ports in this port group. See the `portNameFormat` attribute listed
941
926
  [here][ext-vsphere-portname-format] for details on the format syntax.
942
927
 
943
- [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
928
+ [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
944
929
  :param pulumi.Input[int] port_private_secondary_vlan_id: The secondary VLAN ID for this port.
945
- :param pulumi.Input[bool] security_policy_override_allowed: Allow the
946
- [security policy settings][sec-policy-settings] defined in this port group
947
- policy to be overridden on an individual port.
948
- :param pulumi.Input[bool] shaping_override_allowed: Allow the
949
- [traffic shaping options][traffic-shaping-settings] on this port group policy
950
- to be overridden on an individual port.
930
+ :param pulumi.Input[bool] security_policy_override_allowed: Allow security policy settings on a port to override those on the portgroup.
931
+ :param pulumi.Input[bool] shaping_override_allowed: Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
951
932
  :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.
952
933
  :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: A list of tag IDs to apply to this object.
953
934
  :param pulumi.Input[str] teaming_policy: The network adapter teaming policy. Can be one of loadbalance_ip, loadbalance_srcmac, loadbalance_srcid,
954
935
  failover_explicit, or loadbalance_loadbased.
955
- :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any traffic filters on
956
- this port group to be overridden on an individual port.
936
+ :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any filter policies set on the individual port to override those in the portgroup.
957
937
  :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
958
938
  forwarded done by the switch.
959
939
  :param pulumi.Input[str] type: The port group type. Can be one of `earlyBinding` (static
960
940
  binding) or `ephemeral`. Default: `earlyBinding`.
961
- :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the
962
- [uplink teaming options][uplink-teaming-settings] on this port group to be
963
- overridden on an individual port.
941
+ :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the uplink teaming policies on a port to override those on the portgroup.
964
942
  :param pulumi.Input[int] vlan_id: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
965
- :param pulumi.Input[bool] vlan_override_allowed: Allow the
966
- [VLAN settings][vlan-settings] on this port group to be overridden on an
967
- individual port.
943
+ :param pulumi.Input[bool] vlan_override_allowed: Allow the VLAN configuration on a port to override those on the portgroup.
968
944
  :param pulumi.Input[Sequence[pulumi.Input['DistributedPortGroupVlanRangeArgs']]] vlan_ranges: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
969
945
  """
970
946
  if active_uplinks is not None:
@@ -1146,8 +1122,7 @@ class _DistributedPortGroupState:
1146
1122
  @pulumi.getter(name="blockOverrideAllowed")
1147
1123
  def block_override_allowed(self) -> Optional[pulumi.Input[bool]]:
1148
1124
  """
1149
- Allow the port shutdown
1150
- policy to be overridden on an individual port.
1125
+ Allow the blocked setting of an individual port to override the setting in the portgroup.
1151
1126
  """
1152
1127
  return pulumi.get(self, "block_override_allowed")
1153
1128
 
@@ -1185,7 +1160,14 @@ class _DistributedPortGroupState:
1185
1160
  def custom_attributes(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]:
1186
1161
  """
1187
1162
  Map of custom attribute ids to attribute
1163
+ <<<<<<< HEAD
1164
+ value string to set for port group. See [here][docs-setting-custom-attributes]
1165
+ for a reference on how to set values for custom attributes.
1166
+
1167
+ [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
1168
+ =======
1188
1169
  value string to set for port group.
1170
+ >>>>>>> 69c6e040 (fork)
1189
1171
 
1190
1172
  > **NOTE:** Custom attributes are not supported on direct ESXi host
1191
1173
  connections and require vCenter Server.
@@ -1381,8 +1363,7 @@ class _DistributedPortGroupState:
1381
1363
  @pulumi.getter(name="livePortMovingAllowed")
1382
1364
  def live_port_moving_allowed(self) -> Optional[pulumi.Input[bool]]:
1383
1365
  """
1384
- Allow a port in this port group to be
1385
- moved to another port group while it is connected.
1366
+ Allow a live port to be moved in and out of the portgroup.
1386
1367
  """
1387
1368
  return pulumi.get(self, "live_port_moving_allowed")
1388
1369
 
@@ -1418,9 +1399,7 @@ class _DistributedPortGroupState:
1418
1399
  @pulumi.getter(name="netflowOverrideAllowed")
1419
1400
  def netflow_override_allowed(self) -> Optional[pulumi.Input[bool]]:
1420
1401
  """
1421
- Allow the
1422
- [Netflow policy][netflow-policy] on this port group to be overridden on an
1423
- individual port.
1402
+ Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
1424
1403
  """
1425
1404
  return pulumi.get(self, "netflow_override_allowed")
1426
1405
 
@@ -1446,8 +1425,7 @@ class _DistributedPortGroupState:
1446
1425
  @pulumi.getter(name="networkResourcePoolOverrideAllowed")
1447
1426
  def network_resource_pool_override_allowed(self) -> Optional[pulumi.Input[bool]]:
1448
1427
  """
1449
- Allow the network
1450
- resource pool set on this port group to be overridden on an individual port.
1428
+ Allow the network resource pool of an individual port to override the setting in the portgroup.
1451
1429
  """
1452
1430
  return pulumi.get(self, "network_resource_pool_override_allowed")
1453
1431
 
@@ -1484,8 +1462,7 @@ class _DistributedPortGroupState:
1484
1462
  @pulumi.getter(name="portConfigResetAtDisconnect")
1485
1463
  def port_config_reset_at_disconnect(self) -> Optional[pulumi.Input[bool]]:
1486
1464
  """
1487
- Reset a port's settings to the
1488
- settings defined on this port group policy when the port disconnects.
1465
+ Reset the setting of any ports in this portgroup back to the default setting when the port disconnects.
1489
1466
  """
1490
1467
  return pulumi.get(self, "port_config_reset_at_disconnect")
1491
1468
 
@@ -1501,7 +1478,7 @@ class _DistributedPortGroupState:
1501
1478
  the ports in this port group. See the `portNameFormat` attribute listed
1502
1479
  [here][ext-vsphere-portname-format] for details on the format syntax.
1503
1480
 
1504
- [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
1481
+ [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
1505
1482
  """
1506
1483
  return pulumi.get(self, "port_name_format")
1507
1484
 
@@ -1525,9 +1502,7 @@ class _DistributedPortGroupState:
1525
1502
  @pulumi.getter(name="securityPolicyOverrideAllowed")
1526
1503
  def security_policy_override_allowed(self) -> Optional[pulumi.Input[bool]]:
1527
1504
  """
1528
- Allow the
1529
- [security policy settings][sec-policy-settings] defined in this port group
1530
- policy to be overridden on an individual port.
1505
+ Allow security policy settings on a port to override those on the portgroup.
1531
1506
  """
1532
1507
  return pulumi.get(self, "security_policy_override_allowed")
1533
1508
 
@@ -1539,9 +1514,7 @@ class _DistributedPortGroupState:
1539
1514
  @pulumi.getter(name="shapingOverrideAllowed")
1540
1515
  def shaping_override_allowed(self) -> Optional[pulumi.Input[bool]]:
1541
1516
  """
1542
- Allow the
1543
- [traffic shaping options][traffic-shaping-settings] on this port group policy
1544
- to be overridden on an individual port.
1517
+ Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
1545
1518
  """
1546
1519
  return pulumi.get(self, "shaping_override_allowed")
1547
1520
 
@@ -1590,8 +1563,7 @@ class _DistributedPortGroupState:
1590
1563
  @pulumi.getter(name="trafficFilterOverrideAllowed")
1591
1564
  def traffic_filter_override_allowed(self) -> Optional[pulumi.Input[bool]]:
1592
1565
  """
1593
- Allow any traffic filters on
1594
- this port group to be overridden on an individual port.
1566
+ Allow any filter policies set on the individual port to override those in the portgroup.
1595
1567
  """
1596
1568
  return pulumi.get(self, "traffic_filter_override_allowed")
1597
1569
 
@@ -1629,9 +1601,7 @@ class _DistributedPortGroupState:
1629
1601
  @pulumi.getter(name="uplinkTeamingOverrideAllowed")
1630
1602
  def uplink_teaming_override_allowed(self) -> Optional[pulumi.Input[bool]]:
1631
1603
  """
1632
- Allow the
1633
- [uplink teaming options][uplink-teaming-settings] on this port group to be
1634
- overridden on an individual port.
1604
+ Allow the uplink teaming policies on a port to override those on the portgroup.
1635
1605
  """
1636
1606
  return pulumi.get(self, "uplink_teaming_override_allowed")
1637
1607
 
@@ -1655,9 +1625,7 @@ class _DistributedPortGroupState:
1655
1625
  @pulumi.getter(name="vlanOverrideAllowed")
1656
1626
  def vlan_override_allowed(self) -> Optional[pulumi.Input[bool]]:
1657
1627
  """
1658
- Allow the
1659
- [VLAN settings][vlan-settings] on this port group to be overridden on an
1660
- individual port.
1628
+ Allow the VLAN configuration on a port to override those on the portgroup.
1661
1629
  """
1662
1630
  return pulumi.get(self, "vlan_override_allowed")
1663
1631
 
@@ -1746,11 +1714,17 @@ class DistributedPortGroup(pulumi.CustomResource):
1746
1714
  may lead to errors when the port count grows past the amount specified. If you
1747
1715
  specify `number_of_ports`, you may wish to set `auto_expand` to `false`.
1748
1716
  :param pulumi.Input[bool] block_all_ports: Indicates whether to block all ports by default.
1749
- :param pulumi.Input[bool] block_override_allowed: Allow the port shutdown
1750
- policy to be overridden on an individual port.
1717
+ :param pulumi.Input[bool] block_override_allowed: Allow the blocked setting of an individual port to override the setting in the portgroup.
1751
1718
  :param pulumi.Input[bool] check_beacon: Enable beacon probing on the ports this policy applies to.
1752
1719
  :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to attribute
1720
+ <<<<<<< HEAD
1721
+ value string to set for port group. See [here][docs-setting-custom-attributes]
1722
+ for a reference on how to set values for custom attributes.
1723
+
1724
+ [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
1725
+ =======
1753
1726
  value string to set for port group.
1727
+ >>>>>>> 69c6e040 (fork)
1754
1728
 
1755
1729
  > **NOTE:** Custom attributes are not supported on direct ESXi host
1756
1730
  connections and require vCenter Server.
@@ -1769,52 +1743,38 @@ class DistributedPortGroup(pulumi.CustomResource):
1769
1743
  :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.
1770
1744
  :param pulumi.Input[bool] lacp_enabled: Whether or not to enable LACP on all uplink ports.
1771
1745
  :param pulumi.Input[str] lacp_mode: The uplink LACP mode to use. Can be one of active or passive.
1772
- :param pulumi.Input[bool] live_port_moving_allowed: Allow a port in this port group to be
1773
- moved to another port group while it is connected.
1746
+ :param pulumi.Input[bool] live_port_moving_allowed: Allow a live port to be moved in and out of the portgroup.
1774
1747
  :param pulumi.Input[str] name: The name of the port group.
1775
1748
  :param pulumi.Input[bool] netflow_enabled: Indicates whether to enable netflow on all ports.
1776
- :param pulumi.Input[bool] netflow_override_allowed: Allow the
1777
- [Netflow policy][netflow-policy] on this port group to be overridden on an
1778
- individual port.
1749
+ :param pulumi.Input[bool] netflow_override_allowed: Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
1779
1750
  :param pulumi.Input[str] network_resource_pool_key: The key of a network resource pool
1780
1751
  to associate with this port group. The default is `-1`, which implies no
1781
1752
  association.
1782
- :param pulumi.Input[bool] network_resource_pool_override_allowed: Allow the network
1783
- resource pool set on this port group to be overridden on an individual port.
1753
+ :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.
1784
1754
  :param pulumi.Input[bool] notify_switches: If true, the teaming policy will notify the broadcast network of a NIC failover, triggering cache updates.
1785
1755
  :param pulumi.Input[int] number_of_ports: The number of ports available on this port
1786
1756
  group. Cannot be decreased below the amount of used ports on the port group.
1787
- :param pulumi.Input[bool] port_config_reset_at_disconnect: Reset a port's settings to the
1788
- settings defined on this port group policy when the port disconnects.
1757
+ :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.
1789
1758
  :param pulumi.Input[str] port_name_format: An optional formatting policy for naming of
1790
1759
  the ports in this port group. See the `portNameFormat` attribute listed
1791
1760
  [here][ext-vsphere-portname-format] for details on the format syntax.
1792
1761
 
1793
- [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
1762
+ [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
1794
1763
  :param pulumi.Input[int] port_private_secondary_vlan_id: The secondary VLAN ID for this port.
1795
- :param pulumi.Input[bool] security_policy_override_allowed: Allow the
1796
- [security policy settings][sec-policy-settings] defined in this port group
1797
- policy to be overridden on an individual port.
1798
- :param pulumi.Input[bool] shaping_override_allowed: Allow the
1799
- [traffic shaping options][traffic-shaping-settings] on this port group policy
1800
- to be overridden on an individual port.
1764
+ :param pulumi.Input[bool] security_policy_override_allowed: Allow security policy settings on a port to override those on the portgroup.
1765
+ :param pulumi.Input[bool] shaping_override_allowed: Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
1801
1766
  :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.
1802
1767
  :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: A list of tag IDs to apply to this object.
1803
1768
  :param pulumi.Input[str] teaming_policy: The network adapter teaming policy. Can be one of loadbalance_ip, loadbalance_srcmac, loadbalance_srcid,
1804
1769
  failover_explicit, or loadbalance_loadbased.
1805
- :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any traffic filters on
1806
- this port group to be overridden on an individual port.
1770
+ :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any filter policies set on the individual port to override those in the portgroup.
1807
1771
  :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
1808
1772
  forwarded done by the switch.
1809
1773
  :param pulumi.Input[str] type: The port group type. Can be one of `earlyBinding` (static
1810
1774
  binding) or `ephemeral`. Default: `earlyBinding`.
1811
- :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the
1812
- [uplink teaming options][uplink-teaming-settings] on this port group to be
1813
- overridden on an individual port.
1775
+ :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the uplink teaming policies on a port to override those on the portgroup.
1814
1776
  :param pulumi.Input[int] vlan_id: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
1815
- :param pulumi.Input[bool] vlan_override_allowed: Allow the
1816
- [VLAN settings][vlan-settings] on this port group to be overridden on an
1817
- individual port.
1777
+ :param pulumi.Input[bool] vlan_override_allowed: Allow the VLAN configuration on a port to override those on the portgroup.
1818
1778
  :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DistributedPortGroupVlanRangeArgs']]]] vlan_ranges: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
1819
1779
  """
1820
1780
  ...
@@ -2022,13 +1982,19 @@ class DistributedPortGroup(pulumi.CustomResource):
2022
1982
  may lead to errors when the port count grows past the amount specified. If you
2023
1983
  specify `number_of_ports`, you may wish to set `auto_expand` to `false`.
2024
1984
  :param pulumi.Input[bool] block_all_ports: Indicates whether to block all ports by default.
2025
- :param pulumi.Input[bool] block_override_allowed: Allow the port shutdown
2026
- policy to be overridden on an individual port.
1985
+ :param pulumi.Input[bool] block_override_allowed: Allow the blocked setting of an individual port to override the setting in the portgroup.
2027
1986
  :param pulumi.Input[bool] check_beacon: Enable beacon probing on the ports this policy applies to.
2028
1987
  :param pulumi.Input[str] config_version: The current version of the port group configuration,
2029
1988
  incremented by subsequent updates to the port group.
2030
1989
  :param pulumi.Input[Mapping[str, pulumi.Input[str]]] custom_attributes: Map of custom attribute ids to attribute
1990
+ <<<<<<< HEAD
1991
+ value string to set for port group. See [here][docs-setting-custom-attributes]
1992
+ for a reference on how to set values for custom attributes.
1993
+
1994
+ [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
1995
+ =======
2031
1996
  value string to set for port group.
1997
+ >>>>>>> 69c6e040 (fork)
2032
1998
 
2033
1999
  > **NOTE:** Custom attributes are not supported on direct ESXi host
2034
2000
  connections and require vCenter Server.
@@ -2048,52 +2014,38 @@ class DistributedPortGroup(pulumi.CustomResource):
2048
2014
  :param pulumi.Input[str] key: The generated UUID of the port group.
2049
2015
  :param pulumi.Input[bool] lacp_enabled: Whether or not to enable LACP on all uplink ports.
2050
2016
  :param pulumi.Input[str] lacp_mode: The uplink LACP mode to use. Can be one of active or passive.
2051
- :param pulumi.Input[bool] live_port_moving_allowed: Allow a port in this port group to be
2052
- moved to another port group while it is connected.
2017
+ :param pulumi.Input[bool] live_port_moving_allowed: Allow a live port to be moved in and out of the portgroup.
2053
2018
  :param pulumi.Input[str] name: The name of the port group.
2054
2019
  :param pulumi.Input[bool] netflow_enabled: Indicates whether to enable netflow on all ports.
2055
- :param pulumi.Input[bool] netflow_override_allowed: Allow the
2056
- [Netflow policy][netflow-policy] on this port group to be overridden on an
2057
- individual port.
2020
+ :param pulumi.Input[bool] netflow_override_allowed: Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
2058
2021
  :param pulumi.Input[str] network_resource_pool_key: The key of a network resource pool
2059
2022
  to associate with this port group. The default is `-1`, which implies no
2060
2023
  association.
2061
- :param pulumi.Input[bool] network_resource_pool_override_allowed: Allow the network
2062
- resource pool set on this port group to be overridden on an individual port.
2024
+ :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.
2063
2025
  :param pulumi.Input[bool] notify_switches: If true, the teaming policy will notify the broadcast network of a NIC failover, triggering cache updates.
2064
2026
  :param pulumi.Input[int] number_of_ports: The number of ports available on this port
2065
2027
  group. Cannot be decreased below the amount of used ports on the port group.
2066
- :param pulumi.Input[bool] port_config_reset_at_disconnect: Reset a port's settings to the
2067
- settings defined on this port group policy when the port disconnects.
2028
+ :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.
2068
2029
  :param pulumi.Input[str] port_name_format: An optional formatting policy for naming of
2069
2030
  the ports in this port group. See the `portNameFormat` attribute listed
2070
2031
  [here][ext-vsphere-portname-format] for details on the format syntax.
2071
2032
 
2072
- [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
2033
+ [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
2073
2034
  :param pulumi.Input[int] port_private_secondary_vlan_id: The secondary VLAN ID for this port.
2074
- :param pulumi.Input[bool] security_policy_override_allowed: Allow the
2075
- [security policy settings][sec-policy-settings] defined in this port group
2076
- policy to be overridden on an individual port.
2077
- :param pulumi.Input[bool] shaping_override_allowed: Allow the
2078
- [traffic shaping options][traffic-shaping-settings] on this port group policy
2079
- to be overridden on an individual port.
2035
+ :param pulumi.Input[bool] security_policy_override_allowed: Allow security policy settings on a port to override those on the portgroup.
2036
+ :param pulumi.Input[bool] shaping_override_allowed: Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
2080
2037
  :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.
2081
2038
  :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: A list of tag IDs to apply to this object.
2082
2039
  :param pulumi.Input[str] teaming_policy: The network adapter teaming policy. Can be one of loadbalance_ip, loadbalance_srcmac, loadbalance_srcid,
2083
2040
  failover_explicit, or loadbalance_loadbased.
2084
- :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any traffic filters on
2085
- this port group to be overridden on an individual port.
2041
+ :param pulumi.Input[bool] traffic_filter_override_allowed: Allow any filter policies set on the individual port to override those in the portgroup.
2086
2042
  :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
2087
2043
  forwarded done by the switch.
2088
2044
  :param pulumi.Input[str] type: The port group type. Can be one of `earlyBinding` (static
2089
2045
  binding) or `ephemeral`. Default: `earlyBinding`.
2090
- :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the
2091
- [uplink teaming options][uplink-teaming-settings] on this port group to be
2092
- overridden on an individual port.
2046
+ :param pulumi.Input[bool] uplink_teaming_override_allowed: Allow the uplink teaming policies on a port to override those on the portgroup.
2093
2047
  :param pulumi.Input[int] vlan_id: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
2094
- :param pulumi.Input[bool] vlan_override_allowed: Allow the
2095
- [VLAN settings][vlan-settings] on this port group to be overridden on an
2096
- individual port.
2048
+ :param pulumi.Input[bool] vlan_override_allowed: Allow the VLAN configuration on a port to override those on the portgroup.
2097
2049
  :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DistributedPortGroupVlanRangeArgs']]]] vlan_ranges: The VLAN ID for single VLAN mode. 0 denotes no VLAN.
2098
2050
  """
2099
2051
  opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
@@ -2208,8 +2160,7 @@ class DistributedPortGroup(pulumi.CustomResource):
2208
2160
  @pulumi.getter(name="blockOverrideAllowed")
2209
2161
  def block_override_allowed(self) -> pulumi.Output[Optional[bool]]:
2210
2162
  """
2211
- Allow the port shutdown
2212
- policy to be overridden on an individual port.
2163
+ Allow the blocked setting of an individual port to override the setting in the portgroup.
2213
2164
  """
2214
2165
  return pulumi.get(self, "block_override_allowed")
2215
2166
 
@@ -2235,7 +2186,14 @@ class DistributedPortGroup(pulumi.CustomResource):
2235
2186
  def custom_attributes(self) -> pulumi.Output[Optional[Mapping[str, str]]]:
2236
2187
  """
2237
2188
  Map of custom attribute ids to attribute
2189
+ <<<<<<< HEAD
2190
+ value string to set for port group. See [here][docs-setting-custom-attributes]
2191
+ for a reference on how to set values for custom attributes.
2192
+
2193
+ [docs-setting-custom-attributes]: /docs/providers/vsphere/r/custom_attribute.html#using-custom-attributes-in-a-supported-resource
2194
+ =======
2238
2195
  value string to set for port group.
2196
+ >>>>>>> 69c6e040 (fork)
2239
2197
 
2240
2198
  > **NOTE:** Custom attributes are not supported on direct ESXi host
2241
2199
  connections and require vCenter Server.
@@ -2367,8 +2325,7 @@ class DistributedPortGroup(pulumi.CustomResource):
2367
2325
  @pulumi.getter(name="livePortMovingAllowed")
2368
2326
  def live_port_moving_allowed(self) -> pulumi.Output[Optional[bool]]:
2369
2327
  """
2370
- Allow a port in this port group to be
2371
- moved to another port group while it is connected.
2328
+ Allow a live port to be moved in and out of the portgroup.
2372
2329
  """
2373
2330
  return pulumi.get(self, "live_port_moving_allowed")
2374
2331
 
@@ -2392,9 +2349,7 @@ class DistributedPortGroup(pulumi.CustomResource):
2392
2349
  @pulumi.getter(name="netflowOverrideAllowed")
2393
2350
  def netflow_override_allowed(self) -> pulumi.Output[Optional[bool]]:
2394
2351
  """
2395
- Allow the
2396
- [Netflow policy][netflow-policy] on this port group to be overridden on an
2397
- individual port.
2352
+ Allow the enabling or disabling of Netflow on a port, contrary to the policy in the portgroup.
2398
2353
  """
2399
2354
  return pulumi.get(self, "netflow_override_allowed")
2400
2355
 
@@ -2412,8 +2367,7 @@ class DistributedPortGroup(pulumi.CustomResource):
2412
2367
  @pulumi.getter(name="networkResourcePoolOverrideAllowed")
2413
2368
  def network_resource_pool_override_allowed(self) -> pulumi.Output[Optional[bool]]:
2414
2369
  """
2415
- Allow the network
2416
- resource pool set on this port group to be overridden on an individual port.
2370
+ Allow the network resource pool of an individual port to override the setting in the portgroup.
2417
2371
  """
2418
2372
  return pulumi.get(self, "network_resource_pool_override_allowed")
2419
2373
 
@@ -2438,8 +2392,7 @@ class DistributedPortGroup(pulumi.CustomResource):
2438
2392
  @pulumi.getter(name="portConfigResetAtDisconnect")
2439
2393
  def port_config_reset_at_disconnect(self) -> pulumi.Output[Optional[bool]]:
2440
2394
  """
2441
- Reset a port's settings to the
2442
- settings defined on this port group policy when the port disconnects.
2395
+ Reset the setting of any ports in this portgroup back to the default setting when the port disconnects.
2443
2396
  """
2444
2397
  return pulumi.get(self, "port_config_reset_at_disconnect")
2445
2398
 
@@ -2451,7 +2404,7 @@ class DistributedPortGroup(pulumi.CustomResource):
2451
2404
  the ports in this port group. See the `portNameFormat` attribute listed
2452
2405
  [here][ext-vsphere-portname-format] for details on the format syntax.
2453
2406
 
2454
- [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
2407
+ [ext-vsphere-portname-format]: https://developer.broadcom.com/xapis/virtual-infrastructure-json-api/latest/data-structures/DVPortgroupConfigInfo/
2455
2408
  """
2456
2409
  return pulumi.get(self, "port_name_format")
2457
2410
 
@@ -2467,9 +2420,7 @@ class DistributedPortGroup(pulumi.CustomResource):
2467
2420
  @pulumi.getter(name="securityPolicyOverrideAllowed")
2468
2421
  def security_policy_override_allowed(self) -> pulumi.Output[Optional[bool]]:
2469
2422
  """
2470
- Allow the
2471
- [security policy settings][sec-policy-settings] defined in this port group
2472
- policy to be overridden on an individual port.
2423
+ Allow security policy settings on a port to override those on the portgroup.
2473
2424
  """
2474
2425
  return pulumi.get(self, "security_policy_override_allowed")
2475
2426
 
@@ -2477,9 +2428,7 @@ class DistributedPortGroup(pulumi.CustomResource):
2477
2428
  @pulumi.getter(name="shapingOverrideAllowed")
2478
2429
  def shaping_override_allowed(self) -> pulumi.Output[Optional[bool]]:
2479
2430
  """
2480
- Allow the
2481
- [traffic shaping options][traffic-shaping-settings] on this port group policy
2482
- to be overridden on an individual port.
2431
+ Allow the traffic shaping policies of an individual port to override the settings in the portgroup.
2483
2432
  """
2484
2433
  return pulumi.get(self, "shaping_override_allowed")
2485
2434
 
@@ -2512,8 +2461,7 @@ class DistributedPortGroup(pulumi.CustomResource):
2512
2461
  @pulumi.getter(name="trafficFilterOverrideAllowed")
2513
2462
  def traffic_filter_override_allowed(self) -> pulumi.Output[Optional[bool]]:
2514
2463
  """
2515
- Allow any traffic filters on
2516
- this port group to be overridden on an individual port.
2464
+ Allow any filter policies set on the individual port to override those in the portgroup.
2517
2465
  """
2518
2466
  return pulumi.get(self, "traffic_filter_override_allowed")
2519
2467
 
@@ -2539,9 +2487,7 @@ class DistributedPortGroup(pulumi.CustomResource):
2539
2487
  @pulumi.getter(name="uplinkTeamingOverrideAllowed")
2540
2488
  def uplink_teaming_override_allowed(self) -> pulumi.Output[Optional[bool]]:
2541
2489
  """
2542
- Allow the
2543
- [uplink teaming options][uplink-teaming-settings] on this port group to be
2544
- overridden on an individual port.
2490
+ Allow the uplink teaming policies on a port to override those on the portgroup.
2545
2491
  """
2546
2492
  return pulumi.get(self, "uplink_teaming_override_allowed")
2547
2493
 
@@ -2557,9 +2503,7 @@ class DistributedPortGroup(pulumi.CustomResource):
2557
2503
  @pulumi.getter(name="vlanOverrideAllowed")
2558
2504
  def vlan_override_allowed(self) -> pulumi.Output[Optional[bool]]:
2559
2505
  """
2560
- Allow the
2561
- [VLAN settings][vlan-settings] on this port group to be overridden on an
2562
- individual port.
2506
+ Allow the VLAN configuration on a port to override those on the portgroup.
2563
2507
  """
2564
2508
  return pulumi.get(self, "vlan_override_allowed")
2565
2509