diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement/gapic_version.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement/gapic_version.py index cf5493b86bbc..558c8aab67c5 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement/gapic_version.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.1.7" # {x-release-please-version} +__version__ = "0.0.0" # {x-release-please-version} diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/gapic_version.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/gapic_version.py index cf5493b86bbc..558c8aab67c5 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/gapic_version.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.1.7" # {x-release-please-version} +__version__ = "0.0.0" # {x-release-please-version} diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/async_client.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/async_client.py index 59daaa6d85bb..264d6c6c8ffd 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/async_client.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/async_client.py @@ -4619,7 +4619,6 @@ async def sample_signal_zone_state(): # Initialize request argument(s) request = gdchardwaremanagement_v1alpha.SignalZoneStateRequest( name="name_value", - state_signal="FACTORY_TURNUP_CHECKS_FAILED", ) # Make the request @@ -4644,8 +4643,9 @@ async def sample_signal_zone_state(): on the ``request`` instance; if ``request`` is provided, this should not be set. state_signal (:class:`google.cloud.gdchardwaremanagement_v1alpha.types.SignalZoneStateRequest.StateSignal`): - Required. The state signal to send - for this zone. + Optional. The state signal to send for this zone. Either + state_signal or provisioning_state_signal must be set, + but not both. This corresponds to the ``state_signal`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/client.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/client.py index 7914d75f440a..cdc2d5da7ea5 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/client.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/client.py @@ -5053,7 +5053,6 @@ def sample_signal_zone_state(): # Initialize request argument(s) request = gdchardwaremanagement_v1alpha.SignalZoneStateRequest( name="name_value", - state_signal="FACTORY_TURNUP_CHECKS_FAILED", ) # Make the request @@ -5078,8 +5077,9 @@ def sample_signal_zone_state(): on the ``request`` instance; if ``request`` is provided, this should not be set. state_signal (google.cloud.gdchardwaremanagement_v1alpha.types.SignalZoneStateRequest.StateSignal): - Required. The state signal to send - for this zone. + Optional. The state signal to send for this zone. Either + state_signal or provisioning_state_signal must be set, + but not both. This corresponds to the ``state_signal`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py index a99305594859..14d82a177622 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py @@ -631,6 +631,10 @@ class MacAddress(proto.Message): type_ (google.cloud.gdchardwaremanagement_v1alpha.types.Hardware.MacAddress.AddressType): Output only. Address type for this MAC address. + ipv4_address (str): + Output only. Static IP address (if used) that + is associated with the MAC address. Only + applicable for VIRTUAL MAC address type. """ class AddressType(proto.Enum): @@ -660,6 +664,10 @@ class AddressType(proto.Enum): number=2, enum="Hardware.MacAddress.AddressType", ) + ipv4_address: str = proto.Field( + proto.STRING, + number=3, + ) class DiskInfo(proto.Message): r"""Information about individual disks on a machine. @@ -1069,6 +1077,9 @@ class Zone(proto.Message): subscription_configs (MutableSequence[google.cloud.gdchardwaremanagement_v1alpha.types.SubscriptionConfig]): Output only. Subscription configurations for this zone. + provisioning_state (google.cloud.gdchardwaremanagement_v1alpha.types.Zone.ProvisioningState): + Output only. Provisioning state for + configurations like MAC addresses. """ class State(proto.Enum): @@ -1102,6 +1113,25 @@ class State(proto.Enum): ACTIVE = 3 CANCELLED = 4 + class ProvisioningState(proto.Enum): + r"""Valid provisioning states for configurations like MAC + addresses. + + Values: + PROVISIONING_STATE_UNSPECIFIED (0): + Provisioning state is unspecified. + PROVISIONING_REQUIRED (1): + Provisioning is required. Set by Google. + PROVISIONING_IN_PROGRESS (2): + Provisioning is in progress. Set by customer. + PROVISIONING_COMPLETE (3): + Provisioning is complete. Set by customer. + """ + PROVISIONING_STATE_UNSPECIFIED = 0 + PROVISIONING_REQUIRED = 1 + PROVISIONING_IN_PROGRESS = 2 + PROVISIONING_COMPLETE = 3 + name: str = proto.Field( proto.STRING, number=1, @@ -1153,6 +1183,11 @@ class State(proto.Enum): number=13, message="SubscriptionConfig", ) + provisioning_state: ProvisioningState = proto.Field( + proto.ENUM, + number=14, + enum=ProvisioningState, + ) class OrganizationContact(proto.Message): @@ -1538,6 +1573,18 @@ class ZoneNetworkConfig(proto.Message): Optional. An IPv4 subnet for the kubernetes network. If unspecified, the kubernetes subnet will be the same as the management subnet. + dns_ipv4_addresses (MutableSequence[str]): + Optional. DNS nameservers. + The GDC Infrastructure will resolve DNS queries + via these IPs. If unspecified, Google DNS is + used. + kubernetes_primary_vlan_id (int): + Optional. Kubernetes VLAN ID. + By default, the kubernetes node, including the + primary kubernetes network, are in the same VLAN + as the machine management network. For network + segmentation purposes, these can optionally be + separated. """ machine_mgmt_ipv4_range: str = proto.Field( @@ -1562,6 +1609,14 @@ class ZoneNetworkConfig(proto.Message): number=5, message="Subnet", ) + dns_ipv4_addresses: MutableSequence[str] = proto.RepeatedField( + proto.STRING, + number=6, + ) + kubernetes_primary_vlan_id: int = proto.Field( + proto.INT32, + number=7, + ) class Subnet(proto.Message): diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/service.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/service.py index 560eb7a3eb80..5ff49ec89010 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/service.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/service.py @@ -1477,8 +1477,13 @@ class SignalZoneStateRequest(proto.Message): Optional. An optional unique identifier for this request. See `AIP-155 `__. state_signal (google.cloud.gdchardwaremanagement_v1alpha.types.SignalZoneStateRequest.StateSignal): - Required. The state signal to send for this - zone. + Optional. The state signal to send for this zone. Either + state_signal or provisioning_state_signal must be set, but + not both. + provisioning_state_signal (google.cloud.gdchardwaremanagement_v1alpha.types.SignalZoneStateRequest.ProvisioningStateSignal): + Optional. The provisioning state signal to send for this + zone. Either state_signal or provisioning_state_signal must + be set, but not both. """ class StateSignal(proto.Enum): @@ -1501,6 +1506,21 @@ class StateSignal(proto.Enum): READY_FOR_SITE_TURNUP = 1 FACTORY_TURNUP_CHECKS_FAILED = 2 + class ProvisioningStateSignal(proto.Enum): + r"""Valid provisioning state signals for a zone. + + Values: + PROVISIONING_STATE_SIGNAL_UNSPECIFIED (0): + Provisioning state signal is unspecified. + PROVISIONING_IN_PROGRESS (1): + Provisioning is in progress. + PROVISIONING_COMPLETE (2): + Provisioning is complete. + """ + PROVISIONING_STATE_SIGNAL_UNSPECIFIED = 0 + PROVISIONING_IN_PROGRESS = 1 + PROVISIONING_COMPLETE = 2 + name: str = proto.Field( proto.STRING, number=1, @@ -1514,6 +1534,11 @@ class StateSignal(proto.Enum): number=3, enum=StateSignal, ) + provisioning_state_signal: ProvisioningStateSignal = proto.Field( + proto.ENUM, + number=4, + enum=ProvisioningStateSignal, + ) class OperationMetadata(proto.Message): diff --git a/packages/google-cloud-gdchardwaremanagement/samples/generated_samples/gdchardwaremanagement_v1alpha_generated_gdc_hardware_management_signal_zone_state_async.py b/packages/google-cloud-gdchardwaremanagement/samples/generated_samples/gdchardwaremanagement_v1alpha_generated_gdc_hardware_management_signal_zone_state_async.py index 63cb018f1818..6f79b8261ba2 100644 --- a/packages/google-cloud-gdchardwaremanagement/samples/generated_samples/gdchardwaremanagement_v1alpha_generated_gdc_hardware_management_signal_zone_state_async.py +++ b/packages/google-cloud-gdchardwaremanagement/samples/generated_samples/gdchardwaremanagement_v1alpha_generated_gdc_hardware_management_signal_zone_state_async.py @@ -41,7 +41,6 @@ async def sample_signal_zone_state(): # Initialize request argument(s) request = gdchardwaremanagement_v1alpha.SignalZoneStateRequest( name="name_value", - state_signal="FACTORY_TURNUP_CHECKS_FAILED", ) # Make the request diff --git a/packages/google-cloud-gdchardwaremanagement/samples/generated_samples/gdchardwaremanagement_v1alpha_generated_gdc_hardware_management_signal_zone_state_sync.py b/packages/google-cloud-gdchardwaremanagement/samples/generated_samples/gdchardwaremanagement_v1alpha_generated_gdc_hardware_management_signal_zone_state_sync.py index fbdb745f83fb..69e95a4b0759 100644 --- a/packages/google-cloud-gdchardwaremanagement/samples/generated_samples/gdchardwaremanagement_v1alpha_generated_gdc_hardware_management_signal_zone_state_sync.py +++ b/packages/google-cloud-gdchardwaremanagement/samples/generated_samples/gdchardwaremanagement_v1alpha_generated_gdc_hardware_management_signal_zone_state_sync.py @@ -41,7 +41,6 @@ def sample_signal_zone_state(): # Initialize request argument(s) request = gdchardwaremanagement_v1alpha.SignalZoneStateRequest( name="name_value", - state_signal="FACTORY_TURNUP_CHECKS_FAILED", ) # Make the request diff --git a/packages/google-cloud-gdchardwaremanagement/samples/generated_samples/snippet_metadata_google.cloud.gdchardwaremanagement.v1alpha.json b/packages/google-cloud-gdchardwaremanagement/samples/generated_samples/snippet_metadata_google.cloud.gdchardwaremanagement.v1alpha.json index 21220aece8a8..7bdbed75f299 100644 --- a/packages/google-cloud-gdchardwaremanagement/samples/generated_samples/snippet_metadata_google.cloud.gdchardwaremanagement.v1alpha.json +++ b/packages/google-cloud-gdchardwaremanagement/samples/generated_samples/snippet_metadata_google.cloud.gdchardwaremanagement.v1alpha.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-gdchardwaremanagement", - "version": "0.1.7" + "version": "0.1.0" }, "snippets": [ { @@ -4676,12 +4676,12 @@ "regionTag": "gdchardwaremanagement_v1alpha_generated_GDCHardwareManagement_SignalZoneState_async", "segments": [ { - "end": 56, + "end": 55, "start": 27, "type": "FULL" }, { - "end": 56, + "end": 55, "start": 27, "type": "SHORT" }, @@ -4691,18 +4691,18 @@ "type": "CLIENT_INITIALIZATION" }, { - "end": 46, + "end": 45, "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 53, - "start": 47, + "end": 52, + "start": 46, "type": "REQUEST_EXECUTION" }, { - "end": 57, - "start": 54, + "end": 56, + "start": 53, "type": "RESPONSE_HANDLING" } ], @@ -4760,12 +4760,12 @@ "regionTag": "gdchardwaremanagement_v1alpha_generated_GDCHardwareManagement_SignalZoneState_sync", "segments": [ { - "end": 56, + "end": 55, "start": 27, "type": "FULL" }, { - "end": 56, + "end": 55, "start": 27, "type": "SHORT" }, @@ -4775,18 +4775,18 @@ "type": "CLIENT_INITIALIZATION" }, { - "end": 46, + "end": 45, "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 53, - "start": 47, + "end": 52, + "start": 46, "type": "REQUEST_EXECUTION" }, { - "end": 57, - "start": 54, + "end": 56, + "start": 53, "type": "RESPONSE_HANDLING" } ], diff --git a/packages/google-cloud-gdchardwaremanagement/scripts/fixup_gdchardwaremanagement_v1alpha_keywords.py b/packages/google-cloud-gdchardwaremanagement/scripts/fixup_gdchardwaremanagement_v1alpha_keywords.py index ee4fe8f8fcd9..4100f17208e2 100644 --- a/packages/google-cloud-gdchardwaremanagement/scripts/fixup_gdchardwaremanagement_v1alpha_keywords.py +++ b/packages/google-cloud-gdchardwaremanagement/scripts/fixup_gdchardwaremanagement_v1alpha_keywords.py @@ -67,7 +67,7 @@ class gdchardwaremanagementCallTransformer(cst.CSTTransformer): 'list_skus': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), 'list_zones': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), 'record_action_on_comment': ('name', 'action_type', ), - 'signal_zone_state': ('name', 'state_signal', 'request_id', ), + 'signal_zone_state': ('name', 'request_id', 'state_signal', 'provisioning_state_signal', ), 'submit_order': ('name', 'request_id', 'type_', ), 'update_hardware': ('update_mask', 'hardware', 'request_id', ), 'update_hardware_group': ('update_mask', 'hardware_group', 'request_id', ), diff --git a/packages/google-cloud-gdchardwaremanagement/tests/unit/gapic/gdchardwaremanagement_v1alpha/test_gdc_hardware_management.py b/packages/google-cloud-gdchardwaremanagement/tests/unit/gapic/gdchardwaremanagement_v1alpha/test_gdc_hardware_management.py index 89b506b89ac7..297b91ef6f7a 100644 --- a/packages/google-cloud-gdchardwaremanagement/tests/unit/gapic/gdchardwaremanagement_v1alpha/test_gdc_hardware_management.py +++ b/packages/google-cloud-gdchardwaremanagement/tests/unit/gapic/gdchardwaremanagement_v1alpha/test_gdc_hardware_management.py @@ -12996,6 +12996,7 @@ def test_get_zone(request_type, transport: str = "grpc"): state=resources.Zone.State.ADDITIONAL_INFO_NEEDED, ciq_uri="ciq_uri_value", globally_unique_id="globally_unique_id_value", + provisioning_state=resources.Zone.ProvisioningState.PROVISIONING_REQUIRED, ) response = client.get_zone(request) @@ -13012,6 +13013,10 @@ def test_get_zone(request_type, transport: str = "grpc"): assert response.state == resources.Zone.State.ADDITIONAL_INFO_NEEDED assert response.ciq_uri == "ciq_uri_value" assert response.globally_unique_id == "globally_unique_id_value" + assert ( + response.provisioning_state + == resources.Zone.ProvisioningState.PROVISIONING_REQUIRED + ) def test_get_zone_non_empty_request_with_auto_populated_field(): @@ -13140,6 +13145,7 @@ async def test_get_zone_async( state=resources.Zone.State.ADDITIONAL_INFO_NEEDED, ciq_uri="ciq_uri_value", globally_unique_id="globally_unique_id_value", + provisioning_state=resources.Zone.ProvisioningState.PROVISIONING_REQUIRED, ) ) response = await client.get_zone(request) @@ -13157,6 +13163,10 @@ async def test_get_zone_async( assert response.state == resources.Zone.State.ADDITIONAL_INFO_NEEDED assert response.ciq_uri == "ciq_uri_value" assert response.globally_unique_id == "globally_unique_id_value" + assert ( + response.provisioning_state + == resources.Zone.ProvisioningState.PROVISIONING_REQUIRED + ) @pytest.mark.asyncio @@ -21668,15 +21678,7 @@ def test_signal_zone_state_rest_unset_required_fields(): ) unset_fields = transport.signal_zone_state._get_unset_required_fields({}) - assert set(unset_fields) == ( - set(()) - & set( - ( - "name", - "stateSignal", - ) - ) - ) + assert set(unset_fields) == (set(()) & set(("name",))) def test_signal_zone_state_rest_flattened(): @@ -23471,6 +23473,7 @@ async def test_get_zone_empty_call_grpc_asyncio(): state=resources.Zone.State.ADDITIONAL_INFO_NEEDED, ciq_uri="ciq_uri_value", globally_unique_id="globally_unique_id_value", + provisioning_state=resources.Zone.ProvisioningState.PROVISIONING_REQUIRED, ) ) await client.get_zone(request=None) @@ -26459,7 +26462,13 @@ def test_create_hardware_rest_call_success(request_type): "machine_infos": [ { "service_tag": "service_tag_value", - "mac_addresses": [{"address": "address_value", "type_": 1}], + "mac_addresses": [ + { + "address": "address_value", + "type_": 1, + "ipv4_address": "ipv4_address_value", + } + ], "name": "name_value", "disk_infos": [ { @@ -26697,7 +26706,13 @@ def test_update_hardware_rest_call_success(request_type): "machine_infos": [ { "service_tag": "service_tag_value", - "mac_addresses": [{"address": "address_value", "type_": 1}], + "mac_addresses": [ + { + "address": "address_value", + "type_": 1, + "ipv4_address": "ipv4_address_value", + } + ], "name": "name_value", "disk_infos": [ { @@ -28181,6 +28196,7 @@ def test_get_zone_rest_call_success(request_type): state=resources.Zone.State.ADDITIONAL_INFO_NEEDED, ciq_uri="ciq_uri_value", globally_unique_id="globally_unique_id_value", + provisioning_state=resources.Zone.ProvisioningState.PROVISIONING_REQUIRED, ) # Wrap the value into a proper Response obj @@ -28201,6 +28217,10 @@ def test_get_zone_rest_call_success(request_type): assert response.state == resources.Zone.State.ADDITIONAL_INFO_NEEDED assert response.ciq_uri == "ciq_uri_value" assert response.globally_unique_id == "globally_unique_id_value" + assert ( + response.provisioning_state + == resources.Zone.ProvisioningState.PROVISIONING_REQUIRED + ) @pytest.mark.parametrize("null_interceptor", [True, False]) @@ -28331,6 +28351,11 @@ def test_create_zone_rest_call_success(request_type): "default_gateway_ip_address": "default_gateway_ip_address_value", }, "kubernetes_ipv4_subnet": {}, + "dns_ipv4_addresses": [ + "dns_ipv4_addresses_value1", + "dns_ipv4_addresses_value2", + ], + "kubernetes_primary_vlan_id": 2775, }, "globally_unique_id": "globally_unique_id_value", "subscription_configs": [ @@ -28340,6 +28365,7 @@ def test_create_zone_rest_call_success(request_type): "state": 1, } ], + "provisioning_state": 1, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency @@ -28561,6 +28587,11 @@ def test_update_zone_rest_call_success(request_type): "default_gateway_ip_address": "default_gateway_ip_address_value", }, "kubernetes_ipv4_subnet": {}, + "dns_ipv4_addresses": [ + "dns_ipv4_addresses_value1", + "dns_ipv4_addresses_value2", + ], + "kubernetes_primary_vlan_id": 2775, }, "globally_unique_id": "globally_unique_id_value", "subscription_configs": [ @@ -28570,6 +28601,7 @@ def test_update_zone_rest_call_success(request_type): "state": 1, } ], + "provisioning_state": 1, } # The version of a generated dependency at test runtime may differ from the version used during generation. # Delete any fields which are not present in the current runtime dependency