diff --git a/google/cloud/dataproc/__init__.py b/google/cloud/dataproc/__init__.py index cf2bab0d..82aa640c 100644 --- a/google/cloud/dataproc/__init__.py +++ b/google/cloud/dataproc/__init__.py @@ -111,7 +111,9 @@ from google.cloud.dataproc_v1.types.clusters import GceClusterConfig from google.cloud.dataproc_v1.types.clusters import GetClusterRequest from google.cloud.dataproc_v1.types.clusters import IdentityConfig +from google.cloud.dataproc_v1.types.clusters import InstanceFlexibilityPolicy from google.cloud.dataproc_v1.types.clusters import InstanceGroupConfig +from google.cloud.dataproc_v1.types.clusters import InstanceReference from google.cloud.dataproc_v1.types.clusters import KerberosConfig from google.cloud.dataproc_v1.types.clusters import LifecycleConfig from google.cloud.dataproc_v1.types.clusters import ListClustersRequest @@ -266,7 +268,9 @@ "GceClusterConfig", "GetClusterRequest", "IdentityConfig", + "InstanceFlexibilityPolicy", "InstanceGroupConfig", + "InstanceReference", "KerberosConfig", "LifecycleConfig", "ListClustersRequest", diff --git a/google/cloud/dataproc_v1/__init__.py b/google/cloud/dataproc_v1/__init__.py index 92dd4da3..b967fef5 100644 --- a/google/cloud/dataproc_v1/__init__.py +++ b/google/cloud/dataproc_v1/__init__.py @@ -71,7 +71,9 @@ from .types.clusters import GceClusterConfig from .types.clusters import GetClusterRequest from .types.clusters import IdentityConfig +from .types.clusters import InstanceFlexibilityPolicy from .types.clusters import InstanceGroupConfig +from .types.clusters import InstanceReference from .types.clusters import KerberosConfig from .types.clusters import LifecycleConfig from .types.clusters import ListClustersRequest @@ -222,8 +224,10 @@ "HadoopJob", "HiveJob", "IdentityConfig", + "InstanceFlexibilityPolicy", "InstanceGroupAutoscalingPolicyConfig", "InstanceGroupConfig", + "InstanceReference", "InstantiateInlineWorkflowTemplateRequest", "InstantiateWorkflowTemplateRequest", "Job", diff --git a/google/cloud/dataproc_v1/types/__init__.py b/google/cloud/dataproc_v1/types/__init__.py index 120fd190..f6343361 100644 --- a/google/cloud/dataproc_v1/types/__init__.py +++ b/google/cloud/dataproc_v1/types/__init__.py @@ -58,7 +58,9 @@ GceClusterConfig, GetClusterRequest, IdentityConfig, + InstanceFlexibilityPolicy, InstanceGroupConfig, + InstanceReference, KerberosConfig, LifecycleConfig, ListClustersRequest, @@ -198,7 +200,9 @@ "GceClusterConfig", "GetClusterRequest", "IdentityConfig", + "InstanceFlexibilityPolicy", "InstanceGroupConfig", + "InstanceReference", "KerberosConfig", "LifecycleConfig", "ListClustersRequest", diff --git a/google/cloud/dataproc_v1/types/clusters.py b/google/cloud/dataproc_v1/types/clusters.py index bfae67da..64a06a9d 100644 --- a/google/cloud/dataproc_v1/types/clusters.py +++ b/google/cloud/dataproc_v1/types/clusters.py @@ -40,7 +40,9 @@ "ShieldedInstanceConfig", "ConfidentialInstanceConfig", "InstanceGroupConfig", + "InstanceReference", "ManagedGroupConfig", + "InstanceFlexibilityPolicy", "AcceleratorConfig", "DiskConfig", "AuxiliaryNodeGroup", @@ -561,8 +563,8 @@ class GceClusterConfig(proto.Message): `Tagging instances `__). metadata (MutableMapping[str, str]): - The Compute Engine metadata entries to add to all instances - (see `Project and instance + Optional. The Compute Engine metadata entries to add to all + instances (see `Project and instance metadata `__). reservation_affinity (google.cloud.dataproc_v1.types.ReservationAffinity): Optional. Reservation Affinity for consuming @@ -771,6 +773,9 @@ class InstanceGroupConfig(proto.Message): Output only. The list of instance names. Dataproc derives the names from ``cluster_name``, ``num_instances``, and the instance group. + instance_references (MutableSequence[google.cloud.dataproc_v1.types.InstanceReference]): + Output only. List of references to Compute + Engine instances. image_uri (str): Optional. The Compute Engine image resource used for cluster instances. @@ -832,6 +837,31 @@ class InstanceGroupConfig(proto.Message): Optional. Specifies the minimum cpu platform for the Instance Group. See `Dataproc -> Minimum CPU Platform `__. + min_num_instances (int): + Optional. The minimum number of instances to create. If + min_num_instances is set, min_num_instances is used for a + criteria to decide the cluster. Cluster creation will be + failed by being an error state if the total number of + instances created is less than the min_num_instances. For + example, given that num_instances = 5 and min_num_instances + = 3, + + - if 4 instances are created and then registered + successfully but one instance is failed, the failed VM + will be deleted and the cluster will be resized to 4 + instances in running state. + - if 2 instances are created successfully and 3 instances + are failed, the cluster will be in an error state and + does not delete failed VMs for debugging. + - if 2 instance are created and then registered + successfully but 3 instances are failed to initialize, + the cluster will be in an error state and does not delete + failed VMs for debugging. NB: This can only be set for + primary workers now. + instance_flexibility_policy (google.cloud.dataproc_v1.types.InstanceFlexibilityPolicy): + Optional. Instance flexibility Policy + allowing a mixture of VM shapes and provisioning + models. """ class Preemptibility(proto.Enum): @@ -877,6 +907,11 @@ class Preemptibility(proto.Enum): proto.STRING, number=2, ) + instance_references: MutableSequence["InstanceReference"] = proto.RepeatedField( + proto.MESSAGE, + number=11, + message="InstanceReference", + ) image_uri: str = proto.Field( proto.STRING, number=3, @@ -913,6 +948,51 @@ class Preemptibility(proto.Enum): proto.STRING, number=9, ) + min_num_instances: int = proto.Field( + proto.INT32, + number=12, + ) + instance_flexibility_policy: "InstanceFlexibilityPolicy" = proto.Field( + proto.MESSAGE, + number=13, + message="InstanceFlexibilityPolicy", + ) + + +class InstanceReference(proto.Message): + r"""A reference to a Compute Engine instance. + + Attributes: + instance_name (str): + The user-friendly name of the Compute Engine + instance. + instance_id (str): + The unique identifier of the Compute Engine + instance. + public_key (str): + The public RSA key used for sharing data with + this instance. + public_ecies_key (str): + The public ECIES key used for sharing data + with this instance. + """ + + instance_name: str = proto.Field( + proto.STRING, + number=1, + ) + instance_id: str = proto.Field( + proto.STRING, + number=2, + ) + public_key: str = proto.Field( + proto.STRING, + number=3, + ) + public_ecies_key: str = proto.Field( + proto.STRING, + number=4, + ) class ManagedGroupConfig(proto.Message): @@ -926,6 +1006,10 @@ class ManagedGroupConfig(proto.Message): instance_group_manager_name (str): Output only. The name of the Instance Group Manager for this group. + instance_group_manager_uri (str): + Output only. The partial URI to the instance + group manager for this group. E.g. + projects/my-project/regions/us-central1/instanceGroupManagers/my-igm. """ instance_template_name: str = proto.Field( @@ -936,6 +1020,94 @@ class ManagedGroupConfig(proto.Message): proto.STRING, number=2, ) + instance_group_manager_uri: str = proto.Field( + proto.STRING, + number=3, + ) + + +class InstanceFlexibilityPolicy(proto.Message): + r"""Instance flexibility Policy allowing a mixture of VM shapes + and provisioning models. + + Attributes: + instance_selection_list (MutableSequence[google.cloud.dataproc_v1.types.InstanceFlexibilityPolicy.InstanceSelection]): + Optional. List of instance selection options + that the group will use when creating new VMs. + instance_selection_results (MutableSequence[google.cloud.dataproc_v1.types.InstanceFlexibilityPolicy.InstanceSelectionResult]): + Output only. A list of instance selection + results in the group. + """ + + class InstanceSelection(proto.Message): + r"""Defines machines types and a rank to which the machines types + belong. + + Attributes: + machine_types (MutableSequence[str]): + Optional. Full machine-type names, e.g. + "n1-standard-16". + rank (int): + Optional. Preference of this instance + selection. Lower number means higher preference. + Dataproc will first try to create a VM based on + the machine-type with priority rank and fallback + to next rank based on availability. Machine + types and instance selections with the same + priority have the same preference. + """ + + machine_types: MutableSequence[str] = proto.RepeatedField( + proto.STRING, + number=1, + ) + rank: int = proto.Field( + proto.INT32, + number=2, + ) + + class InstanceSelectionResult(proto.Message): + r"""Defines a mapping from machine types to the number of VMs + that are created with each machine type. + + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + + Attributes: + machine_type (str): + Output only. Full machine-type names, e.g. + "n1-standard-16". + + This field is a member of `oneof`_ ``_machine_type``. + vm_count (int): + Output only. Number of VM provisioned with the machine_type. + + This field is a member of `oneof`_ ``_vm_count``. + """ + + machine_type: str = proto.Field( + proto.STRING, + number=1, + optional=True, + ) + vm_count: int = proto.Field( + proto.INT32, + number=2, + optional=True, + ) + + instance_selection_list: MutableSequence[InstanceSelection] = proto.RepeatedField( + proto.MESSAGE, + number=2, + message=InstanceSelection, + ) + instance_selection_results: MutableSequence[ + InstanceSelectionResult + ] = proto.RepeatedField( + proto.MESSAGE, + number=3, + message=InstanceSelectionResult, + ) class AcceleratorConfig(proto.Message): @@ -1198,6 +1370,9 @@ class State(proto.Enum): STARTING (8): The cluster is being started. It is not ready for use. + REPAIRING (10): + The cluster is being repaired. It is not + ready for use. """ UNKNOWN = 0 CREATING = 1 @@ -1209,6 +1384,7 @@ class State(proto.Enum): STOPPING = 6 STOPPED = 7 STARTING = 8 + REPAIRING = 10 class Substate(proto.Enum): r"""The cluster substate. @@ -1602,18 +1778,18 @@ class DataprocMetricConfig(proto.Message): """ class MetricSource(proto.Enum): - r"""A source for the collection of Dataproc OSS metrics (see [available - OSS metrics] - (https://cloud.google.com//dataproc/docs/guides/monitoring#available_oss_metrics)). + r"""A source for the collection of Dataproc custom metrics (see [Custom + metrics] + (https://cloud.google.com//dataproc/docs/guides/dataproc-metrics#custom_metrics)). Values: METRIC_SOURCE_UNSPECIFIED (0): Required unspecified metric source. MONITORING_AGENT_DEFAULTS (1): - Default monitoring agent metrics. If this source is enabled, + Monitoring agent metrics. If this source is enabled, Dataproc enables the monitoring agent in Compute Engine, and - collects default monitoring agent metrics, which are - published with an ``agent.googleapis.com`` prefix. + collects monitoring agent metrics, which are published with + an ``agent.googleapis.com`` prefix. HDFS (2): HDFS metric source. SPARK (3): @@ -1637,20 +1813,20 @@ class MetricSource(proto.Enum): HIVEMETASTORE = 7 class Metric(proto.Message): - r"""A Dataproc OSS metric. + r"""A Dataproc custom metric. Attributes: metric_source (google.cloud.dataproc_v1.types.DataprocMetricConfig.MetricSource): - Required. Default metrics are collected unless + Required. A standard set of metrics is collected unless ``metricOverrides`` are specified for the metric source (see - [Available OSS metrics] - (https://cloud.google.com/dataproc/docs/guides/monitoring#available_oss_metrics) + [Custom metrics] + (https://cloud.google.com/dataproc/docs/guides/dataproc-metrics#custom_metrics) for more information). metric_overrides (MutableSequence[str]): - Optional. Specify one or more [available OSS metrics] - (https://cloud.google.com/dataproc/docs/guides/monitoring#available_oss_metrics) + Optional. Specify one or more [Custom metrics] + (https://cloud.google.com/dataproc/docs/guides/dataproc-metrics#custom_metrics) to collect for the metric course (for the ``SPARK`` metric - source, any [Spark metric] + source (any [Spark metric] (https://spark.apache.org/docs/latest/monitoring.html#metrics) can be specified). @@ -1669,15 +1845,15 @@ class Metric(proto.Message): Notes: - - Only the specified overridden metrics will be collected - for the metric source. For example, if one or more + - Only the specified overridden metrics are collected for + the metric source. For example, if one or more ``spark:executive`` metrics are listed as metric - overrides, other ``SPARK`` metrics will not be collected. - The collection of the default metrics for other OSS - metric sources is unaffected. For example, if both - ``SPARK`` andd ``YARN`` metric sources are enabled, and - overrides are provided for Spark metrics only, all - default YARN metrics will be collected. + overrides, other ``SPARK`` metrics are not collected. The + collection of the metrics for other enabled custom metric + sources is unaffected. For example, if both ``SPARK`` + andd ``YARN`` metric sources are enabled, and overrides + are provided for Spark metrics only, all YARN metrics are + collected. """ metric_source: "DataprocMetricConfig.MetricSource" = proto.Field( diff --git a/google/cloud/dataproc_v1/types/node_groups.py b/google/cloud/dataproc_v1/types/node_groups.py index a7cd56f7..f46addd3 100644 --- a/google/cloud/dataproc_v1/types/node_groups.py +++ b/google/cloud/dataproc_v1/types/node_groups.py @@ -115,7 +115,7 @@ class ResizeNodeGroupRequest(proto.Message): underscores (_), and hyphens (-). The maximum length is 40 characters. graceful_decommission_timeout (google.protobuf.duration_pb2.Duration): - Optional. Timeout for graceful YARN decomissioning. + Optional. Timeout for graceful YARN decommissioning. [Graceful decommissioning] (https://cloud.google.com/dataproc/docs/concepts/configuring-clusters/scaling-clusters#graceful_decommissioning) allows the removal of nodes from the Compute Engine node diff --git a/samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json b/samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json index 1ebc057f..f1a48076 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-dataproc", - "version": "5.4.3" + "version": "0.1.0" }, "snippets": [ { diff --git a/tests/unit/gapic/dataproc_v1/test_cluster_controller.py b/tests/unit/gapic/dataproc_v1/test_cluster_controller.py index f3cfe116..60d240a0 100644 --- a/tests/unit/gapic/dataproc_v1/test_cluster_controller.py +++ b/tests/unit/gapic/dataproc_v1/test_cluster_controller.py @@ -2823,6 +2823,14 @@ def test_create_cluster_rest(request_type): "master_config": { "num_instances": 1399, "instance_names": ["instance_names_value1", "instance_names_value2"], + "instance_references": [ + { + "instance_name": "instance_name_value", + "instance_id": "instance_id_value", + "public_key": "public_key_value", + "public_ecies_key": "public_ecies_key_value", + } + ], "image_uri": "image_uri_value", "machine_type_uri": "machine_type_uri_value", "disk_config": { @@ -2836,6 +2844,7 @@ def test_create_cluster_rest(request_type): "managed_group_config": { "instance_template_name": "instance_template_name_value", "instance_group_manager_name": "instance_group_manager_name_value", + "instance_group_manager_uri": "instance_group_manager_uri_value", }, "accelerators": [ { @@ -2844,6 +2853,21 @@ def test_create_cluster_rest(request_type): } ], "min_cpu_platform": "min_cpu_platform_value", + "min_num_instances": 1818, + "instance_flexibility_policy": { + "instance_selection_list": [ + { + "machine_types": [ + "machine_types_value1", + "machine_types_value2", + ], + "rank": 428, + } + ], + "instance_selection_results": [ + {"machine_type": "machine_type_value", "vm_count": 875} + ], + }, }, "worker_config": {}, "secondary_worker_config": {}, @@ -3203,6 +3227,14 @@ def test_create_cluster_rest_bad_request( "master_config": { "num_instances": 1399, "instance_names": ["instance_names_value1", "instance_names_value2"], + "instance_references": [ + { + "instance_name": "instance_name_value", + "instance_id": "instance_id_value", + "public_key": "public_key_value", + "public_ecies_key": "public_ecies_key_value", + } + ], "image_uri": "image_uri_value", "machine_type_uri": "machine_type_uri_value", "disk_config": { @@ -3216,6 +3248,7 @@ def test_create_cluster_rest_bad_request( "managed_group_config": { "instance_template_name": "instance_template_name_value", "instance_group_manager_name": "instance_group_manager_name_value", + "instance_group_manager_uri": "instance_group_manager_uri_value", }, "accelerators": [ { @@ -3224,6 +3257,21 @@ def test_create_cluster_rest_bad_request( } ], "min_cpu_platform": "min_cpu_platform_value", + "min_num_instances": 1818, + "instance_flexibility_policy": { + "instance_selection_list": [ + { + "machine_types": [ + "machine_types_value1", + "machine_types_value2", + ], + "rank": 428, + } + ], + "instance_selection_results": [ + {"machine_type": "machine_type_value", "vm_count": 875} + ], + }, }, "worker_config": {}, "secondary_worker_config": {}, @@ -3484,6 +3532,14 @@ def test_update_cluster_rest(request_type): "master_config": { "num_instances": 1399, "instance_names": ["instance_names_value1", "instance_names_value2"], + "instance_references": [ + { + "instance_name": "instance_name_value", + "instance_id": "instance_id_value", + "public_key": "public_key_value", + "public_ecies_key": "public_ecies_key_value", + } + ], "image_uri": "image_uri_value", "machine_type_uri": "machine_type_uri_value", "disk_config": { @@ -3497,6 +3553,7 @@ def test_update_cluster_rest(request_type): "managed_group_config": { "instance_template_name": "instance_template_name_value", "instance_group_manager_name": "instance_group_manager_name_value", + "instance_group_manager_uri": "instance_group_manager_uri_value", }, "accelerators": [ { @@ -3505,6 +3562,21 @@ def test_update_cluster_rest(request_type): } ], "min_cpu_platform": "min_cpu_platform_value", + "min_num_instances": 1818, + "instance_flexibility_policy": { + "instance_selection_list": [ + { + "machine_types": [ + "machine_types_value1", + "machine_types_value2", + ], + "rank": 428, + } + ], + "instance_selection_results": [ + {"machine_type": "machine_type_value", "vm_count": 875} + ], + }, }, "worker_config": {}, "secondary_worker_config": {}, @@ -3876,6 +3948,14 @@ def test_update_cluster_rest_bad_request( "master_config": { "num_instances": 1399, "instance_names": ["instance_names_value1", "instance_names_value2"], + "instance_references": [ + { + "instance_name": "instance_name_value", + "instance_id": "instance_id_value", + "public_key": "public_key_value", + "public_ecies_key": "public_ecies_key_value", + } + ], "image_uri": "image_uri_value", "machine_type_uri": "machine_type_uri_value", "disk_config": { @@ -3889,6 +3969,7 @@ def test_update_cluster_rest_bad_request( "managed_group_config": { "instance_template_name": "instance_template_name_value", "instance_group_manager_name": "instance_group_manager_name_value", + "instance_group_manager_uri": "instance_group_manager_uri_value", }, "accelerators": [ { @@ -3897,6 +3978,21 @@ def test_update_cluster_rest_bad_request( } ], "min_cpu_platform": "min_cpu_platform_value", + "min_num_instances": 1818, + "instance_flexibility_policy": { + "instance_selection_list": [ + { + "machine_types": [ + "machine_types_value1", + "machine_types_value2", + ], + "rank": 428, + } + ], + "instance_selection_results": [ + {"machine_type": "machine_type_value", "vm_count": 875} + ], + }, }, "worker_config": {}, "secondary_worker_config": {}, diff --git a/tests/unit/gapic/dataproc_v1/test_node_group_controller.py b/tests/unit/gapic/dataproc_v1/test_node_group_controller.py index c9fa0d40..d179bfa2 100644 --- a/tests/unit/gapic/dataproc_v1/test_node_group_controller.py +++ b/tests/unit/gapic/dataproc_v1/test_node_group_controller.py @@ -1527,6 +1527,14 @@ def test_create_node_group_rest(request_type): "node_group_config": { "num_instances": 1399, "instance_names": ["instance_names_value1", "instance_names_value2"], + "instance_references": [ + { + "instance_name": "instance_name_value", + "instance_id": "instance_id_value", + "public_key": "public_key_value", + "public_ecies_key": "public_ecies_key_value", + } + ], "image_uri": "image_uri_value", "machine_type_uri": "machine_type_uri_value", "disk_config": { @@ -1540,6 +1548,7 @@ def test_create_node_group_rest(request_type): "managed_group_config": { "instance_template_name": "instance_template_name_value", "instance_group_manager_name": "instance_group_manager_name_value", + "instance_group_manager_uri": "instance_group_manager_uri_value", }, "accelerators": [ { @@ -1548,6 +1557,21 @@ def test_create_node_group_rest(request_type): } ], "min_cpu_platform": "min_cpu_platform_value", + "min_num_instances": 1818, + "instance_flexibility_policy": { + "instance_selection_list": [ + { + "machine_types": [ + "machine_types_value1", + "machine_types_value2", + ], + "rank": 428, + } + ], + "instance_selection_results": [ + {"machine_type": "machine_type_value", "vm_count": 875} + ], + }, }, "labels": {}, } @@ -1751,6 +1775,14 @@ def test_create_node_group_rest_bad_request( "node_group_config": { "num_instances": 1399, "instance_names": ["instance_names_value1", "instance_names_value2"], + "instance_references": [ + { + "instance_name": "instance_name_value", + "instance_id": "instance_id_value", + "public_key": "public_key_value", + "public_ecies_key": "public_ecies_key_value", + } + ], "image_uri": "image_uri_value", "machine_type_uri": "machine_type_uri_value", "disk_config": { @@ -1764,6 +1796,7 @@ def test_create_node_group_rest_bad_request( "managed_group_config": { "instance_template_name": "instance_template_name_value", "instance_group_manager_name": "instance_group_manager_name_value", + "instance_group_manager_uri": "instance_group_manager_uri_value", }, "accelerators": [ { @@ -1772,6 +1805,21 @@ def test_create_node_group_rest_bad_request( } ], "min_cpu_platform": "min_cpu_platform_value", + "min_num_instances": 1818, + "instance_flexibility_policy": { + "instance_selection_list": [ + { + "machine_types": [ + "machine_types_value1", + "machine_types_value2", + ], + "rank": 428, + } + ], + "instance_selection_results": [ + {"machine_type": "machine_type_value", "vm_count": 875} + ], + }, }, "labels": {}, } diff --git a/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py b/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py index 0094bbee..879fbd76 100644 --- a/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py +++ b/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py @@ -2793,6 +2793,14 @@ def test_create_workflow_template_rest(request_type): "instance_names_value1", "instance_names_value2", ], + "instance_references": [ + { + "instance_name": "instance_name_value", + "instance_id": "instance_id_value", + "public_key": "public_key_value", + "public_ecies_key": "public_ecies_key_value", + } + ], "image_uri": "image_uri_value", "machine_type_uri": "machine_type_uri_value", "disk_config": { @@ -2806,6 +2814,7 @@ def test_create_workflow_template_rest(request_type): "managed_group_config": { "instance_template_name": "instance_template_name_value", "instance_group_manager_name": "instance_group_manager_name_value", + "instance_group_manager_uri": "instance_group_manager_uri_value", }, "accelerators": [ { @@ -2814,6 +2823,21 @@ def test_create_workflow_template_rest(request_type): } ], "min_cpu_platform": "min_cpu_platform_value", + "min_num_instances": 1818, + "instance_flexibility_policy": { + "instance_selection_list": [ + { + "machine_types": [ + "machine_types_value1", + "machine_types_value2", + ], + "rank": 428, + } + ], + "instance_selection_results": [ + {"machine_type": "machine_type_value", "vm_count": 875} + ], + }, }, "worker_config": {}, "secondary_worker_config": {}, @@ -3236,6 +3260,14 @@ def test_create_workflow_template_rest_bad_request( "instance_names_value1", "instance_names_value2", ], + "instance_references": [ + { + "instance_name": "instance_name_value", + "instance_id": "instance_id_value", + "public_key": "public_key_value", + "public_ecies_key": "public_ecies_key_value", + } + ], "image_uri": "image_uri_value", "machine_type_uri": "machine_type_uri_value", "disk_config": { @@ -3249,6 +3281,7 @@ def test_create_workflow_template_rest_bad_request( "managed_group_config": { "instance_template_name": "instance_template_name_value", "instance_group_manager_name": "instance_group_manager_name_value", + "instance_group_manager_uri": "instance_group_manager_uri_value", }, "accelerators": [ { @@ -3257,6 +3290,21 @@ def test_create_workflow_template_rest_bad_request( } ], "min_cpu_platform": "min_cpu_platform_value", + "min_num_instances": 1818, + "instance_flexibility_policy": { + "instance_selection_list": [ + { + "machine_types": [ + "machine_types_value1", + "machine_types_value2", + ], + "rank": 428, + } + ], + "instance_selection_results": [ + {"machine_type": "machine_type_value", "vm_count": 875} + ], + }, }, "worker_config": {}, "secondary_worker_config": {}, @@ -4136,6 +4184,14 @@ def test_instantiate_inline_workflow_template_rest(request_type): "instance_names_value1", "instance_names_value2", ], + "instance_references": [ + { + "instance_name": "instance_name_value", + "instance_id": "instance_id_value", + "public_key": "public_key_value", + "public_ecies_key": "public_ecies_key_value", + } + ], "image_uri": "image_uri_value", "machine_type_uri": "machine_type_uri_value", "disk_config": { @@ -4149,6 +4205,7 @@ def test_instantiate_inline_workflow_template_rest(request_type): "managed_group_config": { "instance_template_name": "instance_template_name_value", "instance_group_manager_name": "instance_group_manager_name_value", + "instance_group_manager_uri": "instance_group_manager_uri_value", }, "accelerators": [ { @@ -4157,6 +4214,21 @@ def test_instantiate_inline_workflow_template_rest(request_type): } ], "min_cpu_platform": "min_cpu_platform_value", + "min_num_instances": 1818, + "instance_flexibility_policy": { + "instance_selection_list": [ + { + "machine_types": [ + "machine_types_value1", + "machine_types_value2", + ], + "rank": 428, + } + ], + "instance_selection_results": [ + {"machine_type": "machine_type_value", "vm_count": 875} + ], + }, }, "worker_config": {}, "secondary_worker_config": {}, @@ -4575,6 +4647,14 @@ def test_instantiate_inline_workflow_template_rest_bad_request( "instance_names_value1", "instance_names_value2", ], + "instance_references": [ + { + "instance_name": "instance_name_value", + "instance_id": "instance_id_value", + "public_key": "public_key_value", + "public_ecies_key": "public_ecies_key_value", + } + ], "image_uri": "image_uri_value", "machine_type_uri": "machine_type_uri_value", "disk_config": { @@ -4588,6 +4668,7 @@ def test_instantiate_inline_workflow_template_rest_bad_request( "managed_group_config": { "instance_template_name": "instance_template_name_value", "instance_group_manager_name": "instance_group_manager_name_value", + "instance_group_manager_uri": "instance_group_manager_uri_value", }, "accelerators": [ { @@ -4596,6 +4677,21 @@ def test_instantiate_inline_workflow_template_rest_bad_request( } ], "min_cpu_platform": "min_cpu_platform_value", + "min_num_instances": 1818, + "instance_flexibility_policy": { + "instance_selection_list": [ + { + "machine_types": [ + "machine_types_value1", + "machine_types_value2", + ], + "rank": 428, + } + ], + "instance_selection_results": [ + {"machine_type": "machine_type_value", "vm_count": 875} + ], + }, }, "worker_config": {}, "secondary_worker_config": {}, @@ -4923,6 +5019,14 @@ def test_update_workflow_template_rest(request_type): "instance_names_value1", "instance_names_value2", ], + "instance_references": [ + { + "instance_name": "instance_name_value", + "instance_id": "instance_id_value", + "public_key": "public_key_value", + "public_ecies_key": "public_ecies_key_value", + } + ], "image_uri": "image_uri_value", "machine_type_uri": "machine_type_uri_value", "disk_config": { @@ -4936,6 +5040,7 @@ def test_update_workflow_template_rest(request_type): "managed_group_config": { "instance_template_name": "instance_template_name_value", "instance_group_manager_name": "instance_group_manager_name_value", + "instance_group_manager_uri": "instance_group_manager_uri_value", }, "accelerators": [ { @@ -4944,6 +5049,21 @@ def test_update_workflow_template_rest(request_type): } ], "min_cpu_platform": "min_cpu_platform_value", + "min_num_instances": 1818, + "instance_flexibility_policy": { + "instance_selection_list": [ + { + "machine_types": [ + "machine_types_value1", + "machine_types_value2", + ], + "rank": 428, + } + ], + "instance_selection_results": [ + {"machine_type": "machine_type_value", "vm_count": 875} + ], + }, }, "worker_config": {}, "secondary_worker_config": {}, @@ -5357,6 +5477,14 @@ def test_update_workflow_template_rest_bad_request( "instance_names_value1", "instance_names_value2", ], + "instance_references": [ + { + "instance_name": "instance_name_value", + "instance_id": "instance_id_value", + "public_key": "public_key_value", + "public_ecies_key": "public_ecies_key_value", + } + ], "image_uri": "image_uri_value", "machine_type_uri": "machine_type_uri_value", "disk_config": { @@ -5370,6 +5498,7 @@ def test_update_workflow_template_rest_bad_request( "managed_group_config": { "instance_template_name": "instance_template_name_value", "instance_group_manager_name": "instance_group_manager_name_value", + "instance_group_manager_uri": "instance_group_manager_uri_value", }, "accelerators": [ { @@ -5378,6 +5507,21 @@ def test_update_workflow_template_rest_bad_request( } ], "min_cpu_platform": "min_cpu_platform_value", + "min_num_instances": 1818, + "instance_flexibility_policy": { + "instance_selection_list": [ + { + "machine_types": [ + "machine_types_value1", + "machine_types_value2", + ], + "rank": 428, + } + ], + "instance_selection_results": [ + {"machine_type": "machine_type_value", "vm_count": 875} + ], + }, }, "worker_config": {}, "secondary_worker_config": {},