From 298815712e43ae3cebe4657faedb40423808d8ec Mon Sep 17 00:00:00 2001 From: dshelbyo Date: Tue, 3 Sep 2019 16:24:29 +0000 Subject: [PATCH] Releasing version 2.3.3 --- CHANGELOG.rst | 12 +- docs/api/core.rst | 7 + ...ChangeClusterNetworkCompartmentDetails.rst | 11 + .../models/oci.core.models.ClusterNetwork.rst | 11 + ...erNetworkPlacementConfigurationDetails.rst | 11 + .../oci.core.models.ClusterNetworkSummary.rst | 11 + ...ore.models.CreateClusterNetworkDetails.rst | 11 + ...reateClusterNetworkInstancePoolDetails.rst | 11 + ...ore.models.UpdateClusterNetworkDetails.rst | 11 + examples/cluster_networks_example.py | 152 +++ examples/showoci/CHANGELOG.rst | 7 + examples/showoci/README.md | 28 +- examples/showoci/showoci.py | 2 +- examples/showoci/showoci_data.py | 6 +- examples/showoci/showoci_output.py | 48 +- examples/showoci/showoci_service.py | 52 +- .../announcement_client.py | 8 +- src/oci/audit/audit_client.py | 6 +- src/oci/autoscaling/auto_scaling_client.py | 22 +- src/oci/budget/budget_client.py | 20 +- .../container_engine_client.py | 36 +- src/oci/core/blockstorage_client.py | 98 +- src/oci/core/compute_client.py | 112 +-- .../compute_client_composite_operations.py | 128 +++ src/oci/core/compute_management_client.py | 774 ++++++++++++++- ..._management_client_composite_operations.py | 126 +++ src/oci/core/models/__init__.py | 14 + ...nge_cluster_network_compartment_details.py | 75 ++ src/oci/core/models/cluster_network.py | 412 ++++++++ ...network_placement_configuration_details.py | 133 +++ .../core/models/cluster_network_summary.py | 381 ++++++++ .../models/create_cluster_network_details.py | 244 +++++ ...e_cluster_network_instance_pool_details.py | 213 ++++ .../models/update_cluster_network_details.py | 151 +++ src/oci/core/virtual_network_client.py | 314 +++--- ...ual_network_client_composite_operations.py | 84 ++ src/oci/database/database_client.py | 174 ++-- .../database_client_composite_operations.py | 917 +++++++++++++++++- ...reate_autonomous_database_clone_details.py | 4 +- src/oci/dns/dns_client.py | 56 +- src/oci/dts/shipping_vendors_client.py | 2 +- src/oci/dts/transfer_appliance_client.py | 16 +- .../transfer_appliance_entitlement_client.py | 4 +- src/oci/dts/transfer_device_client.py | 10 +- src/oci/dts/transfer_job_client.py | 12 +- src/oci/dts/transfer_package_client.py | 14 +- src/oci/email/email_client.py | 20 +- src/oci/events/events_client.py | 12 +- src/oci/file_storage/file_storage_client.py | 50 +- src/oci/functions/functions_invoke_client.py | 2 +- .../functions/functions_management_client.py | 22 +- src/oci/healthchecks/health_checks_client.py | 34 +- src/oci/identity/identity_client.py | 196 ++-- src/oci/key_management/kms_crypto_client.py | 6 +- .../key_management/kms_management_client.py | 24 +- src/oci/key_management/kms_vault_client.py | 14 +- src/oci/limits/limits_client.py | 8 +- src/oci/limits/quotas_client.py | 10 +- src/oci/load_balancer/load_balancer_client.py | 100 +- src/oci/monitoring/monitoring_client.py | 24 +- .../object_storage/object_storage_client.py | 70 +- .../ons/notification_control_plane_client.py | 12 +- src/oci/ons/notification_data_plane_client.py | 20 +- src/oci/regions.py | 5 +- .../resource_manager_client.py | 40 +- .../resource_search/resource_search_client.py | 6 +- src/oci/streaming/stream_admin_client.py | 22 +- src/oci/streaming/stream_client.py | 16 +- src/oci/version.py | 2 +- src/oci/waas/waas_client.py | 132 +-- src/oci/work_requests/work_request_client.py | 8 +- 71 files changed, 4819 insertions(+), 987 deletions(-) create mode 100644 docs/api/core/models/oci.core.models.ChangeClusterNetworkCompartmentDetails.rst create mode 100644 docs/api/core/models/oci.core.models.ClusterNetwork.rst create mode 100644 docs/api/core/models/oci.core.models.ClusterNetworkPlacementConfigurationDetails.rst create mode 100644 docs/api/core/models/oci.core.models.ClusterNetworkSummary.rst create mode 100644 docs/api/core/models/oci.core.models.CreateClusterNetworkDetails.rst create mode 100644 docs/api/core/models/oci.core.models.CreateClusterNetworkInstancePoolDetails.rst create mode 100644 docs/api/core/models/oci.core.models.UpdateClusterNetworkDetails.rst create mode 100644 examples/cluster_networks_example.py create mode 100644 src/oci/core/models/change_cluster_network_compartment_details.py create mode 100644 src/oci/core/models/cluster_network.py create mode 100644 src/oci/core/models/cluster_network_placement_configuration_details.py create mode 100644 src/oci/core/models/cluster_network_summary.py create mode 100644 src/oci/core/models/create_cluster_network_details.py create mode 100644 src/oci/core/models/create_cluster_network_instance_pool_details.py create mode 100644 src/oci/core/models/update_cluster_network_details.py diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1cf7098836..3e73a0133d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,7 +4,17 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_. -===================== +==================== +2.3.3 - 2019-09-03 +==================== + +Added +----- +* Support for the Sydney (SYD) region +* Support for managing cluster networks in the Compute Autoscaling service +* Support for tracking asynchronous operations via work requests in the Database service + +==================== 2.3.2 - 2019-08-27 ==================== diff --git a/docs/api/core.rst b/docs/api/core.rst index d6e49de63f..6f50b80969 100644 --- a/docs/api/core.rst +++ b/docs/api/core.rst @@ -55,6 +55,7 @@ Core Services oci.core.models.CaptureConsoleHistoryDetails oci.core.models.ChangeBootVolumeBackupCompartmentDetails oci.core.models.ChangeBootVolumeCompartmentDetails + oci.core.models.ChangeClusterNetworkCompartmentDetails oci.core.models.ChangeCpeCompartmentDetails oci.core.models.ChangeCrossConnectCompartmentDetails oci.core.models.ChangeCrossConnectGroupCompartmentDetails @@ -81,6 +82,9 @@ Core Services oci.core.models.ChangeVolumeCompartmentDetails oci.core.models.ChangeVolumeGroupBackupCompartmentDetails oci.core.models.ChangeVolumeGroupCompartmentDetails + oci.core.models.ClusterNetwork + oci.core.models.ClusterNetworkPlacementConfigurationDetails + oci.core.models.ClusterNetworkSummary oci.core.models.ComputeInstanceDetails oci.core.models.ConnectLocalPeeringGatewaysDetails oci.core.models.ConnectRemotePeeringConnectionsDetails @@ -90,6 +94,8 @@ Core Services oci.core.models.CreateAppCatalogSubscriptionDetails oci.core.models.CreateBootVolumeBackupDetails oci.core.models.CreateBootVolumeDetails + oci.core.models.CreateClusterNetworkDetails + oci.core.models.CreateClusterNetworkInstancePoolDetails oci.core.models.CreateCpeDetails oci.core.models.CreateCrossConnectDetails oci.core.models.CreateCrossConnectGroupDetails @@ -235,6 +241,7 @@ Core Services oci.core.models.UpdateBootVolumeBackupDetails oci.core.models.UpdateBootVolumeDetails oci.core.models.UpdateBootVolumeKmsKeyDetails + oci.core.models.UpdateClusterNetworkDetails oci.core.models.UpdateConsoleHistoryDetails oci.core.models.UpdateCpeDetails oci.core.models.UpdateCrossConnectDetails diff --git a/docs/api/core/models/oci.core.models.ChangeClusterNetworkCompartmentDetails.rst b/docs/api/core/models/oci.core.models.ChangeClusterNetworkCompartmentDetails.rst new file mode 100644 index 0000000000..1201809e92 --- /dev/null +++ b/docs/api/core/models/oci.core.models.ChangeClusterNetworkCompartmentDetails.rst @@ -0,0 +1,11 @@ +ChangeClusterNetworkCompartmentDetails +====================================== + +.. currentmodule:: oci.core.models + +.. autoclass:: ChangeClusterNetworkCompartmentDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/core/models/oci.core.models.ClusterNetwork.rst b/docs/api/core/models/oci.core.models.ClusterNetwork.rst new file mode 100644 index 0000000000..3c583e2027 --- /dev/null +++ b/docs/api/core/models/oci.core.models.ClusterNetwork.rst @@ -0,0 +1,11 @@ +ClusterNetwork +============== + +.. currentmodule:: oci.core.models + +.. autoclass:: ClusterNetwork + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/core/models/oci.core.models.ClusterNetworkPlacementConfigurationDetails.rst b/docs/api/core/models/oci.core.models.ClusterNetworkPlacementConfigurationDetails.rst new file mode 100644 index 0000000000..028fa4557a --- /dev/null +++ b/docs/api/core/models/oci.core.models.ClusterNetworkPlacementConfigurationDetails.rst @@ -0,0 +1,11 @@ +ClusterNetworkPlacementConfigurationDetails +=========================================== + +.. currentmodule:: oci.core.models + +.. autoclass:: ClusterNetworkPlacementConfigurationDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/core/models/oci.core.models.ClusterNetworkSummary.rst b/docs/api/core/models/oci.core.models.ClusterNetworkSummary.rst new file mode 100644 index 0000000000..c420d513e0 --- /dev/null +++ b/docs/api/core/models/oci.core.models.ClusterNetworkSummary.rst @@ -0,0 +1,11 @@ +ClusterNetworkSummary +===================== + +.. currentmodule:: oci.core.models + +.. autoclass:: ClusterNetworkSummary + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/core/models/oci.core.models.CreateClusterNetworkDetails.rst b/docs/api/core/models/oci.core.models.CreateClusterNetworkDetails.rst new file mode 100644 index 0000000000..fe2b33a1a1 --- /dev/null +++ b/docs/api/core/models/oci.core.models.CreateClusterNetworkDetails.rst @@ -0,0 +1,11 @@ +CreateClusterNetworkDetails +=========================== + +.. currentmodule:: oci.core.models + +.. autoclass:: CreateClusterNetworkDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/core/models/oci.core.models.CreateClusterNetworkInstancePoolDetails.rst b/docs/api/core/models/oci.core.models.CreateClusterNetworkInstancePoolDetails.rst new file mode 100644 index 0000000000..40cdb2ad51 --- /dev/null +++ b/docs/api/core/models/oci.core.models.CreateClusterNetworkInstancePoolDetails.rst @@ -0,0 +1,11 @@ +CreateClusterNetworkInstancePoolDetails +======================================= + +.. currentmodule:: oci.core.models + +.. autoclass:: CreateClusterNetworkInstancePoolDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/core/models/oci.core.models.UpdateClusterNetworkDetails.rst b/docs/api/core/models/oci.core.models.UpdateClusterNetworkDetails.rst new file mode 100644 index 0000000000..68d6c2ffbe --- /dev/null +++ b/docs/api/core/models/oci.core.models.UpdateClusterNetworkDetails.rst @@ -0,0 +1,11 @@ +UpdateClusterNetworkDetails +=========================== + +.. currentmodule:: oci.core.models + +.. autoclass:: UpdateClusterNetworkDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/examples/cluster_networks_example.py b/examples/cluster_networks_example.py new file mode 100644 index 0000000000..69969fdd58 --- /dev/null +++ b/examples/cluster_networks_example.py @@ -0,0 +1,152 @@ +# coding: utf-8 +# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + +# This script provides an example of how use the cluster networks SDK in terms of: +# - Creating an Instance Configuration +# - Create a Cluster Network based on that configuration. +# - Wait for the Cluster Network to go to Running state. +# - List instance of the Cluster Network +# - Terminating Cluster Network +# - Deleting the Instance Configuration +# +# USAGE: +# `python examples/cluster_networks_example.py \ +# --compartment '' \ +# --availability-domain '' \ +# --subnet-id '' \ +# --image-id ''` +# +# Example (create a cluster network in uk-london-1): +# `python examples/cluster_networks_example.py \ +# --compartment 'ocid1.compartment.oc1..aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' \ +# --availability-domain 'asdf:UK-LONDON-1-AD-1' \ +# --subnet-id 'ocid1.subnet.oc1.uk-london-1.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' \ +# --image-id 'ocid1.image.oc1.uk-london-1.aaaaaaaa5sh4s5zyq5p54zf26u7j2ne6k7q3ryzsajnhy264ydbyr74gqsoq'` +# + +import oci +import argparse +from oci.core import ComputeManagementClient, ComputeManagementClientCompositeOperations +from oci.core.models import CreateInstanceConfigurationDetails, \ + InstanceConfigurationLaunchInstanceDetails, \ + InstanceConfigurationInstanceSourceViaImageDetails, \ + InstanceConfigurationCreateVnicDetails, \ + ComputeInstanceDetails, \ + InstanceConfigurationBlockVolumeDetails, \ + InstanceConfigurationCreateVolumeDetails, \ + InstanceConfigurationIscsiAttachVolumeDetails, \ + CreateClusterNetworkDetails, \ + ClusterNetworkPlacementConfigurationDetails, \ + CreateClusterNetworkInstancePoolDetails + + +def _create_block_volume_details(compartment_id, ad): + """Sets up the model for a simple 50gb BV for use by tests. + :returns: InstanceConfigurationBlockVolumeDetails + """ + block_volume_details = InstanceConfigurationBlockVolumeDetails() + + create_volume_details = InstanceConfigurationCreateVolumeDetails() + create_volume_details.display_name = "blockvol1" + create_volume_details.compartment_id = compartment_id + create_volume_details.size_in_gbs = 50 + create_volume_details.availability_domain = ad + + volume_attach_details = InstanceConfigurationIscsiAttachVolumeDetails() + + block_volume_details.create_details = create_volume_details + block_volume_details.attach_details = volume_attach_details + return block_volume_details + + +# === Main === + +if __name__ == "__main__": + + # Load the default configuration + config = oci.config.from_file() + + # parse arguments + parser = argparse.ArgumentParser() + parser.add_argument('--compartment-id', + help='Your compartment OCID', + required=True + ) + parser.add_argument('--availability-domain', + help='the AD where the cluster network will be spun up (cluster network only spans a single AD)', + required=True + ) + + parser.add_argument('--subnet-id', + help='the ', + required=True + ) + + parser.add_argument('--image-id', + help='the image ID to use for instances', + required=True + ) + + args = parser.parse_args() + + # create the compute management client + compute_management_client = ComputeManagementClient(config) + composite_client = ComputeManagementClientCompositeOperations(compute_management_client) + + launch_details = InstanceConfigurationLaunchInstanceDetails( + compartment_id=args.compartment_id, + display_name="some hpc instance name", + shape="BM.HPC2.36", + source_details=InstanceConfigurationInstanceSourceViaImageDetails( + image_id=args.image_id + ), + create_vnic_details=InstanceConfigurationCreateVnicDetails() + ) + + instance_details = ComputeInstanceDetails( + launch_details=launch_details, + block_volumes=[ + _create_block_volume_details(args.compartment_id, args.availability_domain) + ]) + + create_instance_config_details = CreateInstanceConfigurationDetails( + display_name="sample instance config name", + compartment_id=args.compartment_id, + instance_details=instance_details) + + try: + # Creates an hpc instance configuration to use with cluster network + instance_config = compute_management_client.create_instance_configuration( + create_instance_config_details).data + print("Created instanceConfiguration: ", instance_config) + + # Creates a placement configuration to be used when creating a pool + placement_config = \ + ClusterNetworkPlacementConfigurationDetails() + placement_config.availability_domain = args.availability_domain + placement_config.primary_subnet_id = args.subnet_id + + instance_pool_def = CreateClusterNetworkInstancePoolDetails() + instance_pool_def.instance_configuration_id = instance_config.id + instance_pool_def.size = 1 + + create_cluster_network_details = CreateClusterNetworkDetails() + create_cluster_network_details.compartment_id = args.compartment_id + create_cluster_network_details.display_name = "sample cluster network" + create_cluster_network_details.instance_pools = [instance_pool_def] + create_cluster_network_details.placement_configuration = placement_config + + # Create a cluster network. + print("Creating cluster network: ", create_cluster_network_details) + cluster_network = composite_client.create_cluster_network_and_wait_for_state( + create_cluster_network_details, wait_for_states=["RUNNING"]).data + + print("Created cluster network: ", cluster_network) + + finally: + # cleaning up created resources + compute_management_client.terminate_cluster_network(cluster_network.id) + print("Terminated cluster network: ", cluster_network) + + compute_management_client.delete_instance_configuration(instance_config.id) + print("Deleted instanceConfiguration: ", instance_config) diff --git a/examples/showoci/CHANGELOG.rst b/examples/showoci/CHANGELOG.rst index 98ae393a53..d185d65c74 100644 --- a/examples/showoci/CHANGELOG.rst +++ b/examples/showoci/CHANGELOG.rst @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_. +==================== +19.9.4 - 2019-09-04 +==================== +* Added usage and available to the limits +* Added CSV extract for limits +* Fix few error handling + ==================== 19.9.3 - 2019-09-03 ==================== diff --git a/examples/showoci/README.md b/examples/showoci/README.md index 4f338ce432..185e7ac836 100644 --- a/examples/showoci/README.md +++ b/examples/showoci/README.md @@ -463,14 +463,26 @@ Compartment gse00000000 (root): ############################## # Limits > 0 # ############################## ---> auto-scaling config-count = 200 SCOPE=REGION ---> block-storage backup-count = 4000 SCOPE=REGION ---> block-storage total-storage-gb = 30720 SCOPE=AD EWTG:US-ASHBURN-AD-1 ---> block-storage total-storage-gb = 30720 SCOPE=AD EWTG:US-ASHBURN-AD-2 ---> block-storage total-storage-gb = 30720 SCOPE=AD EWTG:US-ASHBURN-AD-3 ---> block-storage volume-count = 10000 SCOPE=AD EWTG:US-ASHBURN-AD-1 ---> block-storage volume-count = 10000 SCOPE=AD EWTG:US-ASHBURN-AD-2 ---> block-storage volume-count = 10000 SCOPE=AD EWTG:US-ASHBURN-AD-3 +--> auto-scaling config-count = 200 Used = Available = SCOPE=REGION +--> block-storage backup-count = 4000 Used = Available = 4000 SCOPE=REGION +--> block-storage total-storage-gb = 30720 Used = Available = SCOPE=AD EWTG:US-ASHBURN-AD-1 +--> block-storage total-storage-gb = 30720 Used = Available = SCOPE=AD EWTG:US-ASHBURN-AD-2 +--> block-storage total-storage-gb = 30720 Used = Available = SCOPE=AD EWTG:US-ASHBURN-AD-3 +--> block-storage volume-count = 10000 Used = Available = 10000 SCOPE=AD EWTG:US-ASHBURN-AD-1 +--> block-storage volume-count = 10000 Used = Available = 10000 SCOPE=AD EWTG:US-ASHBURN-AD-2 +--> block-storage volume-count = 10000 Used = Available = 10000 SCOPE=AD EWTG:US-ASHBURN-AD-3 +--> block-storage volumes-per-group = 32 Used = Available = SCOPE=AD EWTG:US-ASHBURN-AD-1 +--> block-storage volumes-per-group = 32 Used = Available = SCOPE=AD EWTG:US-ASHBURN-AD-2 +--> block-storage volumes-per-group = 32 Used = Available = SCOPE=AD EWTG:US-ASHBURN-AD-3 +--> compartments compartment-count = 50 Used = 3 Available = 47 SCOPE=REGION +--> compute custom-image-count = 25 Used = Available = 25 SCOPE=REGION +--> compute vm-standard-b1-1 = 2 Used = Available = 2 SCOPE=AD EWTG:US-ASHBURN-AD-1 +--> compute vm-standard-b1-1 = 2 Used = Available = 2 SCOPE=AD EWTG:US-ASHBURN-AD-2 +--> compute vm-standard1-1-count = 2 Used = Available = 2 SCOPE=AD EWTG:US-ASHBURN-AD-3 +--> compute vm-standard1-2-count = 2 Used = Available = 2 SCOPE=AD EWTG:US-ASHBURN-AD-1 +--> compute vm-standard1-2-count = 2 Used = Available = 2 SCOPE=AD EWTG:US-ASHBURN-AD-2 +--> compute vm-standard1-2-count = 2 Used = Available = 2 SCOPE=AD EWTG:US-ASHBURN-AD-3 +... ############################################################ # Compartment Network # diff --git a/examples/showoci/showoci.py b/examples/showoci/showoci.py index f7bf323be9..546b72d977 100644 --- a/examples/showoci/showoci.py +++ b/examples/showoci/showoci.py @@ -62,7 +62,7 @@ import argparse import datetime -version = "19.9.3" +version = "19.9.4" ########################################################################## # execute_extract diff --git a/examples/showoci/showoci_data.py b/examples/showoci/showoci_data.py index 0d7e9ccf41..f780c25750 100755 --- a/examples/showoci/showoci_data.py +++ b/examples/showoci/showoci_data.py @@ -1327,8 +1327,10 @@ def __get_core_compute_instances(self, region_name, compartment): if vnic['compartment_name'] != compartment['name']: comp_text = " (Compartment=" + vnic['compartment_name'] + ")" - val = {'id': vnic['vnic_id'], 'desc': vnic['vnic_details']['display_name'] + str(comp_text), 'details': vnic['vnic_details']} - vnicdata.append(val) + if 'vnic_details' in vnic: + if 'display_name' in vnic['vnic_details']: + val = {'id': vnic['vnic_id'], 'desc': vnic['vnic_details']['display_name'] + str(comp_text), 'details': vnic['vnic_details']} + vnicdata.append(val) inst['vnic'] = vnicdata diff --git a/examples/showoci/showoci_output.py b/examples/showoci/showoci_output.py index c16d58cc15..598b62fd18 100755 --- a/examples/showoci/showoci_output.py +++ b/examples/showoci/showoci_output.py @@ -69,9 +69,19 @@ def print_data(self, data, print_version=False): has_data = True elif d['type'] == "region": - self.__print_region_data(d['region'], d['data']) - has_data = True + + # Check if limits exist + limits_exist = False if 'limits' in d: + if d['limits']: + limits_exist = True + + if d['data'] or limits_exist: + self.print_header(d['region'], 0) + has_data = True + + self.__print_region_data(d['region'], d['data']) + if limits_exist: self.__print_limits_main(d['limits']) else: @@ -1104,6 +1114,8 @@ def __print_limits_main(self, limits): self.taba + str(ct['name'] + " ").ljust(20) + ct['limit_name'].ljust(37) + " = " + ct['value'].ljust(10) + + " Used = " + ct['used'].ljust(10) + " " + + " Available = " + ct['available'].ljust(10) + " " + " SCOPE=" + ct['scope_type'].ljust(7) + ct['availability_domain'] ) @@ -1452,7 +1464,6 @@ def __print_region_data(self, region_name, data): try: if not data: return - self.print_header(region_name, 0) for cdata in data: if 'path' in cdata: @@ -1874,6 +1885,7 @@ class ShowOCICSV(object): csv_network_dhcp_options = [] csv_load_balancer = [] csv_load_balancer_bs = [] + csv_limits = [] ############################################ # Init @@ -1897,6 +1909,9 @@ def generate_csv(self, data, csv_file_header): elif d['type'] == "region": self.__csv_region_data(d['region'], d['data']) + if 'limits' in d: + self.__csv_limits_main(d['region'], d['limits']) + else: continue @@ -1912,6 +1927,7 @@ def generate_csv(self, data, csv_file_header): self.__export_to_csv_file("database", self.csv_database) self.__export_to_csv_file("load_balancer_listeners", self.csv_load_balancer) self.__export_to_csv_file("load_balancer_backendset", self.csv_load_balancer_bs) + self.__export_to_csv_file("limits", self.csv_limits) print("") except Exception as e: @@ -2351,6 +2367,32 @@ def __csv_database_db_autonomous(self, region_name, databases): except Exception as e: self.__print_error("__csv_database_db_autonomous", e) + ########################################################################## + # Limits + ########################################################################## + def __csv_limits_main(self, region_name, limits): + + try: + if not limits: + return + + for lt in limits: + data = {'region_name': region_name, + 'scope_type': lt['scope_type'], + 'availability_domain': lt['availability_domain'], + 'name': lt['name'], + 'description': lt['description'], + 'limit_name': lt['limit_name'], + 'value': lt['value'], + 'used': lt['used'], + 'available': lt['available'] + } + + self.csv_limits.append(data) + + except Exception as e: + self.__print_error("__csv_limits_main", e) + ########################################################################## # database ########################################################################## diff --git a/examples/showoci/showoci_service.py b/examples/showoci/showoci_service.py index ecf25728d9..45a4502355 100755 --- a/examples/showoci/showoci_service.py +++ b/examples/showoci/showoci_service.py @@ -571,7 +571,9 @@ def __load_print_status(self, msg): def __print_error(self, msg, e): classname = type(self).__name__ - if isinstance(e, KeyError): + if 'TooManyRequests' in str(e): + print(" - TooManyRequests Err in " + msg) + elif isinstance(e, KeyError): print("\nError in " + classname + ":" + msg + ": KeyError " + str(e.args)) else: print("\nError in " + classname + ":" + msg + ": " + str(e)) @@ -590,7 +592,7 @@ def __check_service_error(self, code): def __check_request_error(self, e): # service not yet available - if ('Errno 8' in str(e) and 'NewConnectionError' in str(e)) or 'Max retries exceeded' in str(e) or 'HTTPSConnectionPool' in str(e): + if ('Errno 8' in str(e) and 'NewConnectionError' in str(e)) or 'Max retries exceeded' in str(e) or 'HTTPSConnectionPool' in str(e) or 'not currently available' in str(e): print("Service Not Accessible or not yet exist") return True return False @@ -4735,6 +4737,9 @@ def __load_email_suppressions(self, email, compartments): suppressions = email.list_suppressions(compartment['id']).data except oci.exceptions.ServiceError as e: + if self.__check_request_error(e): + return data + if self.__check_service_error(e.code): self.__load_print_auth_warning() continue @@ -6630,24 +6635,23 @@ def __load_limits(self, limits_client, tenancy_id): services = limits_client.list_services(tenancy_id, sort_by="name").data except oci.exceptions.ServiceError as e: if self.__check_service_error(e.code): - self.__load_print_auth_warning() + self.__load_print_auth_warning("a", False) else: raise - print(".", end="") - if services: # oci.limits.models.ServiceSummary for service in services: + print(".", end="") # get the limits per service limits = [] try: limits = limits_client.list_limit_values(tenancy_id, service_name=service.name, sort_by="name").data - except oci.exceptions.ServiceError as e: + except oci.exceptions.Exception as e: if self.__check_service_error(e.code): - self.__load_print_auth_warning() + self.__load_print_auth_warning("a", False) else: raise @@ -6660,13 +6664,34 @@ def __load_limits(self, limits_client, tenancy_id): 'availability_domain': ("" if limit.availability_domain is None else str(limit.availability_domain)), 'scope_type': str(limit.scope_type), 'value': str(limit.value), + 'used': "", + 'available': "", 'region_name': str(self.config['region']) } - # add the data if limits > 0 - if limit.value > 0: - cnt += 1 - data.append(val) + # if not limit, continue, don't calculate limit = 0 + if limit.value == 0: + continue + + # get usage per limit if available + try: + usage = [] + if limit.scope_type == "AD": + usage = limits_client.get_resource_availability(service.name, limit.name, tenancy_id, availability_domain=limit.availability_domain).data + else: + usage = limits_client.get_resource_availability(service.name, limit.name, tenancy_id).data + + # oci.limits.models.ResourceAvailability + if usage.used: + val['used'] = str(usage.used) + if usage.available: + val['available'] = str(usage.available) + except Exception: + pass + + # add to array + cnt += 1 + data.append(val) self.__load_print_cnt(cnt, start_time) return data @@ -6693,6 +6718,11 @@ def __load_quotas(self, quotas_client, compartments): # loop on all compartments for compartment in compartments: + # skip Paas compartment + if self.__if_managed_paas_compartment(compartment['name']): + print(".", end="") + continue + quotas = [] try: quotas = quotas_client.list_quotas(compartment['id'], lifecycle_state=oci.limits.models.QuotaSummary.LIFECYCLE_STATE_ACTIVE, sort_by="NAME").data diff --git a/src/oci/announcements_service/announcement_client.py b/src/oci/announcements_service/announcement_client.py index 91d928e000..11315183a7 100644 --- a/src/oci/announcements_service/announcement_client.py +++ b/src/oci/announcements_service/announcement_client.py @@ -111,7 +111,7 @@ def get_announcement(self, announcement_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_announcement got unknown kwargs: {!r}".format(extra_kwargs)) @@ -185,7 +185,7 @@ def get_announcement_user_status(self, announcement_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_announcement_user_status got unknown kwargs: {!r}".format(extra_kwargs)) @@ -302,7 +302,7 @@ def list_announcements(self, compartment_id, **kwargs): "time_one_latest_time", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_announcements got unknown kwargs: {!r}".format(extra_kwargs)) @@ -408,7 +408,7 @@ def update_announcement_user_status(self, announcement_id, status_details, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_announcement_user_status got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/audit/audit_client.py b/src/oci/audit/audit_client.py index d2a60ae0fd..1f75e9bcc7 100644 --- a/src/oci/audit/audit_client.py +++ b/src/oci/audit/audit_client.py @@ -103,7 +103,7 @@ def get_configuration(self, compartment_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_configuration got unknown kwargs: {!r}".format(extra_kwargs)) @@ -188,7 +188,7 @@ def list_events(self, compartment_id, start_time, end_time, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_events got unknown kwargs: {!r}".format(extra_kwargs)) @@ -255,7 +255,7 @@ def update_configuration(self, compartment_id, update_configuration_details, **k method = "PUT" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_configuration got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/autoscaling/auto_scaling_client.py b/src/oci/autoscaling/auto_scaling_client.py index de70c6467a..e6cc0f70fb 100644 --- a/src/oci/autoscaling/auto_scaling_client.py +++ b/src/oci/autoscaling/auto_scaling_client.py @@ -137,7 +137,7 @@ def change_auto_scaling_configuration_compartment(self, auto_scaling_configurati "if_match", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_auto_scaling_configuration_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -221,7 +221,7 @@ def create_auto_scaling_configuration(self, create_auto_scaling_configuration_de "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_auto_scaling_configuration got unknown kwargs: {!r}".format(extra_kwargs)) @@ -299,7 +299,7 @@ def create_auto_scaling_policy(self, auto_scaling_configuration_id, create_auto_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_auto_scaling_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -384,7 +384,7 @@ def delete_auto_scaling_configuration(self, auto_scaling_configuration_id, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_auto_scaling_configuration got unknown kwargs: {!r}".format(extra_kwargs)) @@ -466,7 +466,7 @@ def delete_auto_scaling_policy(self, auto_scaling_configuration_id, auto_scaling "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_auto_scaling_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -540,7 +540,7 @@ def get_auto_scaling_configuration(self, auto_scaling_configuration_id, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_auto_scaling_configuration got unknown kwargs: {!r}".format(extra_kwargs)) @@ -617,7 +617,7 @@ def get_auto_scaling_policy(self, auto_scaling_configuration_id, auto_scaling_po "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_auto_scaling_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -727,7 +727,7 @@ def list_auto_scaling_configurations(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_auto_scaling_configurations got unknown kwargs: {!r}".format(extra_kwargs)) @@ -848,7 +848,7 @@ def list_auto_scaling_policies(self, auto_scaling_configuration_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_auto_scaling_policies got unknown kwargs: {!r}".format(extra_kwargs)) @@ -965,7 +965,7 @@ def update_auto_scaling_configuration(self, auto_scaling_configuration_id, updat "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_auto_scaling_configuration got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1065,7 +1065,7 @@ def update_auto_scaling_policy(self, auto_scaling_configuration_id, auto_scaling "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_auto_scaling_policy got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/budget/budget_client.py b/src/oci/budget/budget_client.py index 53d1dfb79d..772ac14031 100644 --- a/src/oci/budget/budget_client.py +++ b/src/oci/budget/budget_client.py @@ -122,7 +122,7 @@ def create_alert_rule(self, budget_id, create_alert_rule_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_alert_rule got unknown kwargs: {!r}".format(extra_kwargs)) @@ -208,7 +208,7 @@ def create_budget(self, create_budget_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_budget got unknown kwargs: {!r}".format(extra_kwargs)) @@ -285,7 +285,7 @@ def delete_alert_rule(self, budget_id, alert_rule_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_alert_rule got unknown kwargs: {!r}".format(extra_kwargs)) @@ -366,7 +366,7 @@ def delete_budget(self, budget_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_budget got unknown kwargs: {!r}".format(extra_kwargs)) @@ -441,7 +441,7 @@ def get_alert_rule(self, budget_id, alert_rule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_alert_rule got unknown kwargs: {!r}".format(extra_kwargs)) @@ -515,7 +515,7 @@ def get_budget(self, budget_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_budget got unknown kwargs: {!r}".format(extra_kwargs)) @@ -618,7 +618,7 @@ def list_alert_rules(self, budget_id, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_alert_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -758,7 +758,7 @@ def list_budgets(self, compartment_id, **kwargs): "target_type", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_budgets got unknown kwargs: {!r}".format(extra_kwargs)) @@ -861,7 +861,7 @@ def update_alert_rule(self, budget_id, alert_rule_id, update_alert_rule_details, "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_alert_rule got unknown kwargs: {!r}".format(extra_kwargs)) @@ -949,7 +949,7 @@ def update_budget(self, budget_id, update_budget_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_budget got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/container_engine/container_engine_client.py b/src/oci/container_engine/container_engine_client.py index 1a54c12c80..11aefad6b2 100644 --- a/src/oci/container_engine/container_engine_client.py +++ b/src/oci/container_engine/container_engine_client.py @@ -119,7 +119,7 @@ def create_cluster(self, create_cluster_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_cluster got unknown kwargs: {!r}".format(extra_kwargs)) @@ -188,7 +188,7 @@ def create_kubeconfig(self, cluster_id, **kwargs): "opc_request_id", "create_cluster_kubeconfig_content_details" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_kubeconfig got unknown kwargs: {!r}".format(extra_kwargs)) @@ -269,7 +269,7 @@ def create_node_pool(self, create_node_pool_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_node_pool got unknown kwargs: {!r}".format(extra_kwargs)) @@ -340,7 +340,7 @@ def delete_cluster(self, cluster_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_cluster got unknown kwargs: {!r}".format(extra_kwargs)) @@ -419,7 +419,7 @@ def delete_node_pool(self, node_pool_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_node_pool got unknown kwargs: {!r}".format(extra_kwargs)) @@ -498,7 +498,7 @@ def delete_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -571,7 +571,7 @@ def get_cluster(self, cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_cluster got unknown kwargs: {!r}".format(extra_kwargs)) @@ -645,7 +645,7 @@ def get_cluster_options(self, cluster_option_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_cluster_options got unknown kwargs: {!r}".format(extra_kwargs)) @@ -719,7 +719,7 @@ def get_node_pool(self, node_pool_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_node_pool got unknown kwargs: {!r}".format(extra_kwargs)) @@ -793,7 +793,7 @@ def get_node_pool_options(self, node_pool_option_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_node_pool_options got unknown kwargs: {!r}".format(extra_kwargs)) @@ -867,7 +867,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -978,7 +978,7 @@ def list_clusters(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_clusters got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1110,7 +1110,7 @@ def list_node_pools(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_node_pools got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1202,7 +1202,7 @@ def list_work_request_errors(self, compartment_id, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_request_errors got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1286,7 +1286,7 @@ def list_work_request_logs(self, compartment_id, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_request_logs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1414,7 +1414,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_requests got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1529,7 +1529,7 @@ def update_cluster(self, cluster_id, update_cluster_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_cluster got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1613,7 +1613,7 @@ def update_node_pool(self, node_pool_id, update_node_pool_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_node_pool got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/core/blockstorage_client.py b/src/oci/core/blockstorage_client.py index bf478b39a7..d191c0b6a2 100644 --- a/src/oci/core/blockstorage_client.py +++ b/src/oci/core/blockstorage_client.py @@ -125,7 +125,7 @@ def change_boot_volume_backup_compartment(self, boot_volume_backup_id, change_bo "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_boot_volume_backup_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -206,7 +206,7 @@ def change_boot_volume_compartment(self, boot_volume_id, change_boot_volume_comp "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_boot_volume_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -287,7 +287,7 @@ def change_volume_backup_compartment(self, volume_backup_id, change_volume_backu "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_volume_backup_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -368,7 +368,7 @@ def change_volume_compartment(self, volume_id, change_volume_compartment_details "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_volume_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -449,7 +449,7 @@ def change_volume_group_backup_compartment(self, volume_group_backup_id, change_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_volume_group_backup_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -530,7 +530,7 @@ def change_volume_group_compartment(self, volume_group_id, change_volume_group_c "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_volume_group_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -618,7 +618,7 @@ def copy_volume_backup(self, volume_backup_id, copy_volume_backup_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "copy_volume_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -705,7 +705,7 @@ def create_boot_volume(self, create_boot_volume_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_boot_volume got unknown kwargs: {!r}".format(extra_kwargs)) @@ -781,7 +781,7 @@ def create_boot_volume_backup(self, create_boot_volume_backup_details, **kwargs) "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_boot_volume_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -867,7 +867,7 @@ def create_volume(self, create_volume_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_volume got unknown kwargs: {!r}".format(extra_kwargs)) @@ -943,7 +943,7 @@ def create_volume_backup(self, create_volume_backup_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_volume_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1003,7 +1003,7 @@ def create_volume_backup_policy_assignment(self, create_volume_backup_policy_ass method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_volume_backup_policy_assignment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1076,7 +1076,7 @@ def create_volume_group(self, create_volume_group_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_volume_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1148,7 +1148,7 @@ def create_volume_group_backup(self, create_volume_group_backup_details, **kwarg "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_volume_group_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1220,7 +1220,7 @@ def delete_boot_volume(self, boot_volume_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_boot_volume got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1293,7 +1293,7 @@ def delete_boot_volume_backup(self, boot_volume_backup_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_boot_volume_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1366,7 +1366,7 @@ def delete_boot_volume_kms_key(self, boot_volume_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_boot_volume_kms_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1444,7 +1444,7 @@ def delete_volume(self, volume_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_volume got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1517,7 +1517,7 @@ def delete_volume_backup(self, volume_backup_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_volume_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1590,7 +1590,7 @@ def delete_volume_backup_policy_assignment(self, policy_assignment_id, **kwargs) "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_volume_backup_policy_assignment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1666,7 +1666,7 @@ def delete_volume_group(self, volume_group_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_volume_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1741,7 +1741,7 @@ def delete_volume_group_backup(self, volume_group_backup_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_volume_group_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1814,7 +1814,7 @@ def delete_volume_kms_key(self, volume_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_volume_kms_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1878,7 +1878,7 @@ def get_boot_volume(self, boot_volume_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_boot_volume got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1942,7 +1942,7 @@ def get_boot_volume_backup(self, boot_volume_backup_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_boot_volume_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2015,7 +2015,7 @@ def get_boot_volume_kms_key(self, boot_volume_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_boot_volume_kms_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2081,7 +2081,7 @@ def get_volume(self, volume_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_volume got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2145,7 +2145,7 @@ def get_volume_backup(self, volume_backup_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_volume_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2209,7 +2209,7 @@ def get_volume_backup_policy(self, policy_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_volume_backup_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2296,7 +2296,7 @@ def get_volume_backup_policy_asset_assignment(self, asset_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_volume_backup_policy_asset_assignment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2357,7 +2357,7 @@ def get_volume_backup_policy_assignment(self, policy_assignment_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_volume_backup_policy_assignment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2423,7 +2423,7 @@ def get_volume_group(self, volume_group_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_volume_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2489,7 +2489,7 @@ def get_volume_group_backup(self, volume_group_backup_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_volume_group_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2562,7 +2562,7 @@ def get_volume_kms_key(self, volume_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_volume_kms_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2685,7 +2685,7 @@ def list_boot_volume_backups(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_boot_volume_backups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2804,7 +2804,7 @@ def list_boot_volumes(self, availability_domain, compartment_id, **kwargs): "page", "volume_group_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_boot_volumes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2885,7 +2885,7 @@ def list_volume_backup_policies(self, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_volume_backup_policies got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3006,7 +3006,7 @@ def list_volume_backups(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_volume_backups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3148,7 +3148,7 @@ def list_volume_group_backups(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_volume_group_backups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3289,7 +3289,7 @@ def list_volume_groups(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_volume_groups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3439,7 +3439,7 @@ def list_volumes(self, compartment_id, **kwargs): "volume_group_id", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_volumes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3539,7 +3539,7 @@ def update_boot_volume(self, boot_volume_id, update_boot_volume_details, **kwarg "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_boot_volume got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3620,7 +3620,7 @@ def update_boot_volume_backup(self, boot_volume_backup_id, update_boot_volume_ba "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_boot_volume_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3700,7 +3700,7 @@ def update_boot_volume_kms_key(self, boot_volume_id, update_boot_volume_kms_key_ "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_boot_volume_kms_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3781,7 +3781,7 @@ def update_volume(self, volume_id, update_volume_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_volume got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3862,7 +3862,7 @@ def update_volume_backup(self, volume_backup_id, update_volume_backup_details, * "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_volume_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3949,7 +3949,7 @@ def update_volume_group(self, volume_group_id, update_volume_group_details, **kw "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_volume_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4031,7 +4031,7 @@ def update_volume_group_backup(self, volume_group_backup_id, update_volume_group "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_volume_group_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4111,7 +4111,7 @@ def update_volume_kms_key(self, volume_id, update_volume_kms_key_details, **kwar "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_volume_kms_key got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/core/compute_client.py b/src/oci/core/compute_client.py index 1dbdb4cf68..699ad09941 100644 --- a/src/oci/core/compute_client.py +++ b/src/oci/core/compute_client.py @@ -121,7 +121,7 @@ def attach_boot_volume(self, attach_boot_volume_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "attach_boot_volume got unknown kwargs: {!r}".format(extra_kwargs)) @@ -194,7 +194,7 @@ def attach_vnic(self, attach_vnic_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "attach_vnic got unknown kwargs: {!r}".format(extra_kwargs)) @@ -263,7 +263,7 @@ def attach_volume(self, attach_volume_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "attach_volume got unknown kwargs: {!r}".format(extra_kwargs)) @@ -348,7 +348,7 @@ def capture_console_history(self, capture_console_history_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "capture_console_history got unknown kwargs: {!r}".format(extra_kwargs)) @@ -431,7 +431,7 @@ def change_dedicated_vm_host_compartment(self, dedicated_vm_host_id, change_dedi "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_dedicated_vm_host_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -532,7 +532,7 @@ def change_image_compartment(self, image_id, change_image_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_image_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -634,7 +634,7 @@ def change_instance_compartment(self, instance_id, change_instance_compartment_d "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_instance_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -715,7 +715,7 @@ def create_app_catalog_subscription(self, create_app_catalog_subscription_detail "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_app_catalog_subscription got unknown kwargs: {!r}".format(extra_kwargs)) @@ -789,7 +789,7 @@ def create_dedicated_vm_host(self, create_dedicated_vm_host_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_dedicated_vm_host got unknown kwargs: {!r}".format(extra_kwargs)) @@ -886,7 +886,7 @@ def create_image(self, create_image_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_image got unknown kwargs: {!r}".format(extra_kwargs)) @@ -961,7 +961,7 @@ def create_instance_console_connection(self, create_instance_console_connection_ "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_instance_console_connection got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1027,7 +1027,7 @@ def delete_app_catalog_subscription(self, listing_id, compartment_id, resource_v method = "DELETE" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_app_catalog_subscription got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1095,7 +1095,7 @@ def delete_console_history(self, instance_console_history_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_console_history got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1169,7 +1169,7 @@ def delete_dedicated_vm_host(self, dedicated_vm_host_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_dedicated_vm_host got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1244,7 +1244,7 @@ def delete_image(self, image_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_image got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1317,7 +1317,7 @@ def delete_instance_console_connection(self, instance_console_connection_id, **k "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_instance_console_connection got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1393,7 +1393,7 @@ def detach_boot_volume(self, boot_volume_attachment_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "detach_boot_volume got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1477,7 +1477,7 @@ def detach_vnic(self, vnic_attachment_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "detach_vnic got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1553,7 +1553,7 @@ def detach_volume(self, volume_attachment_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "detach_volume got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1653,7 +1653,7 @@ def export_image(self, image_id, export_image_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "export_image got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1724,7 +1724,7 @@ def get_app_catalog_listing(self, listing_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_app_catalog_listing got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1791,7 +1791,7 @@ def get_app_catalog_listing_agreements(self, listing_id, resource_version, **kwa method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_app_catalog_listing_agreements got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1859,7 +1859,7 @@ def get_app_catalog_listing_resource_version(self, listing_id, resource_version, method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_app_catalog_listing_resource_version got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1924,7 +1924,7 @@ def get_boot_volume_attachment(self, boot_volume_attachment_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_boot_volume_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1990,7 +1990,7 @@ def get_console_history(self, instance_console_history_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_console_history got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2067,7 +2067,7 @@ def get_console_history_content(self, instance_console_history_id, **kwargs): "offset", "length" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_console_history_content got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2147,7 +2147,7 @@ def get_dedicated_vm_host(self, dedicated_vm_host_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_dedicated_vm_host got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2215,7 +2215,7 @@ def get_image(self, image_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_image got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2279,7 +2279,7 @@ def get_instance(self, instance_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_instance got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2343,7 +2343,7 @@ def get_instance_console_connection(self, instance_console_connection_id, **kwar method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_instance_console_connection got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2407,7 +2407,7 @@ def get_vnic_attachment(self, vnic_attachment_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_vnic_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2471,7 +2471,7 @@ def get_volume_attachment(self, volume_attachment_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_volume_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2536,7 +2536,7 @@ def get_windows_instance_initial_credentials(self, instance_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_windows_instance_initial_credentials got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2636,7 +2636,7 @@ def instance_action(self, instance_id, action, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "instance_action got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2758,7 +2758,7 @@ def launch_instance(self, launch_instance_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "launch_instance got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2844,7 +2844,7 @@ def list_app_catalog_listing_resource_versions(self, listing_id, **kwargs): "page", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_app_catalog_listing_resource_versions got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2961,7 +2961,7 @@ def list_app_catalog_listings(self, **kwargs): "publisher_type", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_app_catalog_listings got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3079,7 +3079,7 @@ def list_app_catalog_subscriptions(self, compartment_id, **kwargs): "sort_order", "listing_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_app_catalog_subscriptions got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3194,7 +3194,7 @@ def list_boot_volume_attachments(self, availability_domain, compartment_id, **kw "instance_id", "boot_volume_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_boot_volume_attachments got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3317,7 +3317,7 @@ def list_console_histories(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_console_histories got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3443,7 +3443,7 @@ def list_dedicated_vm_host_instance_shapes(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_dedicated_vm_host_instance_shapes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3565,7 +3565,7 @@ def list_dedicated_vm_host_instances(self, compartment_id, dedicated_vm_host_id, "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_dedicated_vm_host_instances got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3695,7 +3695,7 @@ def list_dedicated_vm_host_shapes(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_dedicated_vm_host_shapes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3831,7 +3831,7 @@ def list_dedicated_vm_hosts(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_dedicated_vm_hosts got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3999,7 +3999,7 @@ def list_images(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_images got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4119,7 +4119,7 @@ def list_instance_console_connections(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_instance_console_connections got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4235,7 +4235,7 @@ def list_instance_devices(self, instance_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_instance_devices got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4388,7 +4388,7 @@ def list_instances(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_instances got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4511,7 +4511,7 @@ def list_shapes(self, compartment_id, **kwargs): "page", "image_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_shapes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4613,7 +4613,7 @@ def list_vnic_attachments(self, compartment_id, **kwargs): "page", "vnic_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_vnic_attachments got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4718,7 +4718,7 @@ def list_volume_attachments(self, compartment_id, **kwargs): "instance_id", "volume_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_volume_attachments got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4803,7 +4803,7 @@ def terminate_instance(self, instance_id, **kwargs): "if_match", "preserve_boot_volume" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "terminate_instance got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4886,7 +4886,7 @@ def update_console_history(self, instance_console_history_id, update_console_his "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_console_history got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4980,7 +4980,7 @@ def update_dedicated_vm_host(self, dedicated_vm_host_id, update_dedicated_vm_hos "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_dedicated_vm_host got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5074,7 +5074,7 @@ def update_image(self, image_id, update_image_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_image got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5171,7 +5171,7 @@ def update_instance(self, instance_id, update_instance_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_instance got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/core/compute_client_composite_operations.py b/src/oci/core/compute_client_composite_operations.py index eb0c7b9a0c..3a4cc82885 100644 --- a/src/oci/core/compute_client_composite_operations.py +++ b/src/oci/core/compute_client_composite_operations.py @@ -216,6 +216,47 @@ def change_dedicated_vm_host_compartment_and_wait_for_work_request(self, dedicat except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def change_dedicated_vm_host_compartment_and_wait_for_state(self, dedicated_vm_host_id, change_dedicated_vm_host_compartment_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.core.ComputeClient.change_dedicated_vm_host_compartment` and waits for the :py:class:`~oci.core.models.WorkRequest` + to enter the given state(s). + + :param str dedicated_vm_host_id: (required) + The OCID of the dedicated VM host. + + :param ChangeDedicatedVmHostCompartmentDetails change_dedicated_vm_host_compartment_details: (required) + Request to change the compartment of a given dedicated vm host. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.core.models.WorkRequest.status` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.core.ComputeClient.change_dedicated_vm_host_compartment` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.change_dedicated_vm_host_compartment(dedicated_vm_host_id, change_dedicated_vm_host_compartment_details, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def change_instance_compartment_and_wait_for_work_request(self, instance_id, change_instance_compartment_details, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.core.ComputeClient.change_instance_compartment` and waits for the oci.work_requests.models.WorkRequest @@ -254,6 +295,47 @@ def change_instance_compartment_and_wait_for_work_request(self, instance_id, cha except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def change_instance_compartment_and_wait_for_state(self, instance_id, change_instance_compartment_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.core.ComputeClient.change_instance_compartment` and waits for the :py:class:`~oci.core.models.WorkRequest` + to enter the given state(s). + + :param str instance_id: (required) + The OCID of the instance. + + :param ChangeInstanceCompartmentDetails change_instance_compartment_details: (required) + Request to change the compartment of a given instance. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.core.models.WorkRequest.status` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.core.ComputeClient.change_instance_compartment` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.change_instance_compartment(instance_id, change_instance_compartment_details, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def create_dedicated_vm_host_and_wait_for_work_request(self, create_dedicated_vm_host_details, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.core.ComputeClient.create_dedicated_vm_host` and waits for the oci.work_requests.models.WorkRequest @@ -520,6 +602,52 @@ def delete_dedicated_vm_host_and_wait_for_work_request(self, dedicated_vm_host_i except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def delete_dedicated_vm_host_and_wait_for_state(self, dedicated_vm_host_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.core.ComputeClient.delete_dedicated_vm_host` and waits for the :py:class:`~oci.core.models.WorkRequest` + to enter the given state(s). + + :param str dedicated_vm_host_id: (required) + The OCID of the dedicated VM host. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.core.models.WorkRequest.status` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.core.ComputeClient.delete_dedicated_vm_host` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = None + try: + operation_result = self.client.delete_dedicated_vm_host(dedicated_vm_host_id, **operation_kwargs) + except oci.exceptions.ServiceError as e: + if e.status == 404: + return WAIT_RESOURCE_NOT_FOUND + else: + raise e + + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def delete_image_and_wait_for_state(self, image_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.core.ComputeClient.delete_image` and waits for the :py:class:`~oci.core.models.Image` acted upon diff --git a/src/oci/core/compute_management_client.py b/src/oci/core/compute_management_client.py index 64eb4721fb..1039609bef 100644 --- a/src/oci/core/compute_management_client.py +++ b/src/oci/core/compute_management_client.py @@ -130,7 +130,7 @@ def attach_load_balancer(self, instance_pool_id, attach_load_balancer_details, * "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "attach_load_balancer got unknown kwargs: {!r}".format(extra_kwargs)) @@ -177,6 +177,101 @@ def attach_load_balancer(self, instance_pool_id, attach_load_balancer_details, * body=attach_load_balancer_details, response_type="InstancePool") + def change_cluster_network_compartment(self, cluster_network_id, change_cluster_network_compartment_details, **kwargs): + """ + ChangeClusterNetworkCompartment + Change the compartment of a cluster network. + + + :param str cluster_network_id: (required) + The OCID of the cluster network. + + :param ChangeClusterNetworkCompartmentDetails change_cluster_network_compartment_details: (required) + Request to change the compartment of given cluster network. + + :param str if_match: (optional) + For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + parameter to the value of the etag from a previous GET or POST response for that resource. The resource + will be updated or deleted only if the etag you provide matches the resource's current etag value. + + :param str opc_request_id: (optional) + Unique identifier for the request. + If you need to contact Oracle about a particular request, please provide the request ID. + + :param str opc_retry_token: (optional) + A token that uniquely identifies a request so it can be retried in case of a timeout or + server error without risk of executing that same action again. Retry tokens expire after 24 + hours, but can be invalidated before then due to conflicting operations (for example, if a resource + has been deleted and purged from the system, then a retry of the original creation request + may be rejected). + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. A convenience :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` + is also available. The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :return: A :class:`~oci.response.Response` object with data of type None + :rtype: :class:`~oci.response.Response` + """ + resource_path = "/clusterNetworks/{clusterNetworkId}/actions/changeCompartment" + method = "POST" + + # Don't accept unknown kwargs + expected_kwargs = [ + "retry_strategy", + "if_match", + "opc_request_id", + "opc_retry_token" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "change_cluster_network_compartment got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "clusterNetworkId": cluster_network_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "if-match": kwargs.get("if_match", missing), + "opc-request-id": kwargs.get("opc_request_id", missing), + "opc-retry-token": kwargs.get("opc_retry_token", missing) + } + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + + retry_strategy = self.retry_strategy + if kwargs.get('retry_strategy'): + retry_strategy = kwargs.get('retry_strategy') + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_retry_token_if_needed(header_params) + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=change_cluster_network_compartment_details) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=change_cluster_network_compartment_details) + def change_instance_configuration_compartment(self, instance_configuration_id, change_instance_configuration_compartment_details, **kwargs): """ ChangeInstanceConfigurationCompartment @@ -241,7 +336,7 @@ def change_instance_configuration_compartment(self, instance_configuration_id, c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_instance_configuration_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -343,7 +438,7 @@ def change_instance_pool_compartment(self, instance_pool_id, change_instance_poo "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_instance_pool_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -389,6 +484,75 @@ def change_instance_pool_compartment(self, instance_pool_id, change_instance_poo header_params=header_params, body=change_instance_pool_compartment_details) + def create_cluster_network(self, create_cluster_network_details, **kwargs): + """ + CreateClusterNetwork + Create a cluster network. + + + :param CreateClusterNetworkDetails create_cluster_network_details: (required) + Cluster network creation details + + :param str opc_retry_token: (optional) + A token that uniquely identifies a request so it can be retried in case of a timeout or + server error without risk of executing that same action again. Retry tokens expire after 24 + hours, but can be invalidated before then due to conflicting operations (for example, if a resource + has been deleted and purged from the system, then a retry of the original creation request + may be rejected). + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. A convenience :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` + is also available. The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.core.models.ClusterNetwork` + :rtype: :class:`~oci.response.Response` + """ + resource_path = "/clusterNetworks" + method = "POST" + + # Don't accept unknown kwargs + expected_kwargs = [ + "retry_strategy", + "opc_retry_token" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "create_cluster_network got unknown kwargs: {!r}".format(extra_kwargs)) + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "opc-retry-token": kwargs.get("opc_retry_token", missing) + } + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + + retry_strategy = self.retry_strategy + if kwargs.get('retry_strategy'): + retry_strategy = kwargs.get('retry_strategy') + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_retry_token_if_needed(header_params) + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + header_params=header_params, + body=create_cluster_network_details, + response_type="ClusterNetwork") + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + header_params=header_params, + body=create_cluster_network_details, + response_type="ClusterNetwork") + def create_instance_configuration(self, create_instance_configuration, **kwargs): """ CreateInstanceConfiguration @@ -425,7 +589,7 @@ def create_instance_configuration(self, create_instance_configuration, **kwargs) "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_instance_configuration got unknown kwargs: {!r}".format(extra_kwargs)) @@ -494,7 +658,7 @@ def create_instance_pool(self, create_instance_pool_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_instance_pool got unknown kwargs: {!r}".format(extra_kwargs)) @@ -561,7 +725,7 @@ def delete_instance_configuration(self, instance_configuration_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_instance_configuration got unknown kwargs: {!r}".format(extra_kwargs)) @@ -645,7 +809,7 @@ def detach_load_balancer(self, instance_pool_id, detach_load_balancer_details, * "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "detach_load_balancer got unknown kwargs: {!r}".format(extra_kwargs)) @@ -692,6 +856,70 @@ def detach_load_balancer(self, instance_pool_id, detach_load_balancer_details, * body=detach_load_balancer_details, response_type="InstancePool") + def get_cluster_network(self, cluster_network_id, **kwargs): + """ + GetClusterNetwork + Gets the specified cluster network + + + :param str cluster_network_id: (required) + The OCID of the cluster network. + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. A convenience :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` + is also available. The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.core.models.ClusterNetwork` + :rtype: :class:`~oci.response.Response` + """ + resource_path = "/clusterNetworks/{clusterNetworkId}" + method = "GET" + + expected_kwargs = ["retry_strategy"] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "get_cluster_network got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "clusterNetworkId": cluster_network_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) + + header_params = { + "accept": "application/json", + "content-type": "application/json" + } + + retry_strategy = self.retry_strategy + if kwargs.get('retry_strategy'): + retry_strategy = kwargs.get('retry_strategy') + + if retry_strategy: + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + response_type="ClusterNetwork") + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + response_type="ClusterNetwork") + def get_instance_configuration(self, instance_configuration_id, **kwargs): """ GetInstanceConfiguration @@ -716,7 +944,7 @@ def get_instance_configuration(self, instance_configuration_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_instance_configuration got unknown kwargs: {!r}".format(extra_kwargs)) @@ -780,7 +1008,7 @@ def get_instance_pool(self, instance_pool_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_instance_pool got unknown kwargs: {!r}".format(extra_kwargs)) @@ -847,7 +1075,7 @@ def get_instance_pool_load_balancer_attachment(self, instance_pool_id, instance_ method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_instance_pool_load_balancer_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -932,7 +1160,7 @@ def launch_instance_configuration(self, instance_configuration_id, instance_conf "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "launch_instance_configuration got unknown kwargs: {!r}".format(extra_kwargs)) @@ -978,10 +1206,10 @@ def launch_instance_configuration(self, instance_configuration_id, instance_conf body=instance_configuration, response_type="Instance") - def list_instance_configurations(self, compartment_id, **kwargs): + def list_cluster_network_instances(self, compartment_id, cluster_network_id, **kwargs): """ - ListInstanceConfigurations - Lists the instance configurations in the specified compartment. + ListClusterNetworkInstances + List the instances in the specified cluster network. :param str compartment_id: (required) @@ -989,6 +1217,12 @@ def list_instance_configurations(self, compartment_id, **kwargs): __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + :param str cluster_network_id: (required) + The OCID of the cluster network. + + :param str display_name: (optional) + A filter to return only resources that match the given display name exactly. + :param int limit: (optional) For list pagination. The maximum number of results per page, or items to return in a paginated \"List\" call. For important details about how pagination works, see @@ -1031,24 +1265,35 @@ def list_instance_configurations(self, compartment_id, **kwargs): To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. - :return: A :class:`~oci.response.Response` object with data of type list of :class:`~oci.core.models.InstanceConfigurationSummary` + :return: A :class:`~oci.response.Response` object with data of type list of :class:`~oci.core.models.InstanceSummary` :rtype: :class:`~oci.response.Response` """ - resource_path = "/instanceConfigurations" + resource_path = "/clusterNetworks/{clusterNetworkId}/instances" method = "GET" # Don't accept unknown kwargs expected_kwargs = [ "retry_strategy", + "display_name", "limit", "page", "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( - "list_instance_configurations got unknown kwargs: {!r}".format(extra_kwargs)) + "list_cluster_network_instances got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "clusterNetworkId": cluster_network_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) if 'sort_by' in kwargs: sort_by_allowed_values = ["TIMECREATED", "DISPLAYNAME"] @@ -1066,6 +1311,7 @@ def list_instance_configurations(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id, + "displayName": kwargs.get("display_name", missing), "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing), "sortBy": kwargs.get("sort_by", missing), @@ -1087,21 +1333,23 @@ def list_instance_configurations(self, compartment_id, **kwargs): self.base_client.call_api, resource_path=resource_path, method=method, + path_params=path_params, query_params=query_params, header_params=header_params, - response_type="list[InstanceConfigurationSummary]") + response_type="list[InstanceSummary]") else: return self.base_client.call_api( resource_path=resource_path, method=method, + path_params=path_params, query_params=query_params, header_params=header_params, - response_type="list[InstanceConfigurationSummary]") + response_type="list[InstanceSummary]") - def list_instance_pool_instances(self, compartment_id, instance_pool_id, **kwargs): + def list_cluster_networks(self, compartment_id, **kwargs): """ - ListInstancePoolInstances - List the instances in the specified instance pool. + ListClusterNetworks + Lists the cluster networks in the specified compartment. :param str compartment_id: (required) @@ -1109,9 +1357,6 @@ def list_instance_pool_instances(self, compartment_id, instance_pool_id, **kwarg __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm - :param str instance_pool_id: (required) - The OCID of the instance pool. - :param str display_name: (optional) A filter to return only resources that match the given display name exactly. @@ -1149,6 +1394,11 @@ def list_instance_pool_instances(self, compartment_id, instance_pool_id, **kwarg Allowed values are: "ASC", "DESC" + :param str lifecycle_state: (optional) + A filter to only return resources that match the given lifecycle state. The state value is case-insensitive. + + Allowed values are: "PROVISIONING", "SCALING", "STARTING", "STOPPING", "TERMINATING", "STOPPED", "TERMINATED", "RUNNING" + :param obj retry_strategy: (optional) A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. @@ -1157,10 +1407,10 @@ def list_instance_pool_instances(self, compartment_id, instance_pool_id, **kwarg To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. - :return: A :class:`~oci.response.Response` object with data of type list of :class:`~oci.core.models.InstanceSummary` + :return: A :class:`~oci.response.Response` object with data of type list of :class:`~oci.core.models.ClusterNetworkSummary` :rtype: :class:`~oci.response.Response` """ - resource_path = "/instancePools/{instancePoolId}/instances" + resource_path = "/clusterNetworks" method = "GET" # Don't accept unknown kwargs @@ -1170,22 +1420,13 @@ def list_instance_pool_instances(self, compartment_id, instance_pool_id, **kwarg "limit", "page", "sort_by", - "sort_order" + "sort_order", + "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( - "list_instance_pool_instances got unknown kwargs: {!r}".format(extra_kwargs)) - - path_params = { - "instancePoolId": instance_pool_id - } - - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} - - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): - raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) + "list_cluster_networks got unknown kwargs: {!r}".format(extra_kwargs)) if 'sort_by' in kwargs: sort_by_allowed_values = ["TIMECREATED", "DISPLAYNAME"] @@ -1201,13 +1442,21 @@ def list_instance_pool_instances(self, compartment_id, instance_pool_id, **kwarg "Invalid value for `sort_order`, must be one of {0}".format(sort_order_allowed_values) ) + if 'lifecycle_state' in kwargs: + lifecycle_state_allowed_values = ["PROVISIONING", "SCALING", "STARTING", "STOPPING", "TERMINATING", "STOPPED", "TERMINATED", "RUNNING"] + if kwargs['lifecycle_state'] not in lifecycle_state_allowed_values: + raise ValueError( + "Invalid value for `lifecycle_state`, must be one of {0}".format(lifecycle_state_allowed_values) + ) + query_params = { "compartmentId": compartment_id, "displayName": kwargs.get("display_name", missing), "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing), "sortBy": kwargs.get("sort_by", missing), - "sortOrder": kwargs.get("sort_order", missing) + "sortOrder": kwargs.get("sort_order", missing), + "lifecycleState": kwargs.get("lifecycle_state", missing) } query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} @@ -1225,7 +1474,265 @@ def list_instance_pool_instances(self, compartment_id, instance_pool_id, **kwarg self.base_client.call_api, resource_path=resource_path, method=method, - path_params=path_params, + query_params=query_params, + header_params=header_params, + response_type="list[ClusterNetworkSummary]") + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + query_params=query_params, + header_params=header_params, + response_type="list[ClusterNetworkSummary]") + + def list_instance_configurations(self, compartment_id, **kwargs): + """ + ListInstanceConfigurations + Lists the instance configurations in the specified compartment. + + + :param str compartment_id: (required) + The `OCID`__ of the compartment. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param int limit: (optional) + For list pagination. The maximum number of results per page, or items to return in a paginated + \"List\" call. For important details about how pagination works, see + `List Pagination`__. + + Example: `50` + + __ https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine + + :param str page: (optional) + For list pagination. The value of the `opc-next-page` response header from the previous \"List\" + call. For important details about how pagination works, see + `List Pagination`__. + + __ https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine + + :param str sort_by: (optional) + The field to sort by. You can provide one sort order (`sortOrder`). Default order for + TIMECREATED is descending. Default order for DISPLAYNAME is ascending. The DISPLAYNAME + sort order is case sensitive. + + **Note:** In general, some \"List\" operations (for example, `ListInstances`) let you + optionally filter by availability domain if the scope of the resource type is within a + single availability domain. If you call one of these \"List\" operations without specifying + an availability domain, the resources are grouped by availability domain, then sorted. + + Allowed values are: "TIMECREATED", "DISPLAYNAME" + + :param str sort_order: (optional) + The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order + is case sensitive. + + Allowed values are: "ASC", "DESC" + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. A convenience :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` + is also available. The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :return: A :class:`~oci.response.Response` object with data of type list of :class:`~oci.core.models.InstanceConfigurationSummary` + :rtype: :class:`~oci.response.Response` + """ + resource_path = "/instanceConfigurations" + method = "GET" + + # Don't accept unknown kwargs + expected_kwargs = [ + "retry_strategy", + "limit", + "page", + "sort_by", + "sort_order" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "list_instance_configurations got unknown kwargs: {!r}".format(extra_kwargs)) + + if 'sort_by' in kwargs: + sort_by_allowed_values = ["TIMECREATED", "DISPLAYNAME"] + if kwargs['sort_by'] not in sort_by_allowed_values: + raise ValueError( + "Invalid value for `sort_by`, must be one of {0}".format(sort_by_allowed_values) + ) + + if 'sort_order' in kwargs: + sort_order_allowed_values = ["ASC", "DESC"] + if kwargs['sort_order'] not in sort_order_allowed_values: + raise ValueError( + "Invalid value for `sort_order`, must be one of {0}".format(sort_order_allowed_values) + ) + + query_params = { + "compartmentId": compartment_id, + "limit": kwargs.get("limit", missing), + "page": kwargs.get("page", missing), + "sortBy": kwargs.get("sort_by", missing), + "sortOrder": kwargs.get("sort_order", missing) + } + query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + + header_params = { + "accept": "application/json", + "content-type": "application/json" + } + + retry_strategy = self.retry_strategy + if kwargs.get('retry_strategy'): + retry_strategy = kwargs.get('retry_strategy') + + if retry_strategy: + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + query_params=query_params, + header_params=header_params, + response_type="list[InstanceConfigurationSummary]") + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + query_params=query_params, + header_params=header_params, + response_type="list[InstanceConfigurationSummary]") + + def list_instance_pool_instances(self, compartment_id, instance_pool_id, **kwargs): + """ + ListInstancePoolInstances + List the instances in the specified instance pool. + + + :param str compartment_id: (required) + The `OCID`__ of the compartment. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param str instance_pool_id: (required) + The OCID of the instance pool. + + :param str display_name: (optional) + A filter to return only resources that match the given display name exactly. + + :param int limit: (optional) + For list pagination. The maximum number of results per page, or items to return in a paginated + \"List\" call. For important details about how pagination works, see + `List Pagination`__. + + Example: `50` + + __ https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine + + :param str page: (optional) + For list pagination. The value of the `opc-next-page` response header from the previous \"List\" + call. For important details about how pagination works, see + `List Pagination`__. + + __ https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine + + :param str sort_by: (optional) + The field to sort by. You can provide one sort order (`sortOrder`). Default order for + TIMECREATED is descending. Default order for DISPLAYNAME is ascending. The DISPLAYNAME + sort order is case sensitive. + + **Note:** In general, some \"List\" operations (for example, `ListInstances`) let you + optionally filter by availability domain if the scope of the resource type is within a + single availability domain. If you call one of these \"List\" operations without specifying + an availability domain, the resources are grouped by availability domain, then sorted. + + Allowed values are: "TIMECREATED", "DISPLAYNAME" + + :param str sort_order: (optional) + The sort order to use, either ascending (`ASC`) or descending (`DESC`). The DISPLAYNAME sort order + is case sensitive. + + Allowed values are: "ASC", "DESC" + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. A convenience :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` + is also available. The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :return: A :class:`~oci.response.Response` object with data of type list of :class:`~oci.core.models.InstanceSummary` + :rtype: :class:`~oci.response.Response` + """ + resource_path = "/instancePools/{instancePoolId}/instances" + method = "GET" + + # Don't accept unknown kwargs + expected_kwargs = [ + "retry_strategy", + "display_name", + "limit", + "page", + "sort_by", + "sort_order" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "list_instance_pool_instances got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "instancePoolId": instance_pool_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) + + if 'sort_by' in kwargs: + sort_by_allowed_values = ["TIMECREATED", "DISPLAYNAME"] + if kwargs['sort_by'] not in sort_by_allowed_values: + raise ValueError( + "Invalid value for `sort_by`, must be one of {0}".format(sort_by_allowed_values) + ) + + if 'sort_order' in kwargs: + sort_order_allowed_values = ["ASC", "DESC"] + if kwargs['sort_order'] not in sort_order_allowed_values: + raise ValueError( + "Invalid value for `sort_order`, must be one of {0}".format(sort_order_allowed_values) + ) + + query_params = { + "compartmentId": compartment_id, + "displayName": kwargs.get("display_name", missing), + "limit": kwargs.get("limit", missing), + "page": kwargs.get("page", missing), + "sortBy": kwargs.get("sort_by", missing), + "sortOrder": kwargs.get("sort_order", missing) + } + query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + + header_params = { + "accept": "application/json", + "content-type": "application/json" + } + + retry_strategy = self.retry_strategy + if kwargs.get('retry_strategy'): + retry_strategy = kwargs.get('retry_strategy') + + if retry_strategy: + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, query_params=query_params, header_params=header_params, response_type="list[InstanceSummary]") @@ -1315,7 +1822,7 @@ def list_instance_pools(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_instance_pools got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1419,7 +1926,7 @@ def reset_instance_pool(self, instance_pool_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "reset_instance_pool got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1506,7 +2013,7 @@ def softreset_instance_pool(self, instance_pool_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "softreset_instance_pool got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1593,7 +2100,7 @@ def start_instance_pool(self, instance_pool_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "start_instance_pool got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1680,7 +2187,7 @@ def stop_instance_pool(self, instance_pool_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "stop_instance_pool got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1725,6 +2232,79 @@ def stop_instance_pool(self, instance_pool_id, **kwargs): header_params=header_params, response_type="InstancePool") + def terminate_cluster_network(self, cluster_network_id, **kwargs): + """ + TerminateClusterNetwork + Terminate the specified cluster network. + + + :param str cluster_network_id: (required) + The OCID of the cluster network. + + :param str if_match: (optional) + For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + parameter to the value of the etag from a previous GET or POST response for that resource. The resource + will be updated or deleted only if the etag you provide matches the resource's current etag value. + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. A convenience :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` + is also available. The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :return: A :class:`~oci.response.Response` object with data of type None + :rtype: :class:`~oci.response.Response` + """ + resource_path = "/clusterNetworks/{clusterNetworkId}" + method = "DELETE" + + # Don't accept unknown kwargs + expected_kwargs = [ + "retry_strategy", + "if_match" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "terminate_cluster_network got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "clusterNetworkId": cluster_network_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "if-match": kwargs.get("if_match", missing) + } + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + + retry_strategy = self.retry_strategy + if kwargs.get('retry_strategy'): + retry_strategy = kwargs.get('retry_strategy') + + if retry_strategy: + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params) + def terminate_instance_pool(self, instance_pool_id, **kwargs): """ TerminateInstancePool @@ -1758,7 +2338,7 @@ def terminate_instance_pool(self, instance_pool_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "terminate_instance_pool got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1798,6 +2378,98 @@ def terminate_instance_pool(self, instance_pool_id, **kwargs): path_params=path_params, header_params=header_params) + def update_cluster_network(self, cluster_network_id, update_cluster_network_details, **kwargs): + """ + UpdateClusterNetwork + Update the specified cluster network. + The OCID of the cluster network remains the same. + + + :param str cluster_network_id: (required) + The OCID of the cluster network. + + :param UpdateClusterNetworkDetails update_cluster_network_details: (required) + Update cluster network + + :param str opc_retry_token: (optional) + A token that uniquely identifies a request so it can be retried in case of a timeout or + server error without risk of executing that same action again. Retry tokens expire after 24 + hours, but can be invalidated before then due to conflicting operations (for example, if a resource + has been deleted and purged from the system, then a retry of the original creation request + may be rejected). + + :param str if_match: (optional) + For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + parameter to the value of the etag from a previous GET or POST response for that resource. The resource + will be updated or deleted only if the etag you provide matches the resource's current etag value. + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. A convenience :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` + is also available. The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.core.models.ClusterNetwork` + :rtype: :class:`~oci.response.Response` + """ + resource_path = "/clusterNetworks/{clusterNetworkId}" + method = "PUT" + + # Don't accept unknown kwargs + expected_kwargs = [ + "retry_strategy", + "opc_retry_token", + "if_match" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "update_cluster_network got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "clusterNetworkId": cluster_network_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "opc-retry-token": kwargs.get("opc_retry_token", missing), + "if-match": kwargs.get("if_match", missing) + } + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + + retry_strategy = self.retry_strategy + if kwargs.get('retry_strategy'): + retry_strategy = kwargs.get('retry_strategy') + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_retry_token_if_needed(header_params) + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=update_cluster_network_details, + response_type="ClusterNetwork") + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=update_cluster_network_details, + response_type="ClusterNetwork") + def update_instance_configuration(self, instance_configuration_id, update_instance_configuration_details, **kwargs): """ UpdateInstanceConfiguration @@ -1842,7 +2514,7 @@ def update_instance_configuration(self, instance_configuration_id, update_instan "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_instance_configuration got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1934,7 +2606,7 @@ def update_instance_pool(self, instance_pool_id, update_instance_pool_details, * "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_instance_pool got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/core/compute_management_client_composite_operations.py b/src/oci/core/compute_management_client_composite_operations.py index 646a1e0153..4c9499a8d8 100644 --- a/src/oci/core/compute_management_client_composite_operations.py +++ b/src/oci/core/compute_management_client_composite_operations.py @@ -67,6 +67,44 @@ def attach_load_balancer_and_wait_for_state(self, instance_pool_id, attach_load_ except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def create_cluster_network_and_wait_for_state(self, create_cluster_network_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.core.ComputeManagementClient.create_cluster_network` and waits for the :py:class:`~oci.core.models.ClusterNetwork` acted upon + to enter the given state(s). + + :param CreateClusterNetworkDetails create_cluster_network_details: (required) + Cluster network creation details + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.core.models.ClusterNetwork.lifecycle_state` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.core.ComputeManagementClient.create_cluster_network` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.create_cluster_network(create_cluster_network_details, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.data.id + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_cluster_network(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def create_instance_pool_and_wait_for_state(self, create_instance_pool_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.core.ComputeManagementClient.create_instance_pool` and waits for the :py:class:`~oci.core.models.InstancePool` acted upon @@ -298,6 +336,53 @@ def stop_instance_pool_and_wait_for_state(self, instance_pool_id, wait_for_state except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def terminate_cluster_network_and_wait_for_state(self, cluster_network_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.core.ComputeManagementClient.terminate_cluster_network` and waits for the :py:class:`~oci.core.models.ClusterNetwork` acted upon + to enter the given state(s). + + :param str cluster_network_id: (required) + The OCID of the cluster network. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.core.models.ClusterNetwork.lifecycle_state` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.core.ComputeManagementClient.terminate_cluster_network` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + initial_get_result = self.client.get_cluster_network(cluster_network_id) + operation_result = None + try: + operation_result = self.client.terminate_cluster_network(cluster_network_id, **operation_kwargs) + except oci.exceptions.ServiceError as e: + if e.status == 404: + return WAIT_RESOURCE_NOT_FOUND + else: + raise e + + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + + try: + waiter_result = oci.wait_until( + self.client, + initial_get_result, + evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, + succeed_on_not_found=True, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def terminate_instance_pool_and_wait_for_state(self, instance_pool_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.core.ComputeManagementClient.terminate_instance_pool` and waits for the :py:class:`~oci.core.models.InstancePool` acted upon @@ -345,6 +430,47 @@ def terminate_instance_pool_and_wait_for_state(self, instance_pool_id, wait_for_ except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_cluster_network_and_wait_for_state(self, cluster_network_id, update_cluster_network_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.core.ComputeManagementClient.update_cluster_network` and waits for the :py:class:`~oci.core.models.ClusterNetwork` acted upon + to enter the given state(s). + + :param str cluster_network_id: (required) + The OCID of the cluster network. + + :param UpdateClusterNetworkDetails update_cluster_network_details: (required) + Update cluster network + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.core.models.ClusterNetwork.lifecycle_state` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.core.ComputeManagementClient.update_cluster_network` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.update_cluster_network(cluster_network_id, update_cluster_network_details, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.data.id + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_cluster_network(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_instance_pool_and_wait_for_state(self, instance_pool_id, update_instance_pool_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.core.ComputeManagementClient.update_instance_pool` and waits for the :py:class:`~oci.core.models.InstancePool` acted upon diff --git a/src/oci/core/models/__init__.py b/src/oci/core/models/__init__.py index 0a9bd46709..5150b96e52 100644 --- a/src/oci/core/models/__init__.py +++ b/src/oci/core/models/__init__.py @@ -34,6 +34,7 @@ from .capture_console_history_details import CaptureConsoleHistoryDetails from .change_boot_volume_backup_compartment_details import ChangeBootVolumeBackupCompartmentDetails from .change_boot_volume_compartment_details import ChangeBootVolumeCompartmentDetails +from .change_cluster_network_compartment_details import ChangeClusterNetworkCompartmentDetails from .change_cpe_compartment_details import ChangeCpeCompartmentDetails from .change_cross_connect_compartment_details import ChangeCrossConnectCompartmentDetails from .change_cross_connect_group_compartment_details import ChangeCrossConnectGroupCompartmentDetails @@ -60,6 +61,9 @@ from .change_volume_compartment_details import ChangeVolumeCompartmentDetails from .change_volume_group_backup_compartment_details import ChangeVolumeGroupBackupCompartmentDetails from .change_volume_group_compartment_details import ChangeVolumeGroupCompartmentDetails +from .cluster_network import ClusterNetwork +from .cluster_network_placement_configuration_details import ClusterNetworkPlacementConfigurationDetails +from .cluster_network_summary import ClusterNetworkSummary from .compute_instance_details import ComputeInstanceDetails from .connect_local_peering_gateways_details import ConnectLocalPeeringGatewaysDetails from .connect_remote_peering_connections_details import ConnectRemotePeeringConnectionsDetails @@ -69,6 +73,8 @@ from .create_app_catalog_subscription_details import CreateAppCatalogSubscriptionDetails from .create_boot_volume_backup_details import CreateBootVolumeBackupDetails from .create_boot_volume_details import CreateBootVolumeDetails +from .create_cluster_network_details import CreateClusterNetworkDetails +from .create_cluster_network_instance_pool_details import CreateClusterNetworkInstancePoolDetails from .create_cpe_details import CreateCpeDetails from .create_cross_connect_details import CreateCrossConnectDetails from .create_cross_connect_group_details import CreateCrossConnectGroupDetails @@ -214,6 +220,7 @@ from .update_boot_volume_backup_details import UpdateBootVolumeBackupDetails from .update_boot_volume_details import UpdateBootVolumeDetails from .update_boot_volume_kms_key_details import UpdateBootVolumeKmsKeyDetails +from .update_cluster_network_details import UpdateClusterNetworkDetails from .update_console_history_details import UpdateConsoleHistoryDetails from .update_cpe_details import UpdateCpeDetails from .update_cross_connect_details import UpdateCrossConnectDetails @@ -311,6 +318,7 @@ "CaptureConsoleHistoryDetails": CaptureConsoleHistoryDetails, "ChangeBootVolumeBackupCompartmentDetails": ChangeBootVolumeBackupCompartmentDetails, "ChangeBootVolumeCompartmentDetails": ChangeBootVolumeCompartmentDetails, + "ChangeClusterNetworkCompartmentDetails": ChangeClusterNetworkCompartmentDetails, "ChangeCpeCompartmentDetails": ChangeCpeCompartmentDetails, "ChangeCrossConnectCompartmentDetails": ChangeCrossConnectCompartmentDetails, "ChangeCrossConnectGroupCompartmentDetails": ChangeCrossConnectGroupCompartmentDetails, @@ -337,6 +345,9 @@ "ChangeVolumeCompartmentDetails": ChangeVolumeCompartmentDetails, "ChangeVolumeGroupBackupCompartmentDetails": ChangeVolumeGroupBackupCompartmentDetails, "ChangeVolumeGroupCompartmentDetails": ChangeVolumeGroupCompartmentDetails, + "ClusterNetwork": ClusterNetwork, + "ClusterNetworkPlacementConfigurationDetails": ClusterNetworkPlacementConfigurationDetails, + "ClusterNetworkSummary": ClusterNetworkSummary, "ComputeInstanceDetails": ComputeInstanceDetails, "ConnectLocalPeeringGatewaysDetails": ConnectLocalPeeringGatewaysDetails, "ConnectRemotePeeringConnectionsDetails": ConnectRemotePeeringConnectionsDetails, @@ -346,6 +357,8 @@ "CreateAppCatalogSubscriptionDetails": CreateAppCatalogSubscriptionDetails, "CreateBootVolumeBackupDetails": CreateBootVolumeBackupDetails, "CreateBootVolumeDetails": CreateBootVolumeDetails, + "CreateClusterNetworkDetails": CreateClusterNetworkDetails, + "CreateClusterNetworkInstancePoolDetails": CreateClusterNetworkInstancePoolDetails, "CreateCpeDetails": CreateCpeDetails, "CreateCrossConnectDetails": CreateCrossConnectDetails, "CreateCrossConnectGroupDetails": CreateCrossConnectGroupDetails, @@ -491,6 +504,7 @@ "UpdateBootVolumeBackupDetails": UpdateBootVolumeBackupDetails, "UpdateBootVolumeDetails": UpdateBootVolumeDetails, "UpdateBootVolumeKmsKeyDetails": UpdateBootVolumeKmsKeyDetails, + "UpdateClusterNetworkDetails": UpdateClusterNetworkDetails, "UpdateConsoleHistoryDetails": UpdateConsoleHistoryDetails, "UpdateCpeDetails": UpdateCpeDetails, "UpdateCrossConnectDetails": UpdateCrossConnectDetails, diff --git a/src/oci/core/models/change_cluster_network_compartment_details.py b/src/oci/core/models/change_cluster_network_compartment_details.py new file mode 100644 index 0000000000..7aa95c454e --- /dev/null +++ b/src/oci/core/models/change_cluster_network_compartment_details.py @@ -0,0 +1,75 @@ +# coding: utf-8 +# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class ChangeClusterNetworkCompartmentDetails(object): + """ + Contains details indicating which compartment the resource should move to + """ + + def __init__(self, **kwargs): + """ + Initializes a new ChangeClusterNetworkCompartmentDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param compartment_id: + The value to assign to the compartment_id property of this ChangeClusterNetworkCompartmentDetails. + :type compartment_id: str + + """ + self.swagger_types = { + 'compartment_id': 'str' + } + + self.attribute_map = { + 'compartment_id': 'compartmentId' + } + + self._compartment_id = None + + @property + def compartment_id(self): + """ + **[Required]** Gets the compartment_id of this ChangeClusterNetworkCompartmentDetails. + The `OCID`__ of the compartment + into which the resource should be moved. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :return: The compartment_id of this ChangeClusterNetworkCompartmentDetails. + :rtype: str + """ + return self._compartment_id + + @compartment_id.setter + def compartment_id(self, compartment_id): + """ + Sets the compartment_id of this ChangeClusterNetworkCompartmentDetails. + The `OCID`__ of the compartment + into which the resource should be moved. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :param compartment_id: The compartment_id of this ChangeClusterNetworkCompartmentDetails. + :type: str + """ + self._compartment_id = compartment_id + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/core/models/cluster_network.py b/src/oci/core/models/cluster_network.py new file mode 100644 index 0000000000..42b6052a78 --- /dev/null +++ b/src/oci/core/models/cluster_network.py @@ -0,0 +1,412 @@ +# coding: utf-8 +# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class ClusterNetwork(object): + """ + Cluster Network + """ + + #: A constant which can be used with the lifecycle_state property of a ClusterNetwork. + #: This constant has a value of "PROVISIONING" + LIFECYCLE_STATE_PROVISIONING = "PROVISIONING" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetwork. + #: This constant has a value of "SCALING" + LIFECYCLE_STATE_SCALING = "SCALING" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetwork. + #: This constant has a value of "STARTING" + LIFECYCLE_STATE_STARTING = "STARTING" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetwork. + #: This constant has a value of "STOPPING" + LIFECYCLE_STATE_STOPPING = "STOPPING" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetwork. + #: This constant has a value of "TERMINATING" + LIFECYCLE_STATE_TERMINATING = "TERMINATING" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetwork. + #: This constant has a value of "STOPPED" + LIFECYCLE_STATE_STOPPED = "STOPPED" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetwork. + #: This constant has a value of "TERMINATED" + LIFECYCLE_STATE_TERMINATED = "TERMINATED" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetwork. + #: This constant has a value of "RUNNING" + LIFECYCLE_STATE_RUNNING = "RUNNING" + + def __init__(self, **kwargs): + """ + Initializes a new ClusterNetwork object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param id: + The value to assign to the id property of this ClusterNetwork. + :type id: str + + :param compartment_id: + The value to assign to the compartment_id property of this ClusterNetwork. + :type compartment_id: str + + :param defined_tags: + The value to assign to the defined_tags property of this ClusterNetwork. + :type defined_tags: dict(str, dict(str, object)) + + :param display_name: + The value to assign to the display_name property of this ClusterNetwork. + :type display_name: str + + :param freeform_tags: + The value to assign to the freeform_tags property of this ClusterNetwork. + :type freeform_tags: dict(str, str) + + :param instance_pools: + The value to assign to the instance_pools property of this ClusterNetwork. + :type instance_pools: list[InstancePool] + + :param placement_configuration: + The value to assign to the placement_configuration property of this ClusterNetwork. + :type placement_configuration: ClusterNetworkPlacementConfigurationDetails + + :param lifecycle_state: + The value to assign to the lifecycle_state property of this ClusterNetwork. + Allowed values for this property are: "PROVISIONING", "SCALING", "STARTING", "STOPPING", "TERMINATING", "STOPPED", "TERMINATED", "RUNNING", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type lifecycle_state: str + + :param time_created: + The value to assign to the time_created property of this ClusterNetwork. + :type time_created: datetime + + :param time_updated: + The value to assign to the time_updated property of this ClusterNetwork. + :type time_updated: datetime + + """ + self.swagger_types = { + 'id': 'str', + 'compartment_id': 'str', + 'defined_tags': 'dict(str, dict(str, object))', + 'display_name': 'str', + 'freeform_tags': 'dict(str, str)', + 'instance_pools': 'list[InstancePool]', + 'placement_configuration': 'ClusterNetworkPlacementConfigurationDetails', + 'lifecycle_state': 'str', + 'time_created': 'datetime', + 'time_updated': 'datetime' + } + + self.attribute_map = { + 'id': 'id', + 'compartment_id': 'compartmentId', + 'defined_tags': 'definedTags', + 'display_name': 'displayName', + 'freeform_tags': 'freeformTags', + 'instance_pools': 'instancePools', + 'placement_configuration': 'placementConfiguration', + 'lifecycle_state': 'lifecycleState', + 'time_created': 'timeCreated', + 'time_updated': 'timeUpdated' + } + + self._id = None + self._compartment_id = None + self._defined_tags = None + self._display_name = None + self._freeform_tags = None + self._instance_pools = None + self._placement_configuration = None + self._lifecycle_state = None + self._time_created = None + self._time_updated = None + + @property + def id(self): + """ + **[Required]** Gets the id of this ClusterNetwork. + The OCID of the cluster network. + + + :return: The id of this ClusterNetwork. + :rtype: str + """ + return self._id + + @id.setter + def id(self, id): + """ + Sets the id of this ClusterNetwork. + The OCID of the cluster network. + + + :param id: The id of this ClusterNetwork. + :type: str + """ + self._id = id + + @property + def compartment_id(self): + """ + **[Required]** Gets the compartment_id of this ClusterNetwork. + The OCID of the compartment containing the cluster netowrk. + + + :return: The compartment_id of this ClusterNetwork. + :rtype: str + """ + return self._compartment_id + + @compartment_id.setter + def compartment_id(self, compartment_id): + """ + Sets the compartment_id of this ClusterNetwork. + The OCID of the compartment containing the cluster netowrk. + + + :param compartment_id: The compartment_id of this ClusterNetwork. + :type: str + """ + self._compartment_id = compartment_id + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ClusterNetwork. + Defined tags for this resource. Each key is predefined and scoped to a + namespace. For more information, see `Resource Tags`__. + + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ClusterNetwork. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ClusterNetwork. + Defined tags for this resource. Each key is predefined and scoped to a + namespace. For more information, see `Resource Tags`__. + + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ClusterNetwork. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + + @property + def display_name(self): + """ + Gets the display_name of this ClusterNetwork. + The user-friendly name. Does not have to be unique. + + + :return: The display_name of this ClusterNetwork. + :rtype: str + """ + return self._display_name + + @display_name.setter + def display_name(self, display_name): + """ + Sets the display_name of this ClusterNetwork. + The user-friendly name. Does not have to be unique. + + + :param display_name: The display_name of this ClusterNetwork. + :type: str + """ + self._display_name = display_name + + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ClusterNetwork. + Free-form tags for this resource. Each tag is a simple key-value pair with no + predefined name, type, or namespace. For more information, see `Resource Tags`__. + + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ClusterNetwork. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ClusterNetwork. + Free-form tags for this resource. Each tag is a simple key-value pair with no + predefined name, type, or namespace. For more information, see `Resource Tags`__. + + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ClusterNetwork. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def instance_pools(self): + """ + Gets the instance_pools of this ClusterNetwork. + the instance pools in the cluster network. + + + :return: The instance_pools of this ClusterNetwork. + :rtype: list[InstancePool] + """ + return self._instance_pools + + @instance_pools.setter + def instance_pools(self, instance_pools): + """ + Sets the instance_pools of this ClusterNetwork. + the instance pools in the cluster network. + + + :param instance_pools: The instance_pools of this ClusterNetwork. + :type: list[InstancePool] + """ + self._instance_pools = instance_pools + + @property + def placement_configuration(self): + """ + Gets the placement_configuration of this ClusterNetwork. + the placement data for the intance pools in the cluster network + + + :return: The placement_configuration of this ClusterNetwork. + :rtype: ClusterNetworkPlacementConfigurationDetails + """ + return self._placement_configuration + + @placement_configuration.setter + def placement_configuration(self, placement_configuration): + """ + Sets the placement_configuration of this ClusterNetwork. + the placement data for the intance pools in the cluster network + + + :param placement_configuration: The placement_configuration of this ClusterNetwork. + :type: ClusterNetworkPlacementConfigurationDetails + """ + self._placement_configuration = placement_configuration + + @property + def lifecycle_state(self): + """ + **[Required]** Gets the lifecycle_state of this ClusterNetwork. + The current state of the cluster network. + + Allowed values for this property are: "PROVISIONING", "SCALING", "STARTING", "STOPPING", "TERMINATING", "STOPPED", "TERMINATED", "RUNNING", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The lifecycle_state of this ClusterNetwork. + :rtype: str + """ + return self._lifecycle_state + + @lifecycle_state.setter + def lifecycle_state(self, lifecycle_state): + """ + Sets the lifecycle_state of this ClusterNetwork. + The current state of the cluster network. + + + :param lifecycle_state: The lifecycle_state of this ClusterNetwork. + :type: str + """ + allowed_values = ["PROVISIONING", "SCALING", "STARTING", "STOPPING", "TERMINATING", "STOPPED", "TERMINATED", "RUNNING"] + if not value_allowed_none_or_none_sentinel(lifecycle_state, allowed_values): + lifecycle_state = 'UNKNOWN_ENUM_VALUE' + self._lifecycle_state = lifecycle_state + + @property + def time_created(self): + """ + **[Required]** Gets the time_created of this ClusterNetwork. + The date and time the resource was created, in the format defined by RFC3339. + Example: `2016-08-25T21:10:29.600Z` + + + :return: The time_created of this ClusterNetwork. + :rtype: datetime + """ + return self._time_created + + @time_created.setter + def time_created(self, time_created): + """ + Sets the time_created of this ClusterNetwork. + The date and time the resource was created, in the format defined by RFC3339. + Example: `2016-08-25T21:10:29.600Z` + + + :param time_created: The time_created of this ClusterNetwork. + :type: datetime + """ + self._time_created = time_created + + @property + def time_updated(self): + """ + **[Required]** Gets the time_updated of this ClusterNetwork. + The date and time the resource was updated, in the format defined by RFC3339. + Example: `2016-08-25T21:10:29.600Z` + + + :return: The time_updated of this ClusterNetwork. + :rtype: datetime + """ + return self._time_updated + + @time_updated.setter + def time_updated(self, time_updated): + """ + Sets the time_updated of this ClusterNetwork. + The date and time the resource was updated, in the format defined by RFC3339. + Example: `2016-08-25T21:10:29.600Z` + + + :param time_updated: The time_updated of this ClusterNetwork. + :type: datetime + """ + self._time_updated = time_updated + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/core/models/cluster_network_placement_configuration_details.py b/src/oci/core/models/cluster_network_placement_configuration_details.py new file mode 100644 index 0000000000..1c2862009a --- /dev/null +++ b/src/oci/core/models/cluster_network_placement_configuration_details.py @@ -0,0 +1,133 @@ +# coding: utf-8 +# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class ClusterNetworkPlacementConfigurationDetails(object): + """ + The location for where the instance pools in a cluster network will place instances. + """ + + def __init__(self, **kwargs): + """ + Initializes a new ClusterNetworkPlacementConfigurationDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param availability_domain: + The value to assign to the availability_domain property of this ClusterNetworkPlacementConfigurationDetails. + :type availability_domain: str + + :param primary_subnet_id: + The value to assign to the primary_subnet_id property of this ClusterNetworkPlacementConfigurationDetails. + :type primary_subnet_id: str + + :param secondary_vnic_subnets: + The value to assign to the secondary_vnic_subnets property of this ClusterNetworkPlacementConfigurationDetails. + :type secondary_vnic_subnets: list[InstancePoolPlacementSecondaryVnicSubnet] + + """ + self.swagger_types = { + 'availability_domain': 'str', + 'primary_subnet_id': 'str', + 'secondary_vnic_subnets': 'list[InstancePoolPlacementSecondaryVnicSubnet]' + } + + self.attribute_map = { + 'availability_domain': 'availabilityDomain', + 'primary_subnet_id': 'primarySubnetId', + 'secondary_vnic_subnets': 'secondaryVnicSubnets' + } + + self._availability_domain = None + self._primary_subnet_id = None + self._secondary_vnic_subnets = None + + @property + def availability_domain(self): + """ + **[Required]** Gets the availability_domain of this ClusterNetworkPlacementConfigurationDetails. + The availability domain to place instances. + Example: `Uocm:PHX-AD-1` + + + :return: The availability_domain of this ClusterNetworkPlacementConfigurationDetails. + :rtype: str + """ + return self._availability_domain + + @availability_domain.setter + def availability_domain(self, availability_domain): + """ + Sets the availability_domain of this ClusterNetworkPlacementConfigurationDetails. + The availability domain to place instances. + Example: `Uocm:PHX-AD-1` + + + :param availability_domain: The availability_domain of this ClusterNetworkPlacementConfigurationDetails. + :type: str + """ + self._availability_domain = availability_domain + + @property + def primary_subnet_id(self): + """ + **[Required]** Gets the primary_subnet_id of this ClusterNetworkPlacementConfigurationDetails. + The OCID of the primary subnet to place instances. + + + :return: The primary_subnet_id of this ClusterNetworkPlacementConfigurationDetails. + :rtype: str + """ + return self._primary_subnet_id + + @primary_subnet_id.setter + def primary_subnet_id(self, primary_subnet_id): + """ + Sets the primary_subnet_id of this ClusterNetworkPlacementConfigurationDetails. + The OCID of the primary subnet to place instances. + + + :param primary_subnet_id: The primary_subnet_id of this ClusterNetworkPlacementConfigurationDetails. + :type: str + """ + self._primary_subnet_id = primary_subnet_id + + @property + def secondary_vnic_subnets(self): + """ + Gets the secondary_vnic_subnets of this ClusterNetworkPlacementConfigurationDetails. + The set of secondary VNIC data for instances in the pool. + + + :return: The secondary_vnic_subnets of this ClusterNetworkPlacementConfigurationDetails. + :rtype: list[InstancePoolPlacementSecondaryVnicSubnet] + """ + return self._secondary_vnic_subnets + + @secondary_vnic_subnets.setter + def secondary_vnic_subnets(self, secondary_vnic_subnets): + """ + Sets the secondary_vnic_subnets of this ClusterNetworkPlacementConfigurationDetails. + The set of secondary VNIC data for instances in the pool. + + + :param secondary_vnic_subnets: The secondary_vnic_subnets of this ClusterNetworkPlacementConfigurationDetails. + :type: list[InstancePoolPlacementSecondaryVnicSubnet] + """ + self._secondary_vnic_subnets = secondary_vnic_subnets + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/core/models/cluster_network_summary.py b/src/oci/core/models/cluster_network_summary.py new file mode 100644 index 0000000000..d0fd9c438c --- /dev/null +++ b/src/oci/core/models/cluster_network_summary.py @@ -0,0 +1,381 @@ +# coding: utf-8 +# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class ClusterNetworkSummary(object): + """ + Condensed Cluster Network data when listing cluster networks. + """ + + #: A constant which can be used with the lifecycle_state property of a ClusterNetworkSummary. + #: This constant has a value of "PROVISIONING" + LIFECYCLE_STATE_PROVISIONING = "PROVISIONING" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetworkSummary. + #: This constant has a value of "SCALING" + LIFECYCLE_STATE_SCALING = "SCALING" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetworkSummary. + #: This constant has a value of "STARTING" + LIFECYCLE_STATE_STARTING = "STARTING" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetworkSummary. + #: This constant has a value of "STOPPING" + LIFECYCLE_STATE_STOPPING = "STOPPING" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetworkSummary. + #: This constant has a value of "TERMINATING" + LIFECYCLE_STATE_TERMINATING = "TERMINATING" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetworkSummary. + #: This constant has a value of "STOPPED" + LIFECYCLE_STATE_STOPPED = "STOPPED" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetworkSummary. + #: This constant has a value of "TERMINATED" + LIFECYCLE_STATE_TERMINATED = "TERMINATED" + + #: A constant which can be used with the lifecycle_state property of a ClusterNetworkSummary. + #: This constant has a value of "RUNNING" + LIFECYCLE_STATE_RUNNING = "RUNNING" + + def __init__(self, **kwargs): + """ + Initializes a new ClusterNetworkSummary object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param id: + The value to assign to the id property of this ClusterNetworkSummary. + :type id: str + + :param compartment_id: + The value to assign to the compartment_id property of this ClusterNetworkSummary. + :type compartment_id: str + + :param defined_tags: + The value to assign to the defined_tags property of this ClusterNetworkSummary. + :type defined_tags: dict(str, dict(str, object)) + + :param display_name: + The value to assign to the display_name property of this ClusterNetworkSummary. + :type display_name: str + + :param freeform_tags: + The value to assign to the freeform_tags property of this ClusterNetworkSummary. + :type freeform_tags: dict(str, str) + + :param instance_pools: + The value to assign to the instance_pools property of this ClusterNetworkSummary. + :type instance_pools: list[InstancePoolSummary] + + :param lifecycle_state: + The value to assign to the lifecycle_state property of this ClusterNetworkSummary. + Allowed values for this property are: "PROVISIONING", "SCALING", "STARTING", "STOPPING", "TERMINATING", "STOPPED", "TERMINATED", "RUNNING", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type lifecycle_state: str + + :param time_created: + The value to assign to the time_created property of this ClusterNetworkSummary. + :type time_created: datetime + + :param time_updated: + The value to assign to the time_updated property of this ClusterNetworkSummary. + :type time_updated: datetime + + """ + self.swagger_types = { + 'id': 'str', + 'compartment_id': 'str', + 'defined_tags': 'dict(str, dict(str, object))', + 'display_name': 'str', + 'freeform_tags': 'dict(str, str)', + 'instance_pools': 'list[InstancePoolSummary]', + 'lifecycle_state': 'str', + 'time_created': 'datetime', + 'time_updated': 'datetime' + } + + self.attribute_map = { + 'id': 'id', + 'compartment_id': 'compartmentId', + 'defined_tags': 'definedTags', + 'display_name': 'displayName', + 'freeform_tags': 'freeformTags', + 'instance_pools': 'instancePools', + 'lifecycle_state': 'lifecycleState', + 'time_created': 'timeCreated', + 'time_updated': 'timeUpdated' + } + + self._id = None + self._compartment_id = None + self._defined_tags = None + self._display_name = None + self._freeform_tags = None + self._instance_pools = None + self._lifecycle_state = None + self._time_created = None + self._time_updated = None + + @property + def id(self): + """ + **[Required]** Gets the id of this ClusterNetworkSummary. + The OCID of the cluster network. + + + :return: The id of this ClusterNetworkSummary. + :rtype: str + """ + return self._id + + @id.setter + def id(self, id): + """ + Sets the id of this ClusterNetworkSummary. + The OCID of the cluster network. + + + :param id: The id of this ClusterNetworkSummary. + :type: str + """ + self._id = id + + @property + def compartment_id(self): + """ + **[Required]** Gets the compartment_id of this ClusterNetworkSummary. + The OCID of the compartment containing the cluster netowrk. + + + :return: The compartment_id of this ClusterNetworkSummary. + :rtype: str + """ + return self._compartment_id + + @compartment_id.setter + def compartment_id(self, compartment_id): + """ + Sets the compartment_id of this ClusterNetworkSummary. + The OCID of the compartment containing the cluster netowrk. + + + :param compartment_id: The compartment_id of this ClusterNetworkSummary. + :type: str + """ + self._compartment_id = compartment_id + + @property + def defined_tags(self): + """ + Gets the defined_tags of this ClusterNetworkSummary. + Defined tags for this resource. Each key is predefined and scoped to a + namespace. For more information, see `Resource Tags`__. + + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this ClusterNetworkSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this ClusterNetworkSummary. + Defined tags for this resource. Each key is predefined and scoped to a + namespace. For more information, see `Resource Tags`__. + + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this ClusterNetworkSummary. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + + @property + def display_name(self): + """ + Gets the display_name of this ClusterNetworkSummary. + The user-friendly name. Does not have to be unique. + + + :return: The display_name of this ClusterNetworkSummary. + :rtype: str + """ + return self._display_name + + @display_name.setter + def display_name(self, display_name): + """ + Sets the display_name of this ClusterNetworkSummary. + The user-friendly name. Does not have to be unique. + + + :param display_name: The display_name of this ClusterNetworkSummary. + :type: str + """ + self._display_name = display_name + + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this ClusterNetworkSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no + predefined name, type, or namespace. For more information, see `Resource Tags`__. + + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this ClusterNetworkSummary. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this ClusterNetworkSummary. + Free-form tags for this resource. Each tag is a simple key-value pair with no + predefined name, type, or namespace. For more information, see `Resource Tags`__. + + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this ClusterNetworkSummary. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def instance_pools(self): + """ + Gets the instance_pools of this ClusterNetworkSummary. + The instance pools in the cluster network. + + + :return: The instance_pools of this ClusterNetworkSummary. + :rtype: list[InstancePoolSummary] + """ + return self._instance_pools + + @instance_pools.setter + def instance_pools(self, instance_pools): + """ + Sets the instance_pools of this ClusterNetworkSummary. + The instance pools in the cluster network. + + + :param instance_pools: The instance_pools of this ClusterNetworkSummary. + :type: list[InstancePoolSummary] + """ + self._instance_pools = instance_pools + + @property + def lifecycle_state(self): + """ + **[Required]** Gets the lifecycle_state of this ClusterNetworkSummary. + The current state of the cluster network. + + Allowed values for this property are: "PROVISIONING", "SCALING", "STARTING", "STOPPING", "TERMINATING", "STOPPED", "TERMINATED", "RUNNING", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The lifecycle_state of this ClusterNetworkSummary. + :rtype: str + """ + return self._lifecycle_state + + @lifecycle_state.setter + def lifecycle_state(self, lifecycle_state): + """ + Sets the lifecycle_state of this ClusterNetworkSummary. + The current state of the cluster network. + + + :param lifecycle_state: The lifecycle_state of this ClusterNetworkSummary. + :type: str + """ + allowed_values = ["PROVISIONING", "SCALING", "STARTING", "STOPPING", "TERMINATING", "STOPPED", "TERMINATED", "RUNNING"] + if not value_allowed_none_or_none_sentinel(lifecycle_state, allowed_values): + lifecycle_state = 'UNKNOWN_ENUM_VALUE' + self._lifecycle_state = lifecycle_state + + @property + def time_created(self): + """ + **[Required]** Gets the time_created of this ClusterNetworkSummary. + The date and time the resource was created, in the format defined by RFC3339. + Example: `2016-08-25T21:10:29.600Z` + + + :return: The time_created of this ClusterNetworkSummary. + :rtype: datetime + """ + return self._time_created + + @time_created.setter + def time_created(self, time_created): + """ + Sets the time_created of this ClusterNetworkSummary. + The date and time the resource was created, in the format defined by RFC3339. + Example: `2016-08-25T21:10:29.600Z` + + + :param time_created: The time_created of this ClusterNetworkSummary. + :type: datetime + """ + self._time_created = time_created + + @property + def time_updated(self): + """ + **[Required]** Gets the time_updated of this ClusterNetworkSummary. + The date and time the resource was updated, in the format defined by RFC3339. + Example: `2016-08-25T21:10:29.600Z` + + + :return: The time_updated of this ClusterNetworkSummary. + :rtype: datetime + """ + return self._time_updated + + @time_updated.setter + def time_updated(self, time_updated): + """ + Sets the time_updated of this ClusterNetworkSummary. + The date and time the resource was updated, in the format defined by RFC3339. + Example: `2016-08-25T21:10:29.600Z` + + + :param time_updated: The time_updated of this ClusterNetworkSummary. + :type: datetime + """ + self._time_updated = time_updated + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/core/models/create_cluster_network_details.py b/src/oci/core/models/create_cluster_network_details.py new file mode 100644 index 0000000000..9d5d1bb59c --- /dev/null +++ b/src/oci/core/models/create_cluster_network_details.py @@ -0,0 +1,244 @@ +# coding: utf-8 +# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class CreateClusterNetworkDetails(object): + """ + The data to create a cluster network + """ + + def __init__(self, **kwargs): + """ + Initializes a new CreateClusterNetworkDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param compartment_id: + The value to assign to the compartment_id property of this CreateClusterNetworkDetails. + :type compartment_id: str + + :param defined_tags: + The value to assign to the defined_tags property of this CreateClusterNetworkDetails. + :type defined_tags: dict(str, dict(str, object)) + + :param display_name: + The value to assign to the display_name property of this CreateClusterNetworkDetails. + :type display_name: str + + :param freeform_tags: + The value to assign to the freeform_tags property of this CreateClusterNetworkDetails. + :type freeform_tags: dict(str, str) + + :param instance_pools: + The value to assign to the instance_pools property of this CreateClusterNetworkDetails. + :type instance_pools: list[CreateClusterNetworkInstancePoolDetails] + + :param placement_configuration: + The value to assign to the placement_configuration property of this CreateClusterNetworkDetails. + :type placement_configuration: ClusterNetworkPlacementConfigurationDetails + + """ + self.swagger_types = { + 'compartment_id': 'str', + 'defined_tags': 'dict(str, dict(str, object))', + 'display_name': 'str', + 'freeform_tags': 'dict(str, str)', + 'instance_pools': 'list[CreateClusterNetworkInstancePoolDetails]', + 'placement_configuration': 'ClusterNetworkPlacementConfigurationDetails' + } + + self.attribute_map = { + 'compartment_id': 'compartmentId', + 'defined_tags': 'definedTags', + 'display_name': 'displayName', + 'freeform_tags': 'freeformTags', + 'instance_pools': 'instancePools', + 'placement_configuration': 'placementConfiguration' + } + + self._compartment_id = None + self._defined_tags = None + self._display_name = None + self._freeform_tags = None + self._instance_pools = None + self._placement_configuration = None + + @property + def compartment_id(self): + """ + **[Required]** Gets the compartment_id of this CreateClusterNetworkDetails. + The OCID of the compartment containing the cluster network. + + + :return: The compartment_id of this CreateClusterNetworkDetails. + :rtype: str + """ + return self._compartment_id + + @compartment_id.setter + def compartment_id(self, compartment_id): + """ + Sets the compartment_id of this CreateClusterNetworkDetails. + The OCID of the compartment containing the cluster network. + + + :param compartment_id: The compartment_id of this CreateClusterNetworkDetails. + :type: str + """ + self._compartment_id = compartment_id + + @property + def defined_tags(self): + """ + Gets the defined_tags of this CreateClusterNetworkDetails. + Defined tags for this resource. Each key is predefined and scoped to a + namespace. For more information, see `Resource Tags`__. + + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this CreateClusterNetworkDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this CreateClusterNetworkDetails. + Defined tags for this resource. Each key is predefined and scoped to a + namespace. For more information, see `Resource Tags`__. + + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this CreateClusterNetworkDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + + @property + def display_name(self): + """ + Gets the display_name of this CreateClusterNetworkDetails. + The user-friendly name. Does not have to be unique. + + + :return: The display_name of this CreateClusterNetworkDetails. + :rtype: str + """ + return self._display_name + + @display_name.setter + def display_name(self, display_name): + """ + Sets the display_name of this CreateClusterNetworkDetails. + The user-friendly name. Does not have to be unique. + + + :param display_name: The display_name of this CreateClusterNetworkDetails. + :type: str + """ + self._display_name = display_name + + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this CreateClusterNetworkDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no + predefined name, type, or namespace. For more information, see `Resource Tags`__. + + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this CreateClusterNetworkDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this CreateClusterNetworkDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no + predefined name, type, or namespace. For more information, see `Resource Tags`__. + + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this CreateClusterNetworkDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def instance_pools(self): + """ + **[Required]** Gets the instance_pools of this CreateClusterNetworkDetails. + the data to create the instance pools in the cluster network. + + + :return: The instance_pools of this CreateClusterNetworkDetails. + :rtype: list[CreateClusterNetworkInstancePoolDetails] + """ + return self._instance_pools + + @instance_pools.setter + def instance_pools(self, instance_pools): + """ + Sets the instance_pools of this CreateClusterNetworkDetails. + the data to create the instance pools in the cluster network. + + + :param instance_pools: The instance_pools of this CreateClusterNetworkDetails. + :type: list[CreateClusterNetworkInstancePoolDetails] + """ + self._instance_pools = instance_pools + + @property + def placement_configuration(self): + """ + **[Required]** Gets the placement_configuration of this CreateClusterNetworkDetails. + the placement data for the intance pools in the cluster network + + + :return: The placement_configuration of this CreateClusterNetworkDetails. + :rtype: ClusterNetworkPlacementConfigurationDetails + """ + return self._placement_configuration + + @placement_configuration.setter + def placement_configuration(self, placement_configuration): + """ + Sets the placement_configuration of this CreateClusterNetworkDetails. + the placement data for the intance pools in the cluster network + + + :param placement_configuration: The placement_configuration of this CreateClusterNetworkDetails. + :type: ClusterNetworkPlacementConfigurationDetails + """ + self._placement_configuration = placement_configuration + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/core/models/create_cluster_network_instance_pool_details.py b/src/oci/core/models/create_cluster_network_instance_pool_details.py new file mode 100644 index 0000000000..5f30eb050d --- /dev/null +++ b/src/oci/core/models/create_cluster_network_instance_pool_details.py @@ -0,0 +1,213 @@ +# coding: utf-8 +# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class CreateClusterNetworkInstancePoolDetails(object): + """ + The data to create an instance pool in a cluster network. + """ + + def __init__(self, **kwargs): + """ + Initializes a new CreateClusterNetworkInstancePoolDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param defined_tags: + The value to assign to the defined_tags property of this CreateClusterNetworkInstancePoolDetails. + :type defined_tags: dict(str, dict(str, object)) + + :param display_name: + The value to assign to the display_name property of this CreateClusterNetworkInstancePoolDetails. + :type display_name: str + + :param freeform_tags: + The value to assign to the freeform_tags property of this CreateClusterNetworkInstancePoolDetails. + :type freeform_tags: dict(str, str) + + :param instance_configuration_id: + The value to assign to the instance_configuration_id property of this CreateClusterNetworkInstancePoolDetails. + :type instance_configuration_id: str + + :param size: + The value to assign to the size property of this CreateClusterNetworkInstancePoolDetails. + :type size: int + + """ + self.swagger_types = { + 'defined_tags': 'dict(str, dict(str, object))', + 'display_name': 'str', + 'freeform_tags': 'dict(str, str)', + 'instance_configuration_id': 'str', + 'size': 'int' + } + + self.attribute_map = { + 'defined_tags': 'definedTags', + 'display_name': 'displayName', + 'freeform_tags': 'freeformTags', + 'instance_configuration_id': 'instanceConfigurationId', + 'size': 'size' + } + + self._defined_tags = None + self._display_name = None + self._freeform_tags = None + self._instance_configuration_id = None + self._size = None + + @property + def defined_tags(self): + """ + Gets the defined_tags of this CreateClusterNetworkInstancePoolDetails. + Defined tags for this resource. Each key is predefined and scoped to a + namespace. For more information, see `Resource Tags`__. + + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this CreateClusterNetworkInstancePoolDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this CreateClusterNetworkInstancePoolDetails. + Defined tags for this resource. Each key is predefined and scoped to a + namespace. For more information, see `Resource Tags`__. + + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this CreateClusterNetworkInstancePoolDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + + @property + def display_name(self): + """ + Gets the display_name of this CreateClusterNetworkInstancePoolDetails. + The user-friendly name. Does not have to be unique. + + + :return: The display_name of this CreateClusterNetworkInstancePoolDetails. + :rtype: str + """ + return self._display_name + + @display_name.setter + def display_name(self, display_name): + """ + Sets the display_name of this CreateClusterNetworkInstancePoolDetails. + The user-friendly name. Does not have to be unique. + + + :param display_name: The display_name of this CreateClusterNetworkInstancePoolDetails. + :type: str + """ + self._display_name = display_name + + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this CreateClusterNetworkInstancePoolDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no + predefined name, type, or namespace. For more information, see `Resource Tags`__. + + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this CreateClusterNetworkInstancePoolDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this CreateClusterNetworkInstancePoolDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no + predefined name, type, or namespace. For more information, see `Resource Tags`__. + + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this CreateClusterNetworkInstancePoolDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + @property + def instance_configuration_id(self): + """ + **[Required]** Gets the instance_configuration_id of this CreateClusterNetworkInstancePoolDetails. + The OCID of the instance configuration associated to the instance pool. + + + :return: The instance_configuration_id of this CreateClusterNetworkInstancePoolDetails. + :rtype: str + """ + return self._instance_configuration_id + + @instance_configuration_id.setter + def instance_configuration_id(self, instance_configuration_id): + """ + Sets the instance_configuration_id of this CreateClusterNetworkInstancePoolDetails. + The OCID of the instance configuration associated to the instance pool. + + + :param instance_configuration_id: The instance_configuration_id of this CreateClusterNetworkInstancePoolDetails. + :type: str + """ + self._instance_configuration_id = instance_configuration_id + + @property + def size(self): + """ + **[Required]** Gets the size of this CreateClusterNetworkInstancePoolDetails. + The number of instances that should be in the instance pool. + + + :return: The size of this CreateClusterNetworkInstancePoolDetails. + :rtype: int + """ + return self._size + + @size.setter + def size(self, size): + """ + Sets the size of this CreateClusterNetworkInstancePoolDetails. + The number of instances that should be in the instance pool. + + + :param size: The size of this CreateClusterNetworkInstancePoolDetails. + :type: int + """ + self._size = size + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/core/models/update_cluster_network_details.py b/src/oci/core/models/update_cluster_network_details.py new file mode 100644 index 0000000000..510b93c0f4 --- /dev/null +++ b/src/oci/core/models/update_cluster_network_details.py @@ -0,0 +1,151 @@ +# coding: utf-8 +# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class UpdateClusterNetworkDetails(object): + """ + The data to update a cluster network + """ + + def __init__(self, **kwargs): + """ + Initializes a new UpdateClusterNetworkDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param defined_tags: + The value to assign to the defined_tags property of this UpdateClusterNetworkDetails. + :type defined_tags: dict(str, dict(str, object)) + + :param display_name: + The value to assign to the display_name property of this UpdateClusterNetworkDetails. + :type display_name: str + + :param freeform_tags: + The value to assign to the freeform_tags property of this UpdateClusterNetworkDetails. + :type freeform_tags: dict(str, str) + + """ + self.swagger_types = { + 'defined_tags': 'dict(str, dict(str, object))', + 'display_name': 'str', + 'freeform_tags': 'dict(str, str)' + } + + self.attribute_map = { + 'defined_tags': 'definedTags', + 'display_name': 'displayName', + 'freeform_tags': 'freeformTags' + } + + self._defined_tags = None + self._display_name = None + self._freeform_tags = None + + @property + def defined_tags(self): + """ + Gets the defined_tags of this UpdateClusterNetworkDetails. + Defined tags for this resource. Each key is predefined and scoped to a + namespace. For more information, see `Resource Tags`__. + + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The defined_tags of this UpdateClusterNetworkDetails. + :rtype: dict(str, dict(str, object)) + """ + return self._defined_tags + + @defined_tags.setter + def defined_tags(self, defined_tags): + """ + Sets the defined_tags of this UpdateClusterNetworkDetails. + Defined tags for this resource. Each key is predefined and scoped to a + namespace. For more information, see `Resource Tags`__. + + Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param defined_tags: The defined_tags of this UpdateClusterNetworkDetails. + :type: dict(str, dict(str, object)) + """ + self._defined_tags = defined_tags + + @property + def display_name(self): + """ + Gets the display_name of this UpdateClusterNetworkDetails. + The user-friendly name. Does not have to be unique. + + + :return: The display_name of this UpdateClusterNetworkDetails. + :rtype: str + """ + return self._display_name + + @display_name.setter + def display_name(self, display_name): + """ + Sets the display_name of this UpdateClusterNetworkDetails. + The user-friendly name. Does not have to be unique. + + + :param display_name: The display_name of this UpdateClusterNetworkDetails. + :type: str + """ + self._display_name = display_name + + @property + def freeform_tags(self): + """ + Gets the freeform_tags of this UpdateClusterNetworkDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no + predefined name, type, or namespace. For more information, see `Resource Tags`__. + + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :return: The freeform_tags of this UpdateClusterNetworkDetails. + :rtype: dict(str, str) + """ + return self._freeform_tags + + @freeform_tags.setter + def freeform_tags(self, freeform_tags): + """ + Sets the freeform_tags of this UpdateClusterNetworkDetails. + Free-form tags for this resource. Each tag is a simple key-value pair with no + predefined name, type, or namespace. For more information, see `Resource Tags`__. + + Example: `{\"Department\": \"Finance\"}` + + __ https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm + + + :param freeform_tags: The freeform_tags of this UpdateClusterNetworkDetails. + :type: dict(str, str) + """ + self._freeform_tags = freeform_tags + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/core/virtual_network_client.py b/src/oci/core/virtual_network_client.py index bc73762b72..90e27c5a7f 100644 --- a/src/oci/core/virtual_network_client.py +++ b/src/oci/core/virtual_network_client.py @@ -115,7 +115,7 @@ def add_network_security_group_security_rules(self, network_security_group_id, a method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "add_network_security_group_security_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -204,7 +204,7 @@ def attach_service_id(self, service_gateway_id, attach_service_details, **kwargs "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "attach_service_id got unknown kwargs: {!r}".format(extra_kwargs)) @@ -278,7 +278,7 @@ def bulk_add_virtual_circuit_public_prefixes(self, virtual_circuit_id, bulk_add_ method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "bulk_add_virtual_circuit_public_prefixes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -348,7 +348,7 @@ def bulk_delete_virtual_circuit_public_prefixes(self, virtual_circuit_id, bulk_d method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "bulk_delete_virtual_circuit_public_prefixes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -435,7 +435,7 @@ def change_cpe_compartment(self, cpe_id, change_cpe_compartment_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_cpe_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -527,7 +527,7 @@ def change_cross_connect_compartment(self, cross_connect_id, change_cross_connec "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_cross_connect_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -619,7 +619,7 @@ def change_cross_connect_group_compartment(self, cross_connect_group_id, change_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_cross_connect_group_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -711,7 +711,7 @@ def change_dhcp_options_compartment(self, dhcp_id, change_dhcp_options_compartme "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_dhcp_options_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -803,7 +803,7 @@ def change_internet_gateway_compartment(self, ig_id, change_internet_gateway_com "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_internet_gateway_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -895,7 +895,7 @@ def change_ip_sec_connection_compartment(self, ipsc_id, change_ip_sec_connection "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_ip_sec_connection_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -987,7 +987,7 @@ def change_local_peering_gateway_compartment(self, local_peering_gateway_id, cha "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_local_peering_gateway_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1081,7 +1081,7 @@ def change_nat_gateway_compartment(self, nat_gateway_id, change_nat_gateway_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_nat_gateway_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1174,7 +1174,7 @@ def change_network_security_group_compartment(self, network_security_group_id, c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_network_security_group_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1269,7 +1269,7 @@ def change_public_ip_compartment(self, public_ip_id, change_public_ip_compartmen "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_public_ip_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1361,7 +1361,7 @@ def change_remote_peering_connection_compartment(self, remote_peering_connection "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_remote_peering_connection_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1453,7 +1453,7 @@ def change_route_table_compartment(self, rt_id, change_route_table_compartment_d "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_route_table_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1545,7 +1545,7 @@ def change_security_list_compartment(self, security_list_id, change_security_lis "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_security_list_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1639,7 +1639,7 @@ def change_service_gateway_compartment(self, service_gateway_id, change_service_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_service_gateway_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1731,7 +1731,7 @@ def change_subnet_compartment(self, subnet_id, change_subnet_compartment_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_subnet_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1825,7 +1825,7 @@ def change_vcn_compartment(self, vcn_id, change_vcn_compartment_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_vcn_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1917,7 +1917,7 @@ def change_virtual_circuit_compartment(self, virtual_circuit_id, change_virtual_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_virtual_circuit_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1998,7 +1998,7 @@ def connect_local_peering_gateways(self, local_peering_gateway_id, connect_local method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "connect_local_peering_gateways got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2074,7 +2074,7 @@ def connect_remote_peering_connections(self, remote_peering_connection_id, conne method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "connect_remote_peering_connections got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2168,7 +2168,7 @@ def create_cpe(self, create_cpe_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_cpe got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2259,7 +2259,7 @@ def create_cross_connect(self, create_cross_connect_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_cross_connect got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2346,7 +2346,7 @@ def create_cross_connect_group(self, create_cross_connect_group_details, **kwarg "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_cross_connect_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2429,7 +2429,7 @@ def create_dhcp_options(self, create_dhcp_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_dhcp_options got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2513,7 +2513,7 @@ def create_drg(self, create_drg_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_drg got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2595,7 +2595,7 @@ def create_drg_attachment(self, create_drg_attachment_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_drg_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2688,7 +2688,7 @@ def create_internet_gateway(self, create_internet_gateway_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_internet_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2790,7 +2790,7 @@ def create_ip_sec_connection(self, create_ip_sec_connection_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_ip_sec_connection got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2864,7 +2864,7 @@ def create_ipv6(self, create_ipv6_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_ipv6 got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2934,7 +2934,7 @@ def create_local_peering_gateway(self, create_local_peering_gateway_details, **k "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_local_peering_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3004,7 +3004,7 @@ def create_nat_gateway(self, create_nat_gateway_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_nat_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3073,7 +3073,7 @@ def create_network_security_group(self, create_network_security_group_details, * "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_network_security_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3146,7 +3146,7 @@ def create_private_ip(self, create_private_ip_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_private_ip got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3237,7 +3237,7 @@ def create_public_ip(self, create_public_ip_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_public_ip got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3306,7 +3306,7 @@ def create_remote_peering_connection(self, create_remote_peering_connection_deta "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_remote_peering_connection got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3394,7 +3394,7 @@ def create_route_table(self, create_route_table_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_route_table got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3481,7 +3481,7 @@ def create_security_list(self, create_security_list_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_security_list got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3561,7 +3561,7 @@ def create_service_gateway(self, create_service_gateway_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_service_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3669,7 +3669,7 @@ def create_subnet(self, create_subnet_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_subnet got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3773,7 +3773,7 @@ def create_vcn(self, create_vcn_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_vcn got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3867,7 +3867,7 @@ def create_virtual_circuit(self, create_virtual_circuit_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_virtual_circuit got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3936,7 +3936,7 @@ def delete_cpe(self, cpe_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_cpe got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4010,7 +4010,7 @@ def delete_cross_connect(self, cross_connect_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_cross_connect got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4085,7 +4085,7 @@ def delete_cross_connect_group(self, cross_connect_group_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_cross_connect_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4162,7 +4162,7 @@ def delete_dhcp_options(self, dhcp_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_dhcp_options got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4238,7 +4238,7 @@ def delete_drg(self, drg_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_drg got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4313,7 +4313,7 @@ def delete_drg_attachment(self, drg_attachment_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_drg_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4390,7 +4390,7 @@ def delete_internet_gateway(self, ig_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_internet_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4470,7 +4470,7 @@ def delete_ip_sec_connection(self, ipsc_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_ip_sec_connection got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4551,7 +4551,7 @@ def delete_ipv6(self, ipv6_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_ipv6 got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4628,7 +4628,7 @@ def delete_local_peering_gateway(self, local_peering_gateway_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_local_peering_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4707,7 +4707,7 @@ def delete_nat_gateway(self, nat_gateway_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_nat_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4788,7 +4788,7 @@ def delete_network_security_group(self, network_security_group_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_network_security_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4873,7 +4873,7 @@ def delete_private_ip(self, private_ip_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_private_ip got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4960,7 +4960,7 @@ def delete_public_ip(self, public_ip_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_public_ip got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5036,7 +5036,7 @@ def delete_remote_peering_connection(self, remote_peering_connection_id, **kwarg "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_remote_peering_connection got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5113,7 +5113,7 @@ def delete_route_table(self, rt_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_route_table got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5190,7 +5190,7 @@ def delete_security_list(self, security_list_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_security_list got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5266,7 +5266,7 @@ def delete_service_gateway(self, service_gateway_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_service_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5341,7 +5341,7 @@ def delete_subnet(self, subnet_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_subnet got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5418,7 +5418,7 @@ def delete_vcn(self, vcn_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_vcn got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5495,7 +5495,7 @@ def delete_virtual_circuit(self, virtual_circuit_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_virtual_circuit got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5584,7 +5584,7 @@ def detach_service_id(self, service_gateway_id, detach_service_details, **kwargs "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "detach_service_id got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5652,7 +5652,7 @@ def get_cpe(self, cpe_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_cpe got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5716,7 +5716,7 @@ def get_cross_connect(self, cross_connect_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_cross_connect got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5780,7 +5780,7 @@ def get_cross_connect_group(self, cross_connect_group_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_cross_connect_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5844,7 +5844,7 @@ def get_cross_connect_letter_of_authority(self, cross_connect_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_cross_connect_letter_of_authority got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5908,7 +5908,7 @@ def get_cross_connect_status(self, cross_connect_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_cross_connect_status got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5972,7 +5972,7 @@ def get_dhcp_options(self, dhcp_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_dhcp_options got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6036,7 +6036,7 @@ def get_drg(self, drg_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_drg got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6100,7 +6100,7 @@ def get_drg_attachment(self, drg_attachment_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_drg_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6167,7 +6167,7 @@ def get_fast_connect_provider_service(self, provider_service_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_fast_connect_provider_service got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6238,7 +6238,7 @@ def get_fast_connect_provider_service_key(self, provider_service_id, provider_se method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_fast_connect_provider_service_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6303,7 +6303,7 @@ def get_internet_gateway(self, ig_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_internet_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6369,7 +6369,7 @@ def get_ip_sec_connection(self, ipsc_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_ip_sec_connection got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6436,7 +6436,7 @@ def get_ip_sec_connection_device_config(self, ipsc_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_ip_sec_connection_device_config got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6501,7 +6501,7 @@ def get_ip_sec_connection_device_status(self, ipsc_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_ip_sec_connection_device_status got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6572,7 +6572,7 @@ def get_ip_sec_connection_tunnel(self, ipsc_id, tunnel_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_ip_sec_connection_tunnel got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6643,7 +6643,7 @@ def get_ip_sec_connection_tunnel_shared_secret(self, ipsc_id, tunnel_id, **kwarg method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_ip_sec_connection_tunnel_shared_secret got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6721,7 +6721,7 @@ def get_ipv6(self, ipv6_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_ipv6 got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6787,7 +6787,7 @@ def get_local_peering_gateway(self, local_peering_gateway_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_local_peering_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6853,7 +6853,7 @@ def get_nat_gateway(self, nat_gateway_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_nat_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6925,7 +6925,7 @@ def get_network_security_group(self, network_security_group_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_network_security_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6992,7 +6992,7 @@ def get_private_ip(self, private_ip_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_private_ip got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7066,7 +7066,7 @@ def get_public_ip(self, public_ip_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_public_ip got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7134,7 +7134,7 @@ def get_public_ip_by_ip_address(self, get_public_ip_by_ip_address_details, **kwa method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_public_ip_by_ip_address got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7198,7 +7198,7 @@ def get_public_ip_by_private_ip_id(self, get_public_ip_by_private_ip_id_details, method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_public_ip_by_private_ip_id got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7252,7 +7252,7 @@ def get_remote_peering_connection(self, remote_peering_connection_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_remote_peering_connection got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7316,7 +7316,7 @@ def get_route_table(self, rt_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_route_table got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7380,7 +7380,7 @@ def get_security_list(self, security_list_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_security_list got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7446,7 +7446,7 @@ def get_service(self, service_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_service got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7512,7 +7512,7 @@ def get_service_gateway(self, service_gateway_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_service_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7576,7 +7576,7 @@ def get_subnet(self, subnet_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_subnet got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7642,7 +7642,7 @@ def get_vcn(self, vcn_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_vcn got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7706,7 +7706,7 @@ def get_virtual_circuit(self, virtual_circuit_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_virtual_circuit got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7773,7 +7773,7 @@ def get_vnic(self, vnic_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_vnic got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7837,7 +7837,7 @@ def list_allowed_peer_regions_for_remote_peering(self, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_allowed_peer_regions_for_remote_peering got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7912,7 +7912,7 @@ def list_cpes(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_cpes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -8026,7 +8026,7 @@ def list_cross_connect_groups(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_cross_connect_groups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -8136,7 +8136,7 @@ def list_cross_connect_locations(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_cross_connect_locations got unknown kwargs: {!r}".format(extra_kwargs)) @@ -8255,7 +8255,7 @@ def list_cross_connects(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_cross_connects got unknown kwargs: {!r}".format(extra_kwargs)) @@ -8367,7 +8367,7 @@ def list_crossconnect_port_speed_shapes(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_crossconnect_port_speed_shapes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -8488,7 +8488,7 @@ def list_dhcp_options(self, compartment_id, vcn_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_dhcp_options got unknown kwargs: {!r}".format(extra_kwargs)) @@ -8609,7 +8609,7 @@ def list_drg_attachments(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_drg_attachments got unknown kwargs: {!r}".format(extra_kwargs)) @@ -8695,7 +8695,7 @@ def list_drgs(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_drgs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -8787,7 +8787,7 @@ def list_fast_connect_provider_services(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_fast_connect_provider_services got unknown kwargs: {!r}".format(extra_kwargs)) @@ -8874,7 +8874,7 @@ def list_fast_connect_provider_virtual_circuit_bandwidth_shapes(self, provider_s "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_fast_connect_provider_virtual_circuit_bandwidth_shapes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -9004,7 +9004,7 @@ def list_internet_gateways(self, compartment_id, vcn_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_internet_gateways got unknown kwargs: {!r}".format(extra_kwargs)) @@ -9112,7 +9112,7 @@ def list_ip_sec_connection_tunnels(self, ipsc_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_ip_sec_connection_tunnels got unknown kwargs: {!r}".format(extra_kwargs)) @@ -9216,7 +9216,7 @@ def list_ip_sec_connections(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_ip_sec_connections got unknown kwargs: {!r}".format(extra_kwargs)) @@ -9322,7 +9322,7 @@ def list_ipv6s(self, **kwargs): "vnic_id", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_ipv6s got unknown kwargs: {!r}".format(extra_kwargs)) @@ -9416,7 +9416,7 @@ def list_local_peering_gateways(self, compartment_id, vcn_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_local_peering_gateways got unknown kwargs: {!r}".format(extra_kwargs)) @@ -9538,7 +9538,7 @@ def list_nat_gateways(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_nat_gateways got unknown kwargs: {!r}".format(extra_kwargs)) @@ -9668,7 +9668,7 @@ def list_network_security_group_security_rules(self, network_security_group_id, "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_network_security_group_security_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -9800,7 +9800,7 @@ def list_network_security_group_vnics(self, network_security_group_id, **kwargs) "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_network_security_group_vnics got unknown kwargs: {!r}".format(extra_kwargs)) @@ -9947,7 +9947,7 @@ def list_network_security_groups(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_network_security_groups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -10077,7 +10077,7 @@ def list_private_ips(self, **kwargs): "subnet_id", "vnic_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_private_ips got unknown kwargs: {!r}".format(extra_kwargs)) @@ -10208,7 +10208,7 @@ def list_public_ips(self, scope, compartment_id, **kwargs): "availability_domain", "lifetime" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_public_ips got unknown kwargs: {!r}".format(extra_kwargs)) @@ -10313,7 +10313,7 @@ def list_remote_peering_connections(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_remote_peering_connections got unknown kwargs: {!r}".format(extra_kwargs)) @@ -10435,7 +10435,7 @@ def list_route_tables(self, compartment_id, vcn_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_route_tables got unknown kwargs: {!r}".format(extra_kwargs)) @@ -10580,7 +10580,7 @@ def list_security_lists(self, compartment_id, vcn_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_security_lists got unknown kwargs: {!r}".format(extra_kwargs)) @@ -10723,7 +10723,7 @@ def list_service_gateways(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_service_gateways got unknown kwargs: {!r}".format(extra_kwargs)) @@ -10828,7 +10828,7 @@ def list_services(self, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_services got unknown kwargs: {!r}".format(extra_kwargs)) @@ -10946,7 +10946,7 @@ def list_subnets(self, compartment_id, vcn_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_subnets got unknown kwargs: {!r}".format(extra_kwargs)) @@ -11086,7 +11086,7 @@ def list_vcns(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_vcns got unknown kwargs: {!r}".format(extra_kwargs)) @@ -11195,7 +11195,7 @@ def list_virtual_circuit_bandwidth_shapes(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_virtual_circuit_bandwidth_shapes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -11267,7 +11267,7 @@ def list_virtual_circuit_public_prefixes(self, virtual_circuit_id, **kwargs): "retry_strategy", "verification_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_virtual_circuit_public_prefixes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -11398,7 +11398,7 @@ def list_virtual_circuits(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_virtual_circuits got unknown kwargs: {!r}".format(extra_kwargs)) @@ -11490,7 +11490,7 @@ def remove_network_security_group_security_rules(self, network_security_group_id method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "remove_network_security_group_security_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -11567,7 +11567,7 @@ def update_cpe(self, cpe_id, update_cpe_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_cpe got unknown kwargs: {!r}".format(extra_kwargs)) @@ -11647,7 +11647,7 @@ def update_cross_connect(self, cross_connect_id, update_cross_connect_details, * "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_cross_connect got unknown kwargs: {!r}".format(extra_kwargs)) @@ -11728,7 +11728,7 @@ def update_cross_connect_group(self, cross_connect_group_id, update_cross_connec "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_cross_connect_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -11811,7 +11811,7 @@ def update_dhcp_options(self, dhcp_id, update_dhcp_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_dhcp_options got unknown kwargs: {!r}".format(extra_kwargs)) @@ -11891,7 +11891,7 @@ def update_drg(self, drg_id, update_drg_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_drg got unknown kwargs: {!r}".format(extra_kwargs)) @@ -11972,7 +11972,7 @@ def update_drg_attachment(self, drg_attachment_id, update_drg_attachment_details "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_drg_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -12056,7 +12056,7 @@ def update_internet_gateway(self, ig_id, update_internet_gateway_details, **kwar "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_internet_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -12139,7 +12139,7 @@ def update_ip_sec_connection(self, ipsc_id, update_ip_sec_connection_details, ** "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_ip_sec_connection got unknown kwargs: {!r}".format(extra_kwargs)) @@ -12240,7 +12240,7 @@ def update_ip_sec_connection_tunnel(self, ipsc_id, tunnel_id, update_ip_sec_conn "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_ip_sec_connection_tunnel got unknown kwargs: {!r}".format(extra_kwargs)) @@ -12329,7 +12329,7 @@ def update_ip_sec_connection_tunnel_shared_secret(self, ipsc_id, tunnel_id, upda "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_ip_sec_connection_tunnel_shared_secret got unknown kwargs: {!r}".format(extra_kwargs)) @@ -12423,7 +12423,7 @@ def update_ipv6(self, ipv6_id, update_ipv6_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_ipv6 got unknown kwargs: {!r}".format(extra_kwargs)) @@ -12504,7 +12504,7 @@ def update_local_peering_gateway(self, local_peering_gateway_id, update_local_pe "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_local_peering_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -12586,7 +12586,7 @@ def update_nat_gateway(self, nat_gateway_id, update_nat_gateway_details, **kwarg "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_nat_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -12682,7 +12682,7 @@ def update_network_security_group(self, network_security_group_id, update_networ "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_network_security_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -12756,7 +12756,7 @@ def update_network_security_group_security_rules(self, network_security_group_id method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_network_security_group_security_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -12843,7 +12843,7 @@ def update_private_ip(self, private_ip_id, update_private_ip_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_private_ip got unknown kwargs: {!r}".format(extra_kwargs)) @@ -12963,7 +12963,7 @@ def update_public_ip(self, public_ip_id, update_public_ip_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_public_ip got unknown kwargs: {!r}".format(extra_kwargs)) @@ -13043,7 +13043,7 @@ def update_remote_peering_connection(self, remote_peering_connection_id, update_ "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_remote_peering_connection got unknown kwargs: {!r}".format(extra_kwargs)) @@ -13126,7 +13126,7 @@ def update_route_table(self, rt_id, update_route_table_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_route_table got unknown kwargs: {!r}".format(extra_kwargs)) @@ -13210,7 +13210,7 @@ def update_security_list(self, security_list_id, update_security_list_details, * "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_security_list got unknown kwargs: {!r}".format(extra_kwargs)) @@ -13293,7 +13293,7 @@ def update_service_gateway(self, service_gateway_id, update_service_gateway_deta "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_service_gateway got unknown kwargs: {!r}".format(extra_kwargs)) @@ -13373,7 +13373,7 @@ def update_subnet(self, subnet_id, update_subnet_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_subnet got unknown kwargs: {!r}".format(extra_kwargs)) @@ -13455,7 +13455,7 @@ def update_vcn(self, vcn_id, update_vcn_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_vcn got unknown kwargs: {!r}".format(extra_kwargs)) @@ -13560,7 +13560,7 @@ def update_virtual_circuit(self, virtual_circuit_id, update_virtual_circuit_deta "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_virtual_circuit got unknown kwargs: {!r}".format(extra_kwargs)) @@ -13640,7 +13640,7 @@ def update_vnic(self, vnic_id, update_vnic_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_vnic got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/core/virtual_network_client_composite_operations.py b/src/oci/core/virtual_network_client_composite_operations.py index ec5d373dcf..77763e1405 100644 --- a/src/oci/core/virtual_network_client_composite_operations.py +++ b/src/oci/core/virtual_network_client_composite_operations.py @@ -107,6 +107,47 @@ def change_subnet_compartment_and_wait_for_work_request(self, subnet_id, change_ except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def change_subnet_compartment_and_wait_for_state(self, subnet_id, change_subnet_compartment_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.core.VirtualNetworkClient.change_subnet_compartment` and waits for the :py:class:`~oci.core.models.WorkRequest` + to enter the given state(s). + + :param str subnet_id: (required) + The OCID of the subnet. + + :param ChangeSubnetCompartmentDetails change_subnet_compartment_details: (required) + Request to change the compartment of a given subnet. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.core.models.WorkRequest.status` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.core.VirtualNetworkClient.change_subnet_compartment` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.change_subnet_compartment(subnet_id, change_subnet_compartment_details, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def change_vcn_compartment_and_wait_for_work_request(self, vcn_id, change_vcn_compartment_details, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.core.VirtualNetworkClient.change_vcn_compartment` and waits for the oci.work_requests.models.WorkRequest @@ -147,6 +188,49 @@ def change_vcn_compartment_and_wait_for_work_request(self, vcn_id, change_vcn_co except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def change_vcn_compartment_and_wait_for_state(self, vcn_id, change_vcn_compartment_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.core.VirtualNetworkClient.change_vcn_compartment` and waits for the :py:class:`~oci.core.models.WorkRequest` + to enter the given state(s). + + :param str vcn_id: (required) + The `OCID`__ of the VCN. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param ChangeVcnCompartmentDetails change_vcn_compartment_details: (required) + Request to change the compartment of a given VCN. + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.core.models.WorkRequest.status` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.core.VirtualNetworkClient.change_vcn_compartment` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.change_vcn_compartment(vcn_id, change_vcn_compartment_details, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def create_cross_connect_and_wait_for_state(self, create_cross_connect_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.core.VirtualNetworkClient.create_cross_connect` and waits for the :py:class:`~oci.core.models.CrossConnect` acted upon diff --git a/src/oci/database/database_client.py b/src/oci/database/database_client.py index de69314f4b..280e5b2eaa 100644 --- a/src/oci/database/database_client.py +++ b/src/oci/database/database_client.py @@ -79,6 +79,8 @@ def __init__(self, config, **kwargs): } self.base_client = BaseClient("database", config, signer, database_type_mapping, **base_client_init_kwargs) self.retry_strategy = kwargs.get('retry_strategy') + self._config = config + self._kwargs = kwargs def change_autonomous_container_database_compartment(self, change_compartment_details, autonomous_container_database_id, **kwargs): """ @@ -134,7 +136,7 @@ def change_autonomous_container_database_compartment(self, change_compartment_de "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_autonomous_container_database_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -234,7 +236,7 @@ def change_autonomous_database_compartment(self, change_compartment_details, aut "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_autonomous_database_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -334,7 +336,7 @@ def change_autonomous_exadata_infrastructure_compartment(self, change_compartmen "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_autonomous_exadata_infrastructure_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -434,7 +436,7 @@ def change_db_system_compartment(self, change_compartment_details, db_system_id, "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_db_system_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -530,7 +532,7 @@ def complete_external_backup_job(self, backup_id, complete_external_backup_job_d "if_match", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "complete_external_backup_job got unknown kwargs: {!r}".format(extra_kwargs)) @@ -612,7 +614,7 @@ def create_autonomous_container_database(self, create_autonomous_container_datab "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_autonomous_container_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -681,7 +683,7 @@ def create_autonomous_data_warehouse(self, create_autonomous_data_warehouse_deta "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_autonomous_data_warehouse got unknown kwargs: {!r}".format(extra_kwargs)) @@ -750,7 +752,7 @@ def create_autonomous_data_warehouse_backup(self, create_autonomous_data_warehou "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_autonomous_data_warehouse_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -823,7 +825,7 @@ def create_autonomous_database(self, create_autonomous_database_details, **kwarg "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_autonomous_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -897,7 +899,7 @@ def create_autonomous_database_backup(self, create_autonomous_database_backup_de "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_autonomous_database_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -967,7 +969,7 @@ def create_backup(self, create_backup_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1051,7 +1053,7 @@ def create_data_guard_association(self, database_id, create_data_guard_associati "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_data_guard_association got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1132,7 +1134,7 @@ def create_db_home(self, create_db_home_with_db_system_id_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_db_home got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1205,7 +1207,7 @@ def create_external_backup_job(self, create_external_backup_job_details, **kwarg "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_external_backup_job got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1299,7 +1301,7 @@ def db_node_action(self, db_node_id, action, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "db_node_action got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1386,7 +1388,7 @@ def delete_autonomous_data_warehouse(self, autonomous_data_warehouse_id, **kwarg "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_autonomous_data_warehouse got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1465,7 +1467,7 @@ def delete_autonomous_database(self, autonomous_database_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_autonomous_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1541,7 +1543,7 @@ def delete_backup(self, backup_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1620,7 +1622,7 @@ def delete_db_home(self, db_home_id, **kwargs): "if_match", "perform_final_backup" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_db_home got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1714,7 +1716,7 @@ def failover_data_guard_association(self, database_id, data_guard_association_id "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "failover_data_guard_association got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1803,7 +1805,7 @@ def generate_autonomous_data_warehouse_wallet(self, autonomous_data_warehouse_id "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "generate_autonomous_data_warehouse_wallet got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1894,7 +1896,7 @@ def generate_autonomous_database_wallet(self, autonomous_database_id, generate_a "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "generate_autonomous_database_wallet got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1967,7 +1969,7 @@ def get_autonomous_container_database(self, autonomous_container_database_id, ** method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_autonomous_container_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2033,7 +2035,7 @@ def get_autonomous_data_warehouse(self, autonomous_data_warehouse_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_autonomous_data_warehouse got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2099,7 +2101,7 @@ def get_autonomous_data_warehouse_backup(self, autonomous_data_warehouse_backup_ method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_autonomous_data_warehouse_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2172,7 +2174,7 @@ def get_autonomous_database(self, autonomous_database_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_autonomous_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2247,7 +2249,7 @@ def get_autonomous_database_backup(self, autonomous_database_backup_id, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_autonomous_database_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2315,7 +2317,7 @@ def get_autonomous_exadata_infrastructure(self, autonomous_exadata_infrastructur method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_autonomous_exadata_infrastructure got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2381,7 +2383,7 @@ def get_backup(self, backup_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_backup got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2452,7 +2454,7 @@ def get_data_guard_association(self, database_id, data_guard_association_id, **k method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_data_guard_association got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2519,7 +2521,7 @@ def get_database(self, database_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2585,7 +2587,7 @@ def get_db_home(self, db_home_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_db_home got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2656,7 +2658,7 @@ def get_db_home_patch(self, db_home_id, patch_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_db_home_patch got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2728,7 +2730,7 @@ def get_db_home_patch_history_entry(self, db_home_id, patch_history_entry_id, ** method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_db_home_patch_history_entry got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2795,7 +2797,7 @@ def get_db_node(self, db_node_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_db_node got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2861,7 +2863,7 @@ def get_db_system(self, db_system_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_db_system got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2932,7 +2934,7 @@ def get_db_system_patch(self, db_system_id, patch_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_db_system_patch got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3004,7 +3006,7 @@ def get_db_system_patch_history_entry(self, db_system_id, patch_history_entry_id method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_db_system_patch_history_entry got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3078,7 +3080,7 @@ def get_exadata_iorm_config(self, db_system_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_exadata_iorm_config got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3150,7 +3152,7 @@ def get_external_backup_job(self, backup_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_external_backup_job got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3214,7 +3216,7 @@ def get_maintenance_run(self, maintenance_run_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_maintenance_run got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3289,7 +3291,7 @@ def launch_autonomous_exadata_infrastructure(self, launch_autonomous_exadata_inf "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "launch_autonomous_exadata_infrastructure got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3365,7 +3367,7 @@ def launch_db_system(self, launch_db_system_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "launch_db_system got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3470,7 +3472,7 @@ def list_autonomous_container_databases(self, compartment_id, **kwargs): "availability_domain", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_autonomous_container_databases got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3602,7 +3604,7 @@ def list_autonomous_data_warehouse_backups(self, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_autonomous_data_warehouse_backups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3726,7 +3728,7 @@ def list_autonomous_data_warehouses(self, compartment_id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_autonomous_data_warehouses got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3860,7 +3862,7 @@ def list_autonomous_database_backups(self, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_autonomous_database_backups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4002,7 +4004,7 @@ def list_autonomous_databases(self, compartment_id, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_autonomous_databases got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4132,7 +4134,7 @@ def list_autonomous_db_preview_versions(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_autonomous_db_preview_versions got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4231,7 +4233,7 @@ def list_autonomous_exadata_infrastructure_shapes(self, availability_domain, com "page", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_autonomous_exadata_infrastructure_shapes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4336,7 +4338,7 @@ def list_autonomous_exadata_infrastructures(self, compartment_id, **kwargs): "availability_domain", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_autonomous_exadata_infrastructures got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4443,7 +4445,7 @@ def list_backups(self, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_backups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4518,7 +4520,7 @@ def list_data_guard_associations(self, database_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_data_guard_associations got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4630,7 +4632,7 @@ def list_databases(self, compartment_id, db_home_id, **kwargs): "lifecycle_state", "db_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_databases got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4730,7 +4732,7 @@ def list_db_home_patch_history_entries(self, db_home_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_db_home_patch_history_entries got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4815,7 +4817,7 @@ def list_db_home_patches(self, db_home_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_db_home_patches got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4928,7 +4930,7 @@ def list_db_homes(self, compartment_id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_db_homes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5052,7 +5054,7 @@ def list_db_nodes(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_db_nodes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5151,7 +5153,7 @@ def list_db_system_patch_history_entries(self, db_system_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_db_system_patch_history_entries got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5236,7 +5238,7 @@ def list_db_system_patches(self, db_system_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_db_system_patches got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5324,7 +5326,7 @@ def list_db_system_shapes(self, availability_domain, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_db_system_shapes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5433,7 +5435,7 @@ def list_db_systems(self, compartment_id, **kwargs): "availability_domain", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_db_systems got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5544,7 +5546,7 @@ def list_db_versions(self, compartment_id, **kwargs): "db_system_shape", "db_system_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_db_versions got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5660,7 +5662,7 @@ def list_maintenance_runs(self, compartment_id, **kwargs): "lifecycle_state", "availability_domain" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_maintenance_runs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5782,7 +5784,7 @@ def reinstate_data_guard_association(self, database_id, data_guard_association_i "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "reinstate_data_guard_association got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5866,7 +5868,7 @@ def restart_autonomous_container_database(self, autonomous_container_database_id "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "restart_autonomous_container_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5947,7 +5949,7 @@ def restore_autonomous_data_warehouse(self, autonomous_data_warehouse_id, restor "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "restore_autonomous_data_warehouse got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6029,7 +6031,7 @@ def restore_autonomous_database(self, autonomous_database_id, restore_autonomous "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "restore_autonomous_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6111,7 +6113,7 @@ def restore_database(self, database_id, restore_database_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "restore_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6190,7 +6192,7 @@ def start_autonomous_data_warehouse(self, autonomous_data_warehouse_id, **kwargs "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "start_autonomous_data_warehouse got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6267,7 +6269,7 @@ def start_autonomous_database(self, autonomous_database_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "start_autonomous_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6344,7 +6346,7 @@ def stop_autonomous_data_warehouse(self, autonomous_data_warehouse_id, **kwargs) "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "stop_autonomous_data_warehouse got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6425,7 +6427,7 @@ def stop_autonomous_database(self, autonomous_database_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "stop_autonomous_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6514,7 +6516,7 @@ def switchover_data_guard_association(self, database_id, data_guard_association_ "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "switchover_data_guard_association got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6594,7 +6596,7 @@ def terminate_autonomous_container_database(self, autonomous_container_database_ "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "terminate_autonomous_container_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6669,7 +6671,7 @@ def terminate_autonomous_exadata_infrastructure(self, autonomous_exadata_infrast "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "terminate_autonomous_exadata_infrastructure got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6744,7 +6746,7 @@ def terminate_db_system(self, db_system_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "terminate_db_system got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6822,7 +6824,7 @@ def update_autonomous_container_database(self, autonomous_container_database_id, "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_autonomous_container_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6904,7 +6906,7 @@ def update_autonomous_data_warehouse(self, autonomous_data_warehouse_id, update_ "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_autonomous_data_warehouse got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6990,7 +6992,7 @@ def update_autonomous_database(self, autonomous_database_id, update_autonomous_d "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_autonomous_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7073,7 +7075,7 @@ def update_autonomous_exadata_infrastructure(self, autonomous_exadata_infrastruc "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_autonomous_exadata_infrastructure got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7155,7 +7157,7 @@ def update_database(self, database_id, update_database_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_database got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7237,7 +7239,7 @@ def update_db_home(self, db_home_id, update_db_home_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_db_home got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7319,7 +7321,7 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_db_system got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7404,7 +7406,7 @@ def update_exadata_iorm_config(self, db_system_id, exadata_iorm_config_update_de "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_exadata_iorm_config got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7485,7 +7487,7 @@ def update_maintenance_run(self, maintenance_run_id, update_maintenance_run_deta "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_maintenance_run got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/database/database_client_composite_operations.py b/src/oci/database/database_client_composite_operations.py index acff1961b9..8875215a8e 100644 --- a/src/oci/database/database_client_composite_operations.py +++ b/src/oci/database/database_client_composite_operations.py @@ -13,14 +13,385 @@ class DatabaseClientCompositeOperations(object): to enter a given state, you can call a single method in this class to accomplish the same functionality """ - def __init__(self, client, **kwargs): + def __init__(self, client, work_request_client=None, **kwargs): """ Creates a new DatabaseClientCompositeOperations object :param DatabaseClient client: The service client which will be wrapped by this object + + :param oci.work_requests.WorkRequestClient work_request_client: (optional) + The work request service client which will be used to wait for work request states. Default is None. """ self.client = client + self._work_request_client = work_request_client if work_request_client else oci.work_requests.WorkRequestClient(self.client._config, **self.client._kwargs) + + def change_autonomous_container_database_compartment_and_wait_for_work_request(self, change_compartment_details, autonomous_container_database_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.change_autonomous_container_database_compartment` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param ChangeCompartmentDetails change_compartment_details: (required) + Request to move Autonomous Container Database to a different compartment + + :param str autonomous_container_database_id: (required) + The Autonomous Container Database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.change_autonomous_container_database_compartment` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.change_autonomous_container_database_compartment(change_compartment_details, autonomous_container_database_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def change_autonomous_container_database_compartment_and_wait_for_state(self, change_compartment_details, autonomous_container_database_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.change_autonomous_container_database_compartment` and waits for the :py:class:`~oci.database.models.WorkRequest` + to enter the given state(s). + + :param ChangeCompartmentDetails change_compartment_details: (required) + Request to move Autonomous Container Database to a different compartment + + :param str autonomous_container_database_id: (required) + The Autonomous Container Database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.WorkRequest.status` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.change_autonomous_container_database_compartment` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.change_autonomous_container_database_compartment(change_compartment_details, autonomous_container_database_id, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def change_autonomous_database_compartment_and_wait_for_work_request(self, change_compartment_details, autonomous_database_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.change_autonomous_database_compartment` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param ChangeCompartmentDetails change_compartment_details: (required) + Request to move Autonomous Database to a different compartment + + :param str autonomous_database_id: (required) + The database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.change_autonomous_database_compartment` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.change_autonomous_database_compartment(change_compartment_details, autonomous_database_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def change_autonomous_database_compartment_and_wait_for_state(self, change_compartment_details, autonomous_database_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.change_autonomous_database_compartment` and waits for the :py:class:`~oci.database.models.WorkRequest` + to enter the given state(s). + + :param ChangeCompartmentDetails change_compartment_details: (required) + Request to move Autonomous Database to a different compartment + + :param str autonomous_database_id: (required) + The database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.WorkRequest.status` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.change_autonomous_database_compartment` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.change_autonomous_database_compartment(change_compartment_details, autonomous_database_id, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def change_autonomous_exadata_infrastructure_compartment_and_wait_for_work_request(self, change_compartment_details, autonomous_exadata_infrastructure_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.change_autonomous_exadata_infrastructure_compartment` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param ChangeCompartmentDetails change_compartment_details: (required) + Request to move Autonomous Exadata Infrastructure to a different compartment + + :param str autonomous_exadata_infrastructure_id: (required) + The Autonomous Exadata Infrastructure `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.change_autonomous_exadata_infrastructure_compartment` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.change_autonomous_exadata_infrastructure_compartment(change_compartment_details, autonomous_exadata_infrastructure_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def change_autonomous_exadata_infrastructure_compartment_and_wait_for_state(self, change_compartment_details, autonomous_exadata_infrastructure_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.change_autonomous_exadata_infrastructure_compartment` and waits for the :py:class:`~oci.database.models.WorkRequest` + to enter the given state(s). + + :param ChangeCompartmentDetails change_compartment_details: (required) + Request to move Autonomous Exadata Infrastructure to a different compartment + + :param str autonomous_exadata_infrastructure_id: (required) + The Autonomous Exadata Infrastructure `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.WorkRequest.status` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.change_autonomous_exadata_infrastructure_compartment` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.change_autonomous_exadata_infrastructure_compartment(change_compartment_details, autonomous_exadata_infrastructure_id, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def change_db_system_compartment_and_wait_for_work_request(self, change_compartment_details, db_system_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.change_db_system_compartment` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param ChangeCompartmentDetails change_compartment_details: (required) + Request to move Db System to a different compartment + + :param str db_system_id: (required) + The DB system `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.change_db_system_compartment` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.change_db_system_compartment(change_compartment_details, db_system_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def change_db_system_compartment_and_wait_for_state(self, change_compartment_details, db_system_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.change_db_system_compartment` and waits for the :py:class:`~oci.database.models.WorkRequest` + to enter the given state(s). + + :param ChangeCompartmentDetails change_compartment_details: (required) + Request to move Db System to a different compartment + + :param str db_system_id: (required) + The DB system `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.WorkRequest.status` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.change_db_system_compartment` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.change_db_system_compartment(change_compartment_details, db_system_id, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def create_autonomous_container_database_and_wait_for_work_request(self, create_autonomous_container_database_details, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.create_autonomous_container_database` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param CreateAutonomousContainerDatabaseDetails create_autonomous_container_database_details: (required) + Request to create an Autonomous Container Database in a specified Autonomous Exadata Infrastructure. + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.create_autonomous_container_database` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.create_autonomous_container_database(create_autonomous_container_database_details, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) def create_autonomous_container_database_and_wait_for_state(self, create_autonomous_container_database_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ @@ -136,6 +507,41 @@ def create_autonomous_data_warehouse_backup_and_wait_for_state(self, create_auto except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def create_autonomous_database_and_wait_for_work_request(self, create_autonomous_database_details, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.create_autonomous_database` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param CreateAutonomousDatabaseBase create_autonomous_database_details: (required) + Request to create a new Autonomous Database. + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.create_autonomous_database` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.create_autonomous_database(create_autonomous_database_details, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def create_autonomous_database_and_wait_for_state(self, create_autonomous_database_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database.DatabaseClient.create_autonomous_database` and waits for the :py:class:`~oci.database.models.AutonomousDatabase` acted upon @@ -174,6 +580,41 @@ def create_autonomous_database_and_wait_for_state(self, create_autonomous_databa except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def create_autonomous_database_backup_and_wait_for_work_request(self, create_autonomous_database_backup_details, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.create_autonomous_database_backup` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param CreateAutonomousDatabaseBackupDetails create_autonomous_database_backup_details: (required) + Request to create a new Autonomous Database backup. + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.create_autonomous_database_backup` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.create_autonomous_database_backup(create_autonomous_database_backup_details, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def create_autonomous_database_backup_and_wait_for_state(self, create_autonomous_database_backup_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database.DatabaseClient.create_autonomous_database_backup` and waits for the :py:class:`~oci.database.models.AutonomousDatabaseBackup` acted upon @@ -425,9 +866,46 @@ def delete_autonomous_data_warehouse_and_wait_for_state(self, autonomous_data_wa except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def delete_autonomous_database_and_wait_for_work_request(self, autonomous_database_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.delete_autonomous_database` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param str autonomous_database_id: (required) + The database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.delete_autonomous_database` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.delete_autonomous_database(autonomous_database_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def delete_autonomous_database_and_wait_for_state(self, autonomous_database_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ - Calls :py:func:`~oci.database.DatabaseClient.delete_autonomous_database` and waits for the :py:class:`~oci.database.models.AutonomousDatabase` acted upon + Calls :py:func:`~oci.database.DatabaseClient.delete_autonomous_database` and waits for the :py:class:`~oci.database.models.WorkRequest` to enter the given state(s). :param str autonomous_database_id: (required) @@ -436,7 +914,7 @@ def delete_autonomous_database_and_wait_for_state(self, autonomous_database_id, __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm :param list[str] wait_for_states: - An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.AutonomousDatabase.lifecycle_state` + An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.WorkRequest.status` :param dict operation_kwargs: A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.delete_autonomous_database` @@ -445,7 +923,6 @@ def delete_autonomous_database_and_wait_for_state(self, autonomous_database_id, A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait """ - initial_get_result = self.client.get_autonomous_database(autonomous_database_id) operation_result = None try: operation_result = self.client.delete_autonomous_database(autonomous_database_id, **operation_kwargs) @@ -459,13 +936,13 @@ def delete_autonomous_database_and_wait_for_state(self, autonomous_database_id, return operation_result lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.headers['opc-work-request-id'] try: waiter_result = oci.wait_until( self.client, - initial_get_result, - evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, - succeed_on_not_found=True, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, **waiter_kwargs ) result_to_return = waiter_result @@ -600,23 +1077,58 @@ def failover_data_guard_association_and_wait_for_state(self, database_id, data_g A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait """ - operation_result = self.client.failover_data_guard_association(database_id, data_guard_association_id, failover_data_guard_association_details, **operation_kwargs) - if not wait_for_states: - return operation_result - - lowered_wait_for_states = [w.lower() for w in wait_for_states] - wait_for_resource_id = operation_result.data.id + operation_result = self.client.failover_data_guard_association(database_id, data_guard_association_id, failover_data_guard_association_details, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.data.id + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_data_guard_association(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def launch_autonomous_exadata_infrastructure_and_wait_for_work_request(self, launch_autonomous_exadata_infrastructure_details, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.launch_autonomous_exadata_infrastructure` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param LaunchAutonomousExadataInfrastructureDetails launch_autonomous_exadata_infrastructure_details: (required) + Request to launch a Autonomous Exadata Infrastructure. + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.launch_autonomous_exadata_infrastructure` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.launch_autonomous_exadata_infrastructure(launch_autonomous_exadata_infrastructure_details, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] try: waiter_result = oci.wait_until( - self.client, - self.client.get_data_guard_association(wait_for_resource_id), - evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, **waiter_kwargs ) - result_to_return = waiter_result - - return result_to_return + return waiter_result except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) @@ -744,6 +1256,43 @@ def reinstate_data_guard_association_and_wait_for_state(self, database_id, data_ except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def restart_autonomous_container_database_and_wait_for_work_request(self, autonomous_container_database_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.restart_autonomous_container_database` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param str autonomous_container_database_id: (required) + The Autonomous Container Database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.restart_autonomous_container_database` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.restart_autonomous_container_database(autonomous_container_database_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def restart_autonomous_container_database_and_wait_for_state(self, autonomous_container_database_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database.DatabaseClient.restart_autonomous_container_database` and waits for the :py:class:`~oci.database.models.AutonomousContainerDatabase` acted upon @@ -827,6 +1376,46 @@ def restore_autonomous_data_warehouse_and_wait_for_state(self, autonomous_data_w except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def restore_autonomous_database_and_wait_for_work_request(self, autonomous_database_id, restore_autonomous_database_details, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.restore_autonomous_database` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param str autonomous_database_id: (required) + The database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param RestoreAutonomousDatabaseDetails restore_autonomous_database_details: (required) + Request to perform an Autonomous Database restore. + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.restore_autonomous_database` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.restore_autonomous_database(autonomous_database_id, restore_autonomous_database_details, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def restore_autonomous_database_and_wait_for_state(self, autonomous_database_id, restore_autonomous_database_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database.DatabaseClient.restore_autonomous_database` and waits for the :py:class:`~oci.database.models.AutonomousDatabase` acted upon @@ -953,6 +1542,43 @@ def start_autonomous_data_warehouse_and_wait_for_state(self, autonomous_data_war except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def start_autonomous_database_and_wait_for_work_request(self, autonomous_database_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.start_autonomous_database` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param str autonomous_database_id: (required) + The database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.start_autonomous_database` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.start_autonomous_database(autonomous_database_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def start_autonomous_database_and_wait_for_state(self, autonomous_database_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database.DatabaseClient.start_autonomous_database` and waits for the :py:class:`~oci.database.models.AutonomousDatabase` acted upon @@ -1033,6 +1659,43 @@ def stop_autonomous_data_warehouse_and_wait_for_state(self, autonomous_data_ware except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def stop_autonomous_database_and_wait_for_work_request(self, autonomous_database_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.stop_autonomous_database` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param str autonomous_database_id: (required) + The database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.stop_autonomous_database` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.stop_autonomous_database(autonomous_database_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def stop_autonomous_database_and_wait_for_state(self, autonomous_database_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database.DatabaseClient.stop_autonomous_database` and waits for the :py:class:`~oci.database.models.AutonomousDatabase` acted upon @@ -1121,9 +1784,46 @@ def switchover_data_guard_association_and_wait_for_state(self, database_id, data except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def terminate_autonomous_container_database_and_wait_for_work_request(self, autonomous_container_database_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.terminate_autonomous_container_database` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param str autonomous_container_database_id: (required) + The Autonomous Container Database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.terminate_autonomous_container_database` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.terminate_autonomous_container_database(autonomous_container_database_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def terminate_autonomous_container_database_and_wait_for_state(self, autonomous_container_database_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ - Calls :py:func:`~oci.database.DatabaseClient.terminate_autonomous_container_database` and waits for the :py:class:`~oci.database.models.AutonomousContainerDatabase` acted upon + Calls :py:func:`~oci.database.DatabaseClient.terminate_autonomous_container_database` and waits for the :py:class:`~oci.database.models.WorkRequest` to enter the given state(s). :param str autonomous_container_database_id: (required) @@ -1132,7 +1832,7 @@ def terminate_autonomous_container_database_and_wait_for_state(self, autonomous_ __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm :param list[str] wait_for_states: - An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.AutonomousContainerDatabase.lifecycle_state` + An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.WorkRequest.status` :param dict operation_kwargs: A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.terminate_autonomous_container_database` @@ -1141,7 +1841,6 @@ def terminate_autonomous_container_database_and_wait_for_state(self, autonomous_ A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait """ - initial_get_result = self.client.get_autonomous_container_database(autonomous_container_database_id) operation_result = None try: operation_result = self.client.terminate_autonomous_container_database(autonomous_container_database_id, **operation_kwargs) @@ -1155,13 +1854,13 @@ def terminate_autonomous_container_database_and_wait_for_state(self, autonomous_ return operation_result lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.headers['opc-work-request-id'] try: waiter_result = oci.wait_until( self.client, - initial_get_result, - evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, - succeed_on_not_found=True, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, **waiter_kwargs ) result_to_return = waiter_result @@ -1170,9 +1869,46 @@ def terminate_autonomous_container_database_and_wait_for_state(self, autonomous_ except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def terminate_autonomous_exadata_infrastructure_and_wait_for_work_request(self, autonomous_exadata_infrastructure_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.terminate_autonomous_exadata_infrastructure` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param str autonomous_exadata_infrastructure_id: (required) + The Autonomous Exadata Infrastructure `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.terminate_autonomous_exadata_infrastructure` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.terminate_autonomous_exadata_infrastructure(autonomous_exadata_infrastructure_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def terminate_autonomous_exadata_infrastructure_and_wait_for_state(self, autonomous_exadata_infrastructure_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ - Calls :py:func:`~oci.database.DatabaseClient.terminate_autonomous_exadata_infrastructure` and waits for the :py:class:`~oci.database.models.AutonomousExadataInfrastructure` acted upon + Calls :py:func:`~oci.database.DatabaseClient.terminate_autonomous_exadata_infrastructure` and waits for the :py:class:`~oci.database.models.WorkRequest` to enter the given state(s). :param str autonomous_exadata_infrastructure_id: (required) @@ -1181,7 +1917,7 @@ def terminate_autonomous_exadata_infrastructure_and_wait_for_state(self, autonom __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm :param list[str] wait_for_states: - An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.AutonomousExadataInfrastructure.lifecycle_state` + An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.WorkRequest.status` :param dict operation_kwargs: A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.terminate_autonomous_exadata_infrastructure` @@ -1190,7 +1926,6 @@ def terminate_autonomous_exadata_infrastructure_and_wait_for_state(self, autonom A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait """ - initial_get_result = self.client.get_autonomous_exadata_infrastructure(autonomous_exadata_infrastructure_id) operation_result = None try: operation_result = self.client.terminate_autonomous_exadata_infrastructure(autonomous_exadata_infrastructure_id, **operation_kwargs) @@ -1204,13 +1939,13 @@ def terminate_autonomous_exadata_infrastructure_and_wait_for_state(self, autonom return operation_result lowered_wait_for_states = [w.lower() for w in wait_for_states] + wait_for_resource_id = operation_result.headers['opc-work-request-id'] try: waiter_result = oci.wait_until( self.client, - initial_get_result, - evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, - succeed_on_not_found=True, + self.client.get_work_request(wait_for_resource_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_wait_for_states, **waiter_kwargs ) result_to_return = waiter_result @@ -1268,6 +2003,46 @@ def terminate_db_system_and_wait_for_state(self, db_system_id, wait_for_states=[ except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_autonomous_container_database_and_wait_for_work_request(self, autonomous_container_database_id, update_autonomous_container_database_details, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.update_autonomous_container_database` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param str autonomous_container_database_id: (required) + The Autonomous Container Database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param UpdateAutonomousContainerDatabaseDetails update_autonomous_container_database_details: (required) + Request to update the properties of an Autonomous Container Database. + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.update_autonomous_container_database` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.update_autonomous_container_database(autonomous_container_database_id, update_autonomous_container_database_details, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_autonomous_container_database_and_wait_for_state(self, autonomous_container_database_id, update_autonomous_container_database_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database.DatabaseClient.update_autonomous_container_database` and waits for the :py:class:`~oci.database.models.AutonomousContainerDatabase` acted upon @@ -1354,6 +2129,46 @@ def update_autonomous_data_warehouse_and_wait_for_state(self, autonomous_data_wa except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_autonomous_database_and_wait_for_work_request(self, autonomous_database_id, update_autonomous_database_details, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.update_autonomous_database` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param str autonomous_database_id: (required) + The database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param UpdateAutonomousDatabaseDetails update_autonomous_database_details: (required) + Request to update the properties of an Autonomous Database. + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.update_autonomous_database` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.update_autonomous_database(autonomous_database_id, update_autonomous_database_details, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_autonomous_database_and_wait_for_state(self, autonomous_database_id, update_autonomous_database_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database.DatabaseClient.update_autonomous_database` and waits for the :py:class:`~oci.database.models.AutonomousDatabase` acted upon @@ -1397,6 +2212,46 @@ def update_autonomous_database_and_wait_for_state(self, autonomous_database_id, except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_autonomous_exadata_infrastructure_and_wait_for_work_request(self, autonomous_exadata_infrastructure_id, update_autonomous_exadata_infrastructures_details, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.update_autonomous_exadata_infrastructure` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param str autonomous_exadata_infrastructure_id: (required) + The Autonomous Exadata Infrastructure `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param UpdateAutonomousExadataInfrastructureDetails update_autonomous_exadata_infrastructures_details: (required) + Request to update the properties of a Autonomous Exadata Infrastructure. + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.update_autonomous_exadata_infrastructure` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.update_autonomous_exadata_infrastructure(autonomous_exadata_infrastructure_id, update_autonomous_exadata_infrastructures_details, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def update_autonomous_exadata_infrastructure_and_wait_for_state(self, autonomous_exadata_infrastructure_id, update_autonomous_exadata_infrastructures_details, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database.DatabaseClient.update_autonomous_exadata_infrastructure` and waits for the :py:class:`~oci.database.models.AutonomousExadataInfrastructure` acted upon diff --git a/src/oci/database/models/create_autonomous_database_clone_details.py b/src/oci/database/models/create_autonomous_database_clone_details.py index 1f3c628acb..35a5d543e2 100644 --- a/src/oci/database/models/create_autonomous_database_clone_details.py +++ b/src/oci/database/models/create_autonomous_database_clone_details.py @@ -190,7 +190,7 @@ def source_id(self, source_id): def clone_type(self): """ **[Required]** Gets the clone_type of this CreateAutonomousDatabaseCloneDetails. - The clone type. + The Autonomous Database clone type. Allowed values for this property are: "FULL", "METADATA" @@ -204,7 +204,7 @@ def clone_type(self): def clone_type(self, clone_type): """ Sets the clone_type of this CreateAutonomousDatabaseCloneDetails. - The clone type. + The Autonomous Database clone type. :param clone_type: The clone_type of this CreateAutonomousDatabaseCloneDetails. diff --git a/src/oci/dns/dns_client.py b/src/oci/dns/dns_client.py index 8e35c6d1bf..3ca0062272 100644 --- a/src/oci/dns/dns_client.py +++ b/src/oci/dns/dns_client.py @@ -127,7 +127,7 @@ def change_steering_policy_compartment(self, steering_policy_id, change_steering "if_match", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_steering_policy_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -219,7 +219,7 @@ def change_zone_compartment(self, zone_id, change_zone_compartment_details, **kw "if_match", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_zone_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -302,7 +302,7 @@ def create_steering_policy(self, create_steering_policy_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_steering_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -376,7 +376,7 @@ def create_steering_policy_attachment(self, create_steering_policy_attachment_de "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_steering_policy_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -442,7 +442,7 @@ def create_zone(self, create_zone_details, **kwargs): "retry_strategy", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_zone got unknown kwargs: {!r}".format(extra_kwargs)) @@ -528,7 +528,7 @@ def delete_domain_records(self, zone_name_or_id, domain, **kwargs): "if_unmodified_since", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_domain_records got unknown kwargs: {!r}".format(extra_kwargs)) @@ -629,7 +629,7 @@ def delete_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "if_unmodified_since", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_rr_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -724,7 +724,7 @@ def delete_steering_policy(self, steering_policy_id, **kwargs): "if_match", "if_unmodified_since" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_steering_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -808,7 +808,7 @@ def delete_steering_policy_attachment(self, steering_policy_attachment_id, **kwa "if_match", "if_unmodified_since" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_steering_policy_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -896,7 +896,7 @@ def delete_zone(self, zone_name_or_id, **kwargs): "if_unmodified_since", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_zone got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1024,7 +1024,7 @@ def get_domain_records(self, zone_name_or_id, domain, **kwargs): "sort_order", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_domain_records got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1158,7 +1158,7 @@ def get_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "zone_version", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_rr_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1253,7 +1253,7 @@ def get_steering_policy(self, steering_policy_id, **kwargs): "if_none_match", "if_modified_since" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_steering_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1336,7 +1336,7 @@ def get_steering_policy_attachment(self, steering_policy_attachment_id, **kwargs "if_none_match", "if_modified_since" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_steering_policy_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1424,7 +1424,7 @@ def get_zone(self, zone_name_or_id, **kwargs): "if_modified_since", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_zone got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1563,7 +1563,7 @@ def get_zone_records(self, zone_name_or_id, **kwargs): "sort_order", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_zone_records got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1724,7 +1724,7 @@ def list_steering_policies(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_steering_policies got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1886,7 +1886,7 @@ def list_steering_policy_attachments(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_steering_policy_attachments got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2039,7 +2039,7 @@ def list_zones(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_zones got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2167,7 +2167,7 @@ def patch_domain_records(self, zone_name_or_id, domain, patch_domain_records_det "if_unmodified_since", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "patch_domain_records got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2275,7 +2275,7 @@ def patch_rr_set(self, zone_name_or_id, domain, rtype, patch_rr_set_details, **k "if_unmodified_since", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "patch_rr_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2381,7 +2381,7 @@ def patch_zone_records(self, zone_name_or_id, patch_zone_records_details, **kwar "if_unmodified_since", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "patch_zone_records got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2490,7 +2490,7 @@ def update_domain_records(self, zone_name_or_id, domain, update_domain_records_d "if_unmodified_since", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_domain_records got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2598,7 +2598,7 @@ def update_rr_set(self, zone_name_or_id, domain, rtype, update_rr_set_details, * "if_unmodified_since", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_rr_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2697,7 +2697,7 @@ def update_steering_policy(self, steering_policy_id, update_steering_policy_deta "if_match", "if_unmodified_since" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_steering_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2787,7 +2787,7 @@ def update_steering_policy_attachment(self, steering_policy_attachment_id, updat "if_match", "if_unmodified_since" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_steering_policy_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2885,7 +2885,7 @@ def update_zone(self, zone_name_or_id, update_zone_details, **kwargs): "if_unmodified_since", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_zone got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2990,7 +2990,7 @@ def update_zone_records(self, zone_name_or_id, update_zone_records_details, **kw "if_unmodified_since", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_zone_records got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/dts/shipping_vendors_client.py b/src/oci/dts/shipping_vendors_client.py index 29589ad31e..b7d106bb7d 100644 --- a/src/oci/dts/shipping_vendors_client.py +++ b/src/oci/dts/shipping_vendors_client.py @@ -101,7 +101,7 @@ def list_shipping_vendors(self, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_shipping_vendors got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/dts/transfer_appliance_client.py b/src/oci/dts/transfer_appliance_client.py index bb80f4fed4..d18d4cc5fe 100644 --- a/src/oci/dts/transfer_appliance_client.py +++ b/src/oci/dts/transfer_appliance_client.py @@ -114,7 +114,7 @@ def create_transfer_appliance(self, id, **kwargs): "opc_retry_token", "create_transfer_appliance_details" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_transfer_appliance got unknown kwargs: {!r}".format(extra_kwargs)) @@ -189,7 +189,7 @@ def create_transfer_appliance_admin_credentials(self, id, transfer_appliance_lab method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_transfer_appliance_admin_credentials got unknown kwargs: {!r}".format(extra_kwargs)) @@ -259,7 +259,7 @@ def delete_transfer_appliance(self, id, transfer_appliance_label, **kwargs): method = "DELETE" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_transfer_appliance got unknown kwargs: {!r}".format(extra_kwargs)) @@ -325,7 +325,7 @@ def get_transfer_appliance(self, id, transfer_appliance_label, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_transfer_appliance got unknown kwargs: {!r}".format(extra_kwargs)) @@ -393,7 +393,7 @@ def get_transfer_appliance_certificate_authority_certificate(self, id, transfer_ method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_transfer_appliance_certificate_authority_certificate got unknown kwargs: {!r}".format(extra_kwargs)) @@ -461,7 +461,7 @@ def get_transfer_appliance_encryption_passphrase(self, id, transfer_appliance_la method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_transfer_appliance_encryption_passphrase got unknown kwargs: {!r}".format(extra_kwargs)) @@ -535,7 +535,7 @@ def list_transfer_appliances(self, id, **kwargs): "retry_strategy", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_transfer_appliances got unknown kwargs: {!r}".format(extra_kwargs)) @@ -627,7 +627,7 @@ def update_transfer_appliance(self, id, transfer_appliance_label, update_transfe "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_transfer_appliance got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/dts/transfer_appliance_entitlement_client.py b/src/oci/dts/transfer_appliance_entitlement_client.py index 4d099d5080..fa23c498bb 100644 --- a/src/oci/dts/transfer_appliance_entitlement_client.py +++ b/src/oci/dts/transfer_appliance_entitlement_client.py @@ -115,7 +115,7 @@ def create_transfer_appliance_entitlement(self, create_transfer_appliance_entitl "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_transfer_appliance_entitlement got unknown kwargs: {!r}".format(extra_kwargs)) @@ -181,7 +181,7 @@ def get_transfer_appliance_entitlement(self, tenant_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_transfer_appliance_entitlement got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/dts/transfer_device_client.py b/src/oci/dts/transfer_device_client.py index 6e40d12533..849d908097 100644 --- a/src/oci/dts/transfer_device_client.py +++ b/src/oci/dts/transfer_device_client.py @@ -113,7 +113,7 @@ def create_transfer_device(self, id, create_transfer_device_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_transfer_device got unknown kwargs: {!r}".format(extra_kwargs)) @@ -186,7 +186,7 @@ def delete_transfer_device(self, id, transfer_device_label, **kwargs): method = "DELETE" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_transfer_device got unknown kwargs: {!r}".format(extra_kwargs)) @@ -252,7 +252,7 @@ def get_transfer_device(self, id, transfer_device_label, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_transfer_device got unknown kwargs: {!r}".format(extra_kwargs)) @@ -330,7 +330,7 @@ def list_transfer_devices(self, id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_transfer_devices got unknown kwargs: {!r}".format(extra_kwargs)) @@ -423,7 +423,7 @@ def update_transfer_device(self, id, transfer_device_label, update_transfer_devi "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_transfer_device got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/dts/transfer_job_client.py b/src/oci/dts/transfer_job_client.py index 3f6255d081..bceec9b66e 100644 --- a/src/oci/dts/transfer_job_client.py +++ b/src/oci/dts/transfer_job_client.py @@ -128,7 +128,7 @@ def change_transfer_job_compartment(self, transfer_job_id, change_transfer_job_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_transfer_job_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -204,7 +204,7 @@ def create_transfer_job(self, create_transfer_job_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_transfer_job got unknown kwargs: {!r}".format(extra_kwargs)) @@ -262,7 +262,7 @@ def delete_transfer_job(self, id, **kwargs): method = "DELETE" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_transfer_job got unknown kwargs: {!r}".format(extra_kwargs)) @@ -324,7 +324,7 @@ def get_transfer_job(self, id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_transfer_job got unknown kwargs: {!r}".format(extra_kwargs)) @@ -401,7 +401,7 @@ def list_transfer_jobs(self, compartment_id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_transfer_jobs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -480,7 +480,7 @@ def update_transfer_job(self, id, update_transfer_job_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_transfer_job got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/dts/transfer_package_client.py b/src/oci/dts/transfer_package_client.py index 3cee148393..5081bc81ba 100644 --- a/src/oci/dts/transfer_package_client.py +++ b/src/oci/dts/transfer_package_client.py @@ -110,7 +110,7 @@ def attach_devices_to_transfer_package(self, id, transfer_package_label, attach_ method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "attach_devices_to_transfer_package got unknown kwargs: {!r}".format(extra_kwargs)) @@ -185,7 +185,7 @@ def create_transfer_package(self, id, **kwargs): "opc_retry_token", "create_transfer_package_details" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_transfer_package got unknown kwargs: {!r}".format(extra_kwargs)) @@ -258,7 +258,7 @@ def delete_transfer_package(self, id, transfer_package_label, **kwargs): method = "DELETE" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_transfer_package got unknown kwargs: {!r}".format(extra_kwargs)) @@ -327,7 +327,7 @@ def detach_devices_from_transfer_package(self, id, transfer_package_label, detac method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "detach_devices_from_transfer_package got unknown kwargs: {!r}".format(extra_kwargs)) @@ -395,7 +395,7 @@ def get_transfer_package(self, id, transfer_package_label, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_transfer_package got unknown kwargs: {!r}".format(extra_kwargs)) @@ -473,7 +473,7 @@ def list_transfer_packages(self, id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_transfer_packages got unknown kwargs: {!r}".format(extra_kwargs)) @@ -566,7 +566,7 @@ def update_transfer_package(self, id, transfer_package_label, update_transfer_pa "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_transfer_package got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/email/email_client.py b/src/oci/email/email_client.py index ce6867fc08..467431efbf 100644 --- a/src/oci/email/email_client.py +++ b/src/oci/email/email_client.py @@ -124,7 +124,7 @@ def change_sender_compartment(self, sender_id, change_sender_compartment_details "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_sender_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -198,7 +198,7 @@ def create_sender(self, create_sender_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_sender got unknown kwargs: {!r}".format(extra_kwargs)) @@ -264,7 +264,7 @@ def create_suppression(self, create_suppression_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_suppression got unknown kwargs: {!r}".format(extra_kwargs)) @@ -334,7 +334,7 @@ def delete_sender(self, sender_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_sender got unknown kwargs: {!r}".format(extra_kwargs)) @@ -407,7 +407,7 @@ def delete_suppression(self, suppression_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_suppression got unknown kwargs: {!r}".format(extra_kwargs)) @@ -478,7 +478,7 @@ def get_sender(self, sender_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_sender got unknown kwargs: {!r}".format(extra_kwargs)) @@ -552,7 +552,7 @@ def get_suppression(self, suppression_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_suppression got unknown kwargs: {!r}".format(extra_kwargs)) @@ -666,7 +666,7 @@ def list_senders(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_senders got unknown kwargs: {!r}".format(extra_kwargs)) @@ -820,7 +820,7 @@ def list_suppressions(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_suppressions got unknown kwargs: {!r}".format(extra_kwargs)) @@ -923,7 +923,7 @@ def update_sender(self, sender_id, update_sender_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_sender got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/events/events_client.py b/src/oci/events/events_client.py index 7d339dc758..f715ceffde 100644 --- a/src/oci/events/events_client.py +++ b/src/oci/events/events_client.py @@ -134,7 +134,7 @@ def change_rule_compartment(self, rule_id, change_rule_compartment_details, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_rule_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -220,7 +220,7 @@ def create_rule(self, create_rule_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_rule got unknown kwargs: {!r}".format(extra_kwargs)) @@ -295,7 +295,7 @@ def delete_rule(self, rule_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_rule got unknown kwargs: {!r}".format(extra_kwargs)) @@ -370,7 +370,7 @@ def get_rule(self, rule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_rule got unknown kwargs: {!r}".format(extra_kwargs)) @@ -495,7 +495,7 @@ def list_rules(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -602,7 +602,7 @@ def update_rule(self, rule_id, update_rule_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_rule got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/file_storage/file_storage_client.py b/src/oci/file_storage/file_storage_client.py index bb151689d8..9ca0607995 100644 --- a/src/oci/file_storage/file_storage_client.py +++ b/src/oci/file_storage/file_storage_client.py @@ -125,7 +125,7 @@ def change_file_system_compartment(self, file_system_id, change_file_system_comp "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_file_system_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -213,7 +213,7 @@ def change_mount_target_compartment(self, mount_target_id, change_mount_target_c "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_mount_target_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -297,7 +297,7 @@ def create_export(self, create_export_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_export got unknown kwargs: {!r}".format(extra_kwargs)) @@ -400,7 +400,7 @@ def create_file_system(self, create_file_system_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_file_system got unknown kwargs: {!r}".format(extra_kwargs)) @@ -509,7 +509,7 @@ def create_mount_target(self, create_mount_target_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_mount_target got unknown kwargs: {!r}".format(extra_kwargs)) @@ -585,7 +585,7 @@ def create_snapshot(self, create_snapshot_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_snapshot got unknown kwargs: {!r}".format(extra_kwargs)) @@ -660,7 +660,7 @@ def delete_export(self, export_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_export got unknown kwargs: {!r}".format(extra_kwargs)) @@ -743,7 +743,7 @@ def delete_file_system(self, file_system_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_file_system got unknown kwargs: {!r}".format(extra_kwargs)) @@ -825,7 +825,7 @@ def delete_mount_target(self, mount_target_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_mount_target got unknown kwargs: {!r}".format(extra_kwargs)) @@ -906,7 +906,7 @@ def delete_snapshot(self, snapshot_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_snapshot got unknown kwargs: {!r}".format(extra_kwargs)) @@ -979,7 +979,7 @@ def get_export(self, export_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_export got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1053,7 +1053,7 @@ def get_export_set(self, export_set_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_export_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1127,7 +1127,7 @@ def get_file_system(self, file_system_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_file_system got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1201,7 +1201,7 @@ def get_mount_target(self, mount_target_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_mount_target got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1275,7 +1275,7 @@ def get_snapshot(self, snapshot_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_snapshot got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1411,7 +1411,7 @@ def list_export_sets(self, compartment_id, availability_domain, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_export_sets got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1571,7 +1571,7 @@ def list_exports(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_exports got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1731,7 +1731,7 @@ def list_file_systems(self, compartment_id, availability_domain, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_file_systems got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1895,7 +1895,7 @@ def list_mount_targets(self, compartment_id, availability_domain, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_mount_targets got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2036,7 +2036,7 @@ def list_snapshots(self, file_system_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_snapshots got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2135,7 +2135,7 @@ def update_export(self, export_id, update_export_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_export got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2223,7 +2223,7 @@ def update_export_set(self, export_set_id, update_export_set_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_export_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2312,7 +2312,7 @@ def update_file_system(self, file_system_id, update_file_system_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_file_system got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2400,7 +2400,7 @@ def update_mount_target(self, mount_target_id, update_mount_target_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_mount_target got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2488,7 +2488,7 @@ def update_snapshot(self, snapshot_id, update_snapshot_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_snapshot got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/functions/functions_invoke_client.py b/src/oci/functions/functions_invoke_client.py index b46c9de69e..8af39038c7 100644 --- a/src/oci/functions/functions_invoke_client.py +++ b/src/oci/functions/functions_invoke_client.py @@ -132,7 +132,7 @@ def invoke_function(self, function_id, **kwargs): "fn_invoke_type", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "invoke_function got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/functions/functions_management_client.py b/src/oci/functions/functions_management_client.py index f5fc995a5a..7466330ccf 100644 --- a/src/oci/functions/functions_management_client.py +++ b/src/oci/functions/functions_management_client.py @@ -126,7 +126,7 @@ def change_application_compartment(self, application_id, change_application_comp "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_application_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -201,7 +201,7 @@ def create_application(self, create_application_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_application got unknown kwargs: {!r}".format(extra_kwargs)) @@ -265,7 +265,7 @@ def create_function(self, create_function_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_function got unknown kwargs: {!r}".format(extra_kwargs)) @@ -337,7 +337,7 @@ def delete_application(self, application_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_application got unknown kwargs: {!r}".format(extra_kwargs)) @@ -418,7 +418,7 @@ def delete_function(self, function_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_function got unknown kwargs: {!r}".format(extra_kwargs)) @@ -493,7 +493,7 @@ def get_application(self, application_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_application got unknown kwargs: {!r}".format(extra_kwargs)) @@ -569,7 +569,7 @@ def get_function(self, function_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_function got unknown kwargs: {!r}".format(extra_kwargs)) @@ -691,7 +691,7 @@ def list_applications(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_applications got unknown kwargs: {!r}".format(extra_kwargs)) @@ -836,7 +836,7 @@ def list_functions(self, application_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_functions got unknown kwargs: {!r}".format(extra_kwargs)) @@ -944,7 +944,7 @@ def update_application(self, application_id, update_application_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_application got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1032,7 +1032,7 @@ def update_function(self, function_id, update_function_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_function got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/healthchecks/health_checks_client.py b/src/oci/healthchecks/health_checks_client.py index bf97618b49..02f42d2d9e 100644 --- a/src/oci/healthchecks/health_checks_client.py +++ b/src/oci/healthchecks/health_checks_client.py @@ -134,7 +134,7 @@ def change_http_monitor_compartment(self, monitor_id, change_http_monitor_compar "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_http_monitor_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -232,7 +232,7 @@ def change_ping_monitor_compartment(self, monitor_id, change_ping_monitor_compar "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_ping_monitor_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -321,7 +321,7 @@ def create_http_monitor(self, create_http_monitor_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_http_monitor got unknown kwargs: {!r}".format(extra_kwargs)) @@ -391,7 +391,7 @@ def create_on_demand_http_probe(self, create_on_demand_http_probe_details, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_on_demand_http_probe got unknown kwargs: {!r}".format(extra_kwargs)) @@ -458,7 +458,7 @@ def create_on_demand_ping_probe(self, create_on_demand_ping_probe_details, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_on_demand_ping_probe got unknown kwargs: {!r}".format(extra_kwargs)) @@ -533,7 +533,7 @@ def create_ping_monitor(self, create_ping_monitor_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_ping_monitor got unknown kwargs: {!r}".format(extra_kwargs)) @@ -608,7 +608,7 @@ def delete_http_monitor(self, monitor_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_http_monitor got unknown kwargs: {!r}".format(extra_kwargs)) @@ -689,7 +689,7 @@ def delete_ping_monitor(self, monitor_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_ping_monitor got unknown kwargs: {!r}".format(extra_kwargs)) @@ -769,7 +769,7 @@ def get_http_monitor(self, monitor_id, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_http_monitor got unknown kwargs: {!r}".format(extra_kwargs)) @@ -851,7 +851,7 @@ def get_ping_monitor(self, monitor_id, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_ping_monitor got unknown kwargs: {!r}".format(extra_kwargs)) @@ -952,7 +952,7 @@ def list_health_checks_vantage_points(self, **kwargs): "name", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_health_checks_vantage_points got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1065,7 +1065,7 @@ def list_http_monitors(self, compartment_id, **kwargs): "sort_order", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_http_monitors got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1182,7 +1182,7 @@ def list_http_probe_results(self, probe_configuration_id, **kwargs): "sort_order", "target" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_http_probe_results got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1303,7 +1303,7 @@ def list_ping_monitors(self, compartment_id, **kwargs): "sort_order", "display_name" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_ping_monitors got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1424,7 +1424,7 @@ def list_ping_probe_results(self, probe_configuration_id, **kwargs): "sort_order", "target" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_ping_probe_results got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1529,7 +1529,7 @@ def update_http_monitor(self, monitor_id, update_http_monitor_details, **kwargs) "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_http_monitor got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1618,7 +1618,7 @@ def update_ping_monitor(self, monitor_id, update_ping_monitor_details, **kwargs) "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_ping_monitor got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/identity/identity_client.py b/src/oci/identity/identity_client.py index 8b085a8aed..8992d13e9a 100644 --- a/src/oci/identity/identity_client.py +++ b/src/oci/identity/identity_client.py @@ -126,7 +126,7 @@ def activate_mfa_totp_device(self, user_id, mfa_totp_device_id, mfa_totp_token, "if_match", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "activate_mfa_totp_device got unknown kwargs: {!r}".format(extra_kwargs)) @@ -212,7 +212,7 @@ def add_user_to_group(self, add_user_to_group_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "add_user_to_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -291,7 +291,7 @@ def change_tag_namespace_compartment(self, tag_namespace_id, change_tag_namespac "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_tag_namespace_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -384,7 +384,7 @@ def create_auth_token(self, create_auth_token_details, user_id, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_auth_token got unknown kwargs: {!r}".format(extra_kwargs)) @@ -486,7 +486,7 @@ def create_compartment(self, create_compartment_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -570,7 +570,7 @@ def create_customer_secret_key(self, create_customer_secret_key_details, user_id "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_customer_secret_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -671,7 +671,7 @@ def create_dynamic_group(self, create_dynamic_group_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_dynamic_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -763,7 +763,7 @@ def create_group(self, create_group_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -852,7 +852,7 @@ def create_identity_provider(self, create_identity_provider_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_identity_provider got unknown kwargs: {!r}".format(extra_kwargs)) @@ -925,7 +925,7 @@ def create_idp_group_mapping(self, create_idp_group_mapping_details, identity_pr "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_idp_group_mapping got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1006,7 +1006,7 @@ def create_mfa_totp_device(self, user_id, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_mfa_totp_device got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1097,7 +1097,7 @@ def create_or_reset_ui_password(self, user_id, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_or_reset_ui_password got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1196,7 +1196,7 @@ def create_policy(self, create_policy_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1268,7 +1268,7 @@ def create_region_subscription(self, create_region_subscription_details, tenancy "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_region_subscription got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1355,7 +1355,7 @@ def create_smtp_credential(self, create_smtp_credential_details, user_id, **kwar "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_smtp_credential got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1452,7 +1452,7 @@ def create_swift_password(self, create_swift_password_details, user_id, **kwargs "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_swift_password got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1547,7 +1547,7 @@ def create_tag(self, tag_namespace_id, create_tag_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_tag got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1633,7 +1633,7 @@ def create_tag_default(self, create_tag_default_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_tag_default got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1721,7 +1721,7 @@ def create_tag_namespace(self, create_tag_namespace_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_tag_namespace got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1828,7 +1828,7 @@ def create_user(self, create_user_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_user got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1903,7 +1903,7 @@ def delete_api_key(self, user_id, fingerprint, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_api_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1980,7 +1980,7 @@ def delete_auth_token(self, user_id, auth_token_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_auth_token got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2054,7 +2054,7 @@ def delete_compartment(self, compartment_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2130,7 +2130,7 @@ def delete_customer_secret_key(self, user_id, customer_secret_key_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_customer_secret_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2204,7 +2204,7 @@ def delete_dynamic_group(self, dynamic_group_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_dynamic_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2277,7 +2277,7 @@ def delete_group(self, group_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2351,7 +2351,7 @@ def delete_identity_provider(self, identity_provider_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_identity_provider got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2427,7 +2427,7 @@ def delete_idp_group_mapping(self, identity_provider_id, mapping_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_idp_group_mapping got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2504,7 +2504,7 @@ def delete_mfa_totp_device(self, user_id, mfa_totp_device_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_mfa_totp_device got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2578,7 +2578,7 @@ def delete_policy(self, policy_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2654,7 +2654,7 @@ def delete_smtp_credential(self, user_id, smtp_credential_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_smtp_credential got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2733,7 +2733,7 @@ def delete_swift_password(self, user_id, swift_password_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_swift_password got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2810,7 +2810,7 @@ def delete_tag(self, tag_namespace_id, tag_name, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_tag got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2889,7 +2889,7 @@ def delete_tag_default(self, tag_default_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_tag_default got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2969,7 +2969,7 @@ def delete_tag_namespace(self, tag_namespace_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_tag_namespace got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3043,7 +3043,7 @@ def delete_user(self, user_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_user got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3119,7 +3119,7 @@ def generate_totp_seed(self, user_id, mfa_totp_device_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "generate_totp_seed got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3187,7 +3187,7 @@ def get_authentication_policy(self, compartment_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_authentication_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3258,7 +3258,7 @@ def get_compartment(self, compartment_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3322,7 +3322,7 @@ def get_dynamic_group(self, dynamic_group_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_dynamic_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3390,7 +3390,7 @@ def get_group(self, group_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3454,7 +3454,7 @@ def get_identity_provider(self, identity_provider_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_identity_provider got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3521,7 +3521,7 @@ def get_idp_group_mapping(self, identity_provider_id, mapping_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_idp_group_mapping got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3589,7 +3589,7 @@ def get_mfa_totp_device(self, user_id, mfa_totp_device_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_mfa_totp_device got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3654,7 +3654,7 @@ def get_policy(self, policy_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3721,7 +3721,7 @@ def get_tag(self, tag_namespace_id, tag_name, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_tag got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3786,7 +3786,7 @@ def get_tag_default(self, tag_default_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_tag_default got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3850,7 +3850,7 @@ def get_tag_namespace(self, tag_namespace_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_tag_namespace got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3914,7 +3914,7 @@ def get_tenancy(self, tenancy_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_tenancy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3978,7 +3978,7 @@ def get_user(self, user_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_user got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4042,7 +4042,7 @@ def get_user_group_membership(self, user_group_membership_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_user_group_membership got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4107,7 +4107,7 @@ def get_user_ui_password_information(self, user_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_user_ui_password_information got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4172,7 +4172,7 @@ def get_work_request(self, work_request_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4239,7 +4239,7 @@ def list_api_keys(self, user_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_api_keys got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4304,7 +4304,7 @@ def list_auth_tokens(self, user_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_auth_tokens got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4374,7 +4374,7 @@ def list_availability_domains(self, compartment_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_availability_domains got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4483,7 +4483,7 @@ def list_compartments(self, compartment_id, **kwargs): "access_level", "compartment_id_in_subtree" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_compartments got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4567,7 +4567,7 @@ def list_cost_tracking_tags(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_cost_tracking_tags got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4629,7 +4629,7 @@ def list_customer_secret_keys(self, user_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_customer_secret_keys got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4708,7 +4708,7 @@ def list_dynamic_groups(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_dynamic_groups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4776,7 +4776,7 @@ def list_fault_domains(self, compartment_id, availability_domain, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_fault_domains got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4851,7 +4851,7 @@ def list_groups(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_groups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4923,7 +4923,7 @@ def list_identity_provider_groups(self, identity_provider_id, **kwargs): "page", "limit" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_identity_provider_groups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5016,7 +5016,7 @@ def list_identity_providers(self, protocol, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_identity_providers got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5089,7 +5089,7 @@ def list_idp_group_mappings(self, identity_provider_id, **kwargs): "page", "limit" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_idp_group_mappings got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5193,7 +5193,7 @@ def list_mfa_totp_devices(self, user_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_mfa_totp_devices got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5298,7 +5298,7 @@ def list_policies(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_policies got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5359,7 +5359,7 @@ def list_region_subscriptions(self, tenancy_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_region_subscriptions got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5420,7 +5420,7 @@ def list_regions(self, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_regions got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5473,7 +5473,7 @@ def list_smtp_credentials(self, user_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_smtp_credentials got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5540,7 +5540,7 @@ def list_swift_passwords(self, user_id, **kwargs): method = "GET" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_swift_passwords got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5630,7 +5630,7 @@ def list_tag_defaults(self, **kwargs): "tag_definition_id", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_tag_defaults got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5723,7 +5723,7 @@ def list_tag_namespaces(self, compartment_id, **kwargs): "include_subcompartments", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_tag_namespaces got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5810,7 +5810,7 @@ def list_tags(self, tag_namespace_id, **kwargs): "limit", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_tags got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5920,7 +5920,7 @@ def list_user_group_memberships(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_user_group_memberships got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6006,7 +6006,7 @@ def list_users(self, compartment_id, **kwargs): "identity_provider_id", "external_identifier" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_users got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6084,7 +6084,7 @@ def list_work_requests(self, compartment_id, **kwargs): "limit", "resource_identifier" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_requests got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6171,7 +6171,7 @@ def move_compartment(self, compartment_id, move_compartment_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "move_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6250,7 +6250,7 @@ def remove_user_from_group(self, user_group_membership_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "remove_user_from_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6314,7 +6314,7 @@ def reset_idp_scim_client(self, identity_provider_id, **kwargs): method = "POST" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "reset_idp_scim_client got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6393,7 +6393,7 @@ def update_auth_token(self, user_id, auth_token_id, update_auth_token_details, * "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_auth_token got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6474,7 +6474,7 @@ def update_authentication_policy(self, compartment_id, update_authentication_pol "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_authentication_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6554,7 +6554,7 @@ def update_compartment(self, compartment_id, update_compartment_details, **kwarg "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6637,7 +6637,7 @@ def update_customer_secret_key(self, user_id, customer_secret_key_id, update_cus "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_customer_secret_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6718,7 +6718,7 @@ def update_dynamic_group(self, dynamic_group_id, update_dynamic_group_details, * "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_dynamic_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6798,7 +6798,7 @@ def update_group(self, group_id, update_group_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6878,7 +6878,7 @@ def update_identity_provider(self, identity_provider_id, update_identity_provide "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_identity_provider got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6961,7 +6961,7 @@ def update_idp_group_mapping(self, identity_provider_id, mapping_id, update_idp_ "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_idp_group_mapping got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7044,7 +7044,7 @@ def update_policy(self, policy_id, update_policy_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7127,7 +7127,7 @@ def update_smtp_credential(self, user_id, smtp_credential_id, update_smtp_creden "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_smtp_credential got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7213,7 +7213,7 @@ def update_swift_password(self, user_id, swift_password_id, update_swift_passwor "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_swift_password got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7297,7 +7297,7 @@ def update_tag(self, tag_namespace_id, tag_name, update_tag_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_tag got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7383,7 +7383,7 @@ def update_tag_default(self, tag_default_id, update_tag_default_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_tag_default got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7465,7 +7465,7 @@ def update_tag_namespace(self, tag_namespace_id, update_tag_namespace_details, * method = "PUT" expected_kwargs = ["retry_strategy"] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_tag_namespace got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7543,7 +7543,7 @@ def update_user(self, user_id, update_user_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_user got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7623,7 +7623,7 @@ def update_user_capabilities(self, user_id, update_user_capabilities_details, ** "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_user_capabilities got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7703,7 +7703,7 @@ def update_user_state(self, user_id, update_state_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_user_state got unknown kwargs: {!r}".format(extra_kwargs)) @@ -7799,7 +7799,7 @@ def upload_api_key(self, user_id, create_api_key_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "upload_api_key got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/key_management/kms_crypto_client.py b/src/oci/key_management/kms_crypto_client.py index cf84358d77..be942c6193 100644 --- a/src/oci/key_management/kms_crypto_client.py +++ b/src/oci/key_management/kms_crypto_client.py @@ -110,7 +110,7 @@ def decrypt(self, decrypt_data_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "decrypt got unknown kwargs: {!r}".format(extra_kwargs)) @@ -177,7 +177,7 @@ def encrypt(self, encrypt_data_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "encrypt got unknown kwargs: {!r}".format(extra_kwargs)) @@ -242,7 +242,7 @@ def generate_data_encryption_key(self, generate_key_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "generate_data_encryption_key got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/key_management/kms_management_client.py b/src/oci/key_management/kms_management_client.py index 7d368a7f84..cd1efcc53e 100644 --- a/src/oci/key_management/kms_management_client.py +++ b/src/oci/key_management/kms_management_client.py @@ -129,7 +129,7 @@ def cancel_key_deletion(self, key_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "cancel_key_deletion got unknown kwargs: {!r}".format(extra_kwargs)) @@ -227,7 +227,7 @@ def change_key_compartment(self, key_id, change_key_compartment_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_key_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -315,7 +315,7 @@ def create_key(self, create_key_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -393,7 +393,7 @@ def create_key_version(self, key_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_key_version got unknown kwargs: {!r}".format(extra_kwargs)) @@ -489,7 +489,7 @@ def disable_key(self, key_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "disable_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -586,7 +586,7 @@ def enable_key(self, key_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "enable_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -665,7 +665,7 @@ def get_key(self, key_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_key got unknown kwargs: {!r}".format(extra_kwargs)) @@ -743,7 +743,7 @@ def get_key_version(self, key_id, key_version_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_key_version got unknown kwargs: {!r}".format(extra_kwargs)) @@ -842,7 +842,7 @@ def list_key_versions(self, key_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_key_versions got unknown kwargs: {!r}".format(extra_kwargs)) @@ -964,7 +964,7 @@ def list_keys(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_keys got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1073,7 +1073,7 @@ def schedule_key_deletion(self, key_id, schedule_key_deletion_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "schedule_key_deletion got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1167,7 +1167,7 @@ def update_key(self, key_id, update_key_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_key got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/key_management/kms_vault_client.py b/src/oci/key_management/kms_vault_client.py index b52ad42d3c..691a587eb6 100644 --- a/src/oci/key_management/kms_vault_client.py +++ b/src/oci/key_management/kms_vault_client.py @@ -132,7 +132,7 @@ def cancel_vault_deletion(self, vault_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "cancel_vault_deletion got unknown kwargs: {!r}".format(extra_kwargs)) @@ -230,7 +230,7 @@ def change_vault_compartment(self, vault_id, change_vault_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_vault_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -321,7 +321,7 @@ def create_vault(self, create_vault_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_vault got unknown kwargs: {!r}".format(extra_kwargs)) @@ -389,7 +389,7 @@ def get_vault(self, vault_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_vault got unknown kwargs: {!r}".format(extra_kwargs)) @@ -487,7 +487,7 @@ def list_vaults(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_vaults got unknown kwargs: {!r}".format(extra_kwargs)) @@ -600,7 +600,7 @@ def schedule_vault_deletion(self, vault_id, schedule_vault_deletion_details, **k "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "schedule_vault_deletion got unknown kwargs: {!r}".format(extra_kwargs)) @@ -694,7 +694,7 @@ def update_vault(self, vault_id, update_vault_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_vault got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/limits/limits_client.py b/src/oci/limits/limits_client.py index bdd16cc91a..017b353499 100644 --- a/src/oci/limits/limits_client.py +++ b/src/oci/limits/limits_client.py @@ -127,7 +127,7 @@ def get_resource_availability(self, service_name, limit_name, compartment_id, ** "availability_domain", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_resource_availability got unknown kwargs: {!r}".format(extra_kwargs)) @@ -240,7 +240,7 @@ def list_limit_definitions(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_limit_definitions got unknown kwargs: {!r}".format(extra_kwargs)) @@ -366,7 +366,7 @@ def list_limit_values(self, compartment_id, service_name, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_limit_values got unknown kwargs: {!r}".format(extra_kwargs)) @@ -485,7 +485,7 @@ def list_services(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_services got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/limits/quotas_client.py b/src/oci/limits/quotas_client.py index e787766a0f..24e247c59a 100644 --- a/src/oci/limits/quotas_client.py +++ b/src/oci/limits/quotas_client.py @@ -120,7 +120,7 @@ def create_quota(self, create_quota_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_quota got unknown kwargs: {!r}".format(extra_kwargs)) @@ -193,7 +193,7 @@ def delete_quota(self, quota_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_quota got unknown kwargs: {!r}".format(extra_kwargs)) @@ -266,7 +266,7 @@ def get_quota(self, quota_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_quota got unknown kwargs: {!r}".format(extra_kwargs)) @@ -370,7 +370,7 @@ def list_quotas(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_quotas got unknown kwargs: {!r}".format(extra_kwargs)) @@ -475,7 +475,7 @@ def update_quota(self, quota_id, update_quota_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_quota got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/load_balancer/load_balancer_client.py b/src/oci/load_balancer/load_balancer_client.py index 51ffd3fe5d..2d87e25b59 100644 --- a/src/oci/load_balancer/load_balancer_client.py +++ b/src/oci/load_balancer/load_balancer_client.py @@ -137,7 +137,7 @@ def change_load_balancer_compartment(self, load_balancer_id, change_load_balance "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_load_balancer_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -233,7 +233,7 @@ def create_backend(self, create_backend_details, load_balancer_id, backend_set_n "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_backend got unknown kwargs: {!r}".format(extra_kwargs)) @@ -324,7 +324,7 @@ def create_backend_set(self, create_backend_set_details, load_balancer_id, **kwa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_backend_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -414,7 +414,7 @@ def create_certificate(self, create_certificate_details, load_balancer_id, **kwa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_certificate got unknown kwargs: {!r}".format(extra_kwargs)) @@ -507,7 +507,7 @@ def create_hostname(self, create_hostname_details, load_balancer_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_hostname got unknown kwargs: {!r}".format(extra_kwargs)) @@ -597,7 +597,7 @@ def create_listener(self, create_listener_details, load_balancer_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_listener got unknown kwargs: {!r}".format(extra_kwargs)) @@ -713,7 +713,7 @@ def create_load_balancer(self, create_load_balancer_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_load_balancer got unknown kwargs: {!r}".format(extra_kwargs)) @@ -794,7 +794,7 @@ def create_path_route_set(self, create_path_route_set_details, load_balancer_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_path_route_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -879,7 +879,7 @@ def create_rule_set(self, load_balancer_id, create_rule_set_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_rule_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -965,7 +965,7 @@ def delete_backend(self, load_balancer_id, backend_set_name, backend_name, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_backend got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1048,7 +1048,7 @@ def delete_backend_set(self, load_balancer_id, backend_set_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_backend_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1129,7 +1129,7 @@ def delete_certificate(self, load_balancer_id, certificate_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_certificate got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1209,7 +1209,7 @@ def delete_hostname(self, load_balancer_id, name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_hostname got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1289,7 +1289,7 @@ def delete_listener(self, load_balancer_id, listener_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_listener got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1364,7 +1364,7 @@ def delete_load_balancer(self, load_balancer_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_load_balancer got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1446,7 +1446,7 @@ def delete_path_route_set(self, load_balancer_id, path_route_set_name, **kwargs) "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_path_route_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1529,7 +1529,7 @@ def delete_rule_set(self, load_balancer_id, rule_set_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_rule_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1614,7 +1614,7 @@ def get_backend(self, load_balancer_id, backend_set_name, backend_name, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_backend got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1702,7 +1702,7 @@ def get_backend_health(self, load_balancer_id, backend_set_name, backend_name, * "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_backend_health got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1785,7 +1785,7 @@ def get_backend_set(self, load_balancer_id, backend_set_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_backend_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1867,7 +1867,7 @@ def get_backend_set_health(self, load_balancer_id, backend_set_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_backend_set_health got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1949,7 +1949,7 @@ def get_health_checker(self, load_balancer_id, backend_set_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_health_checker got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2031,7 +2031,7 @@ def get_hostname(self, load_balancer_id, name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_hostname got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2108,7 +2108,7 @@ def get_load_balancer(self, load_balancer_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_load_balancer got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2184,7 +2184,7 @@ def get_load_balancer_health(self, load_balancer_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_load_balancer_health got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2265,7 +2265,7 @@ def get_path_route_set(self, load_balancer_id, path_route_set_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_path_route_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2347,7 +2347,7 @@ def get_rule_set(self, load_balancer_id, rule_set_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_rule_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2424,7 +2424,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2500,7 +2500,7 @@ def list_backend_sets(self, load_balancer_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_backend_sets got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2581,7 +2581,7 @@ def list_backends(self, load_balancer_id, backend_set_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_backends got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2659,7 +2659,7 @@ def list_certificates(self, load_balancer_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_certificates got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2736,7 +2736,7 @@ def list_hostnames(self, load_balancer_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_hostnames got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2821,7 +2821,7 @@ def list_listener_rules(self, load_balancer_id, listener_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_listener_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2916,7 +2916,7 @@ def list_load_balancer_healths(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_load_balancer_healths got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3040,7 +3040,7 @@ def list_load_balancers(self, compartment_id, **kwargs): "display_name", "lifecycle_state" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_load_balancers got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3140,7 +3140,7 @@ def list_path_route_sets(self, load_balancer_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_path_route_sets got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3234,7 +3234,7 @@ def list_policies(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_policies got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3325,7 +3325,7 @@ def list_protocols(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_protocols got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3398,7 +3398,7 @@ def list_rule_sets(self, load_balancer_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_rule_sets got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3492,7 +3492,7 @@ def list_shapes(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_shapes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3583,7 +3583,7 @@ def list_work_requests(self, load_balancer_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_requests got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3688,7 +3688,7 @@ def update_backend(self, update_backend_details, load_balancer_id, backend_set_n "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_backend got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3785,7 +3785,7 @@ def update_backend_set(self, update_backend_set_details, load_balancer_id, backe "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_backend_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3881,7 +3881,7 @@ def update_health_checker(self, health_checker, load_balancer_id, backend_set_na "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_health_checker got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3971,7 +3971,7 @@ def update_hostname(self, update_hostname_details, load_balancer_id, name, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_hostname got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4064,7 +4064,7 @@ def update_listener(self, update_listener_details, load_balancer_id, listener_na "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_listener got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4155,7 +4155,7 @@ def update_load_balancer(self, update_load_balancer_details, load_balancer_id, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_load_balancer got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4245,7 +4245,7 @@ def update_network_security_groups(self, update_network_security_groups_details, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_network_security_groups got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4345,7 +4345,7 @@ def update_path_route_set(self, update_path_route_set_details, load_balancer_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_path_route_set got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4436,7 +4436,7 @@ def update_rule_set(self, load_balancer_id, rule_set_name, update_rule_set_detai "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_rule_set got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/monitoring/monitoring_client.py b/src/oci/monitoring/monitoring_client.py index 8d535e3513..1a61795154 100644 --- a/src/oci/monitoring/monitoring_client.py +++ b/src/oci/monitoring/monitoring_client.py @@ -136,7 +136,7 @@ def change_alarm_compartment(self, alarm_id, change_alarm_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_alarm_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -227,7 +227,7 @@ def create_alarm(self, create_alarm_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_alarm got unknown kwargs: {!r}".format(extra_kwargs)) @@ -307,7 +307,7 @@ def delete_alarm(self, alarm_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_alarm got unknown kwargs: {!r}".format(extra_kwargs)) @@ -386,7 +386,7 @@ def get_alarm(self, alarm_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_alarm got unknown kwargs: {!r}".format(extra_kwargs)) @@ -505,7 +505,7 @@ def get_alarm_history(self, alarm_id, **kwargs): "timestamp_greater_than_or_equal_to", "timestamp_less_than" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_alarm_history got unknown kwargs: {!r}".format(extra_kwargs)) @@ -660,7 +660,7 @@ def list_alarms(self, compartment_id, **kwargs): "sort_order", "compartment_id_in_subtree" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_alarms got unknown kwargs: {!r}".format(extra_kwargs)) @@ -814,7 +814,7 @@ def list_alarms_status(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_alarms_status got unknown kwargs: {!r}".format(extra_kwargs)) @@ -945,7 +945,7 @@ def list_metrics(self, compartment_id, list_metrics_details, **kwargs): "limit", "compartment_id_in_subtree" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_metrics got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1040,7 +1040,7 @@ def post_metric_data(self, post_metric_data_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "post_metric_data got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1117,7 +1117,7 @@ def remove_alarm_suppression(self, alarm_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "remove_alarm_suppression got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1214,7 +1214,7 @@ def summarize_metrics_data(self, compartment_id, summarize_metrics_data_details, "opc_request_id", "compartment_id_in_subtree" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "summarize_metrics_data got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1302,7 +1302,7 @@ def update_alarm(self, alarm_id, update_alarm_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_alarm got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/object_storage/object_storage_client.py b/src/oci/object_storage/object_storage_client.py index 6ca3c16462..88ff3213e7 100644 --- a/src/oci/object_storage/object_storage_client.py +++ b/src/oci/object_storage/object_storage_client.py @@ -122,7 +122,7 @@ def abort_multipart_upload(self, namespace_name, bucket_name, object_name, uploa "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "abort_multipart_upload got unknown kwargs: {!r}".format(extra_kwargs)) @@ -202,7 +202,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "cancel_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -298,7 +298,7 @@ def commit_multipart_upload(self, namespace_name, bucket_name, object_name, uplo "if_none_match", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "commit_multipart_upload got unknown kwargs: {!r}".format(extra_kwargs)) @@ -389,7 +389,7 @@ def copy_object(self, namespace_name, bucket_name, copy_object_details, **kwargs "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "copy_object got unknown kwargs: {!r}".format(extra_kwargs)) @@ -467,7 +467,7 @@ def create_bucket(self, namespace_name, create_bucket_details, **kwargs): "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_bucket got unknown kwargs: {!r}".format(extra_kwargs)) @@ -560,7 +560,7 @@ def create_multipart_upload(self, namespace_name, bucket_name, create_multipart_ "if_none_match", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_multipart_upload got unknown kwargs: {!r}".format(extra_kwargs)) @@ -645,7 +645,7 @@ def create_preauthenticated_request(self, namespace_name, bucket_name, create_pr "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_preauthenticated_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -732,7 +732,7 @@ def delete_bucket(self, namespace_name, bucket_name, **kwargs): "if_match", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_bucket got unknown kwargs: {!r}".format(extra_kwargs)) @@ -818,7 +818,7 @@ def delete_object(self, namespace_name, bucket_name, object_name, **kwargs): "if_match", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_object got unknown kwargs: {!r}".format(extra_kwargs)) @@ -901,7 +901,7 @@ def delete_object_lifecycle_policy(self, namespace_name, bucket_name, **kwargs): "opc_client_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_object_lifecycle_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -982,7 +982,7 @@ def delete_preauthenticated_request(self, namespace_name, bucket_name, par_id, * "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_preauthenticated_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1078,7 +1078,7 @@ def get_bucket(self, namespace_name, bucket_name, **kwargs): "opc_client_request_id", "fields" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_bucket got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1177,7 +1177,7 @@ def get_namespace(self, **kwargs): "opc_client_request_id", "compartment_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_namespace got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1253,7 +1253,7 @@ def get_namespace_metadata(self, namespace_name, **kwargs): "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_namespace_metadata got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1352,7 +1352,7 @@ def get_object(self, namespace_name, bucket_name, object_name, **kwargs): "opc_client_request_id", "range" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_object got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1434,7 +1434,7 @@ def get_object_lifecycle_policy(self, namespace_name, bucket_name, **kwargs): "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_object_lifecycle_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1516,7 +1516,7 @@ def get_preauthenticated_request(self, namespace_name, bucket_name, par_id, **kw "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_preauthenticated_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1591,7 +1591,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1679,7 +1679,7 @@ def head_bucket(self, namespace_name, bucket_name, **kwargs): "if_none_match", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "head_bucket got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1772,7 +1772,7 @@ def head_object(self, namespace_name, bucket_name, object_name, **kwargs): "if_none_match", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "head_object got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1873,7 +1873,7 @@ def list_buckets(self, namespace_name, compartment_id, **kwargs): "fields", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_buckets got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1983,7 +1983,7 @@ def list_multipart_upload_parts(self, namespace_name, bucket_name, object_name, "page", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_multipart_upload_parts got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2079,7 +2079,7 @@ def list_multipart_uploads(self, namespace_name, bucket_name, **kwargs): "page", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_multipart_uploads got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2204,7 +2204,7 @@ def list_objects(self, namespace_name, bucket_name, **kwargs): "fields", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_objects got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2306,7 +2306,7 @@ def list_preauthenticated_requests(self, namespace_name, bucket_name, **kwargs): "page", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_preauthenticated_requests got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2397,7 +2397,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "limit", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_request_errors got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2486,7 +2486,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "limit", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_request_logs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2575,7 +2575,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_requests got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2704,7 +2704,7 @@ def put_object(self, namespace_name, bucket_name, object_name, put_object_body, "content_encoding", "opc_meta" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "put_object got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2824,7 +2824,7 @@ def put_object_lifecycle_policy(self, namespace_name, bucket_name, put_object_li "if_match", "if_none_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "put_object_lifecycle_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2909,7 +2909,7 @@ def rename_object(self, namespace_name, bucket_name, rename_object_details, **kw "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "rename_object got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2991,7 +2991,7 @@ def restore_objects(self, namespace_name, bucket_name, restore_objects_details, "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "restore_objects got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3077,7 +3077,7 @@ def update_bucket(self, namespace_name, bucket_name, update_bucket_details, **kw "if_match", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_bucket got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3163,7 +3163,7 @@ def update_namespace_metadata(self, namespace_name, update_namespace_metadata_de "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_namespace_metadata got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3282,7 +3282,7 @@ def upload_part(self, namespace_name, bucket_name, object_name, upload_id, uploa "expect", "content_md5" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "upload_part got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/ons/notification_control_plane_client.py b/src/oci/ons/notification_control_plane_client.py index 8ef34e163a..ef9646970f 100644 --- a/src/oci/ons/notification_control_plane_client.py +++ b/src/oci/ons/notification_control_plane_client.py @@ -137,7 +137,7 @@ def change_topic_compartment(self, topic_id, change_topic_compartment_details, * "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_topic_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -239,7 +239,7 @@ def create_topic(self, create_topic_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_topic got unknown kwargs: {!r}".format(extra_kwargs)) @@ -315,7 +315,7 @@ def delete_topic(self, topic_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_topic got unknown kwargs: {!r}".format(extra_kwargs)) @@ -391,7 +391,7 @@ def get_topic(self, topic_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_topic got unknown kwargs: {!r}".format(extra_kwargs)) @@ -508,7 +508,7 @@ def list_topics(self, compartment_id, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_topics got unknown kwargs: {!r}".format(extra_kwargs)) @@ -618,7 +618,7 @@ def update_topic(self, topic_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_topic got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/ons/notification_data_plane_client.py b/src/oci/ons/notification_data_plane_client.py index 0d8a010be3..ecf53a61e5 100644 --- a/src/oci/ons/notification_data_plane_client.py +++ b/src/oci/ons/notification_data_plane_client.py @@ -137,7 +137,7 @@ def change_subscription_compartment(self, subscription_id, change_subscription_c "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_subscription_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -224,7 +224,7 @@ def create_subscription(self, create_subscription_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_subscription got unknown kwargs: {!r}".format(extra_kwargs)) @@ -300,7 +300,7 @@ def delete_subscription(self, subscription_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_subscription got unknown kwargs: {!r}".format(extra_kwargs)) @@ -382,7 +382,7 @@ def get_confirm_subscription(self, id, token, protocol, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_confirm_subscription got unknown kwargs: {!r}".format(extra_kwargs)) @@ -467,7 +467,7 @@ def get_subscription(self, subscription_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_subscription got unknown kwargs: {!r}".format(extra_kwargs)) @@ -550,7 +550,7 @@ def get_unsubscription(self, id, token, protocol, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_unsubscription got unknown kwargs: {!r}".format(extra_kwargs)) @@ -653,7 +653,7 @@ def list_subscriptions(self, compartment_id, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_subscriptions got unknown kwargs: {!r}".format(extra_kwargs)) @@ -745,7 +745,7 @@ def publish_message(self, topic_id, message_details, **kwargs): "opc_request_id", "message_type" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "publish_message got unknown kwargs: {!r}".format(extra_kwargs)) @@ -825,7 +825,7 @@ def resend_subscription_confirmation(self, id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "resend_subscription_confirmation got unknown kwargs: {!r}".format(extra_kwargs)) @@ -911,7 +911,7 @@ def update_subscription(self, subscription_id, update_subscription_details, **kw "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_subscription got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/regions.py b/src/oci/regions.py index 0e89d99f96..828d93d495 100644 --- a/src/oci/regions.py +++ b/src/oci/regions.py @@ -13,11 +13,13 @@ 'nrt': 'ap-tokyo-1', 'icn': 'ap-seoul-1', 'bom': 'ap-mumbai-1', - 'gru': 'sa-saopaulo-1' + 'gru': 'sa-saopaulo-1', + 'syd': 'ap-sydney-1' } REGION_REALMS = { 'ap-mumbai-1': 'oc1', 'ap-seoul-1': 'oc1', + 'ap-sydney-1': 'oc1', 'ap-tokyo-1': 'oc1', 'us-phoenix-1': 'oc1', 'us-ashburn-1': 'oc1', @@ -42,6 +44,7 @@ REGIONS = [ "ap-mumbai-1", "ap-seoul-1", + "ap-sydney-1", "ap-tokyo-1", "us-phoenix-1", "us-ashburn-1", diff --git a/src/oci/resource_manager/resource_manager_client.py b/src/oci/resource_manager/resource_manager_client.py index d0e843a3f9..a89a78146e 100644 --- a/src/oci/resource_manager/resource_manager_client.py +++ b/src/oci/resource_manager/resource_manager_client.py @@ -120,7 +120,7 @@ def cancel_job(self, job_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "cancel_job got unknown kwargs: {!r}".format(extra_kwargs)) @@ -209,7 +209,7 @@ def change_stack_compartment(self, stack_id, change_stack_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_stack_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -295,7 +295,7 @@ def create_job(self, create_job_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_job got unknown kwargs: {!r}".format(extra_kwargs)) @@ -371,7 +371,7 @@ def create_stack(self, create_stack_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_stack got unknown kwargs: {!r}".format(extra_kwargs)) @@ -444,7 +444,7 @@ def delete_stack(self, stack_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_stack got unknown kwargs: {!r}".format(extra_kwargs)) @@ -517,7 +517,7 @@ def get_job(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_job got unknown kwargs: {!r}".format(extra_kwargs)) @@ -629,7 +629,7 @@ def get_job_logs(self, job_id, **kwargs): "timestamp_greater_than_or_equal_to", "timestamp_less_than_or_equal_to" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_job_logs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -731,7 +731,7 @@ def get_job_logs_content(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_job_logs_content got unknown kwargs: {!r}".format(extra_kwargs)) @@ -806,7 +806,7 @@ def get_job_tf_config(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_job_tf_config got unknown kwargs: {!r}".format(extra_kwargs)) @@ -880,7 +880,7 @@ def get_job_tf_state(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_job_tf_state got unknown kwargs: {!r}".format(extra_kwargs)) @@ -954,7 +954,7 @@ def get_stack(self, stack_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_stack got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1029,7 +1029,7 @@ def get_stack_tf_config(self, stack_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_stack_tf_config got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1103,7 +1103,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1237,7 +1237,7 @@ def list_jobs(self, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_jobs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1387,7 +1387,7 @@ def list_stacks(self, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_stacks got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1508,7 +1508,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_request_errors got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1623,7 +1623,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_request_logs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1732,7 +1732,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_requests got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1813,7 +1813,7 @@ def update_job(self, job_id, update_job_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_job got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1901,7 +1901,7 @@ def update_stack(self, stack_id, update_stack_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_stack got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/resource_search/resource_search_client.py b/src/oci/resource_search/resource_search_client.py index 6313b10710..03681b4eaf 100644 --- a/src/oci/resource_search/resource_search_client.py +++ b/src/oci/resource_search/resource_search_client.py @@ -112,7 +112,7 @@ def get_resource_type(self, name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_resource_type got unknown kwargs: {!r}".format(extra_kwargs)) @@ -191,7 +191,7 @@ def list_resource_types(self, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_resource_types got unknown kwargs: {!r}".format(extra_kwargs)) @@ -271,7 +271,7 @@ def search_resources(self, search_details, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "search_resources got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/streaming/stream_admin_client.py b/src/oci/streaming/stream_admin_client.py index 31b2c1f71a..0806a54a21 100644 --- a/src/oci/streaming/stream_admin_client.py +++ b/src/oci/streaming/stream_admin_client.py @@ -119,7 +119,7 @@ def change_stream_compartment(self, stream_id, change_stream_compartment_details "if_match", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_stream_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -203,7 +203,7 @@ def create_archiver(self, stream_id, create_archiver_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_archiver got unknown kwargs: {!r}".format(extra_kwargs)) @@ -284,7 +284,7 @@ def create_stream(self, create_stream_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_stream got unknown kwargs: {!r}".format(extra_kwargs)) @@ -356,7 +356,7 @@ def delete_stream(self, stream_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_stream got unknown kwargs: {!r}".format(extra_kwargs)) @@ -429,7 +429,7 @@ def get_archiver(self, stream_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_archiver got unknown kwargs: {!r}".format(extra_kwargs)) @@ -503,7 +503,7 @@ def get_stream(self, stream_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_stream got unknown kwargs: {!r}".format(extra_kwargs)) @@ -611,7 +611,7 @@ def list_streams(self, compartment_id, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_streams got unknown kwargs: {!r}".format(extra_kwargs)) @@ -712,7 +712,7 @@ def start_archiver(self, stream_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "start_archiver got unknown kwargs: {!r}".format(extra_kwargs)) @@ -791,7 +791,7 @@ def stop_archiver(self, stream_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "stop_archiver got unknown kwargs: {!r}".format(extra_kwargs)) @@ -872,7 +872,7 @@ def update_archiver(self, stream_id, update_archiver_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_archiver got unknown kwargs: {!r}".format(extra_kwargs)) @@ -956,7 +956,7 @@ def update_stream(self, stream_id, update_stream_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_stream got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/streaming/stream_client.py b/src/oci/streaming/stream_client.py index 5ac27ec460..e7e74cf3ce 100644 --- a/src/oci/streaming/stream_client.py +++ b/src/oci/streaming/stream_client.py @@ -116,7 +116,7 @@ def consumer_commit(self, stream_id, cursor, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "consumer_commit got unknown kwargs: {!r}".format(extra_kwargs)) @@ -200,7 +200,7 @@ def consumer_heartbeat(self, stream_id, cursor, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "consumer_heartbeat got unknown kwargs: {!r}".format(extra_kwargs)) @@ -288,7 +288,7 @@ def create_cursor(self, stream_id, create_cursor_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_cursor got unknown kwargs: {!r}".format(extra_kwargs)) @@ -367,7 +367,7 @@ def create_group_cursor(self, stream_id, create_group_cursor_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_group_cursor got unknown kwargs: {!r}".format(extra_kwargs)) @@ -446,7 +446,7 @@ def get_group(self, stream_id, group_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_group got unknown kwargs: {!r}".format(extra_kwargs)) @@ -531,7 +531,7 @@ def get_messages(self, stream_id, cursor, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_messages got unknown kwargs: {!r}".format(extra_kwargs)) @@ -619,7 +619,7 @@ def put_messages(self, stream_id, put_messages_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "put_messages got unknown kwargs: {!r}".format(extra_kwargs)) @@ -703,7 +703,7 @@ def update_group(self, stream_id, group_name, update_group_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_group got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/version.py b/src/oci/version.py index 8b27c0765e..0f3ed425df 100644 --- a/src/oci/version.py +++ b/src/oci/version.py @@ -1,4 +1,4 @@ # coding: utf-8 # Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. -__version__ = "2.3.2" +__version__ = "2.3.3" diff --git a/src/oci/waas/waas_client.py b/src/oci/waas/waas_client.py index 6fd49d090b..d59e382b0b 100644 --- a/src/oci/waas/waas_client.py +++ b/src/oci/waas/waas_client.py @@ -123,7 +123,7 @@ def accept_recommendations(self, waas_policy_id, protection_rule_keys, **kwargs) "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "accept_recommendations got unknown kwargs: {!r}".format(extra_kwargs)) @@ -208,7 +208,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "cancel_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -296,7 +296,7 @@ def change_address_list_compartment(self, address_list_id, change_address_list_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_address_list_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -386,7 +386,7 @@ def change_certificate_compartment(self, certificate_id, change_certificate_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_certificate_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -476,7 +476,7 @@ def change_custom_protection_rule_compartment(self, custom_protection_rule_id, c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_custom_protection_rule_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -566,7 +566,7 @@ def change_waas_policy_compartment(self, waas_policy_id, change_waas_policy_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_waas_policy_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -651,7 +651,7 @@ def create_address_list(self, create_address_list_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_address_list got unknown kwargs: {!r}".format(extra_kwargs)) @@ -726,7 +726,7 @@ def create_certificate(self, create_certificate_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_certificate got unknown kwargs: {!r}".format(extra_kwargs)) @@ -797,7 +797,7 @@ def create_custom_protection_rule(self, create_custom_protection_rule_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_custom_protection_rule got unknown kwargs: {!r}".format(extra_kwargs)) @@ -883,7 +883,7 @@ def create_waas_policy(self, create_waas_policy_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_waas_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -958,7 +958,7 @@ def delete_address_list(self, address_list_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_address_list got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1044,7 +1044,7 @@ def delete_certificate(self, certificate_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_certificate got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1130,7 +1130,7 @@ def delete_custom_protection_rule(self, custom_protection_rule_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_custom_protection_rule got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1216,7 +1216,7 @@ def delete_waas_policy(self, waas_policy_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_waas_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1293,7 +1293,7 @@ def get_address_list(self, address_list_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_address_list got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1368,7 +1368,7 @@ def get_certificate(self, certificate_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_certificate got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1443,7 +1443,7 @@ def get_custom_protection_rule(self, custom_protection_rule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_custom_protection_rule got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1518,7 +1518,7 @@ def get_device_fingerprint_challenge(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_device_fingerprint_challenge got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1593,7 +1593,7 @@ def get_human_interaction_challenge(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_human_interaction_challenge got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1668,7 +1668,7 @@ def get_js_challenge(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_js_challenge got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1743,7 +1743,7 @@ def get_policy_config(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_policy_config got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1821,7 +1821,7 @@ def get_protection_rule(self, waas_policy_id, protection_rule_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_protection_rule got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1897,7 +1897,7 @@ def get_protection_settings(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_protection_settings got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1972,7 +1972,7 @@ def get_waas_policy(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_waas_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2047,7 +2047,7 @@ def get_waf_address_rate_limiting(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_waf_address_rate_limiting got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2122,7 +2122,7 @@ def get_waf_config(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_waf_config got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2197,7 +2197,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2281,7 +2281,7 @@ def list_access_rules(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_access_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2406,7 +2406,7 @@ def list_address_lists(self, compartment_id, **kwargs): "time_created_greater_than_or_equal_to", "time_created_less_than" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_address_lists got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2516,7 +2516,7 @@ def list_caching_rules(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_caching_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2611,7 +2611,7 @@ def list_captchas(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_captchas got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2736,7 +2736,7 @@ def list_certificates(self, compartment_id, **kwargs): "time_created_greater_than_or_equal_to", "time_created_less_than" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_certificates got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2879,7 +2879,7 @@ def list_custom_protection_rules(self, compartment_id, **kwargs): "time_created_greater_than_or_equal_to", "time_created_less_than" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_custom_protection_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -2995,7 +2995,7 @@ def list_edge_subnets(self, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_edge_subnets got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3092,7 +3092,7 @@ def list_good_bots(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_good_bots got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3194,7 +3194,7 @@ def list_protection_rules(self, waas_policy_id, **kwargs): "mod_security_rule_id", "action" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_protection_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3306,7 +3306,7 @@ def list_recommendations(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_recommendations got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3407,7 +3407,7 @@ def list_threat_feeds(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_threat_feeds got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3532,7 +3532,7 @@ def list_waas_policies(self, compartment_id, **kwargs): "time_created_greater_than_or_equal_to", "time_created_less_than" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_waas_policies got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3651,7 +3651,7 @@ def list_waas_policy_custom_protection_rules(self, waas_policy_id, **kwargs): "mod_security_rule_id", "action" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_waas_policy_custom_protection_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3766,7 +3766,7 @@ def list_waf_blocked_requests(self, waas_policy_id, **kwargs): "page", "waf_feature" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_waf_blocked_requests got unknown kwargs: {!r}".format(extra_kwargs)) @@ -3954,7 +3954,7 @@ def list_waf_logs(self, waas_policy_id, **kwargs): "user_agent", "protection_rule_key" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_waf_logs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4098,7 +4098,7 @@ def list_waf_requests(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_waf_requests got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4200,7 +4200,7 @@ def list_waf_traffic(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_waf_traffic got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4293,7 +4293,7 @@ def list_whitelists(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_whitelists got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4401,7 +4401,7 @@ def list_work_requests(self, waas_policy_id, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_requests got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4497,7 +4497,7 @@ def purge_cache(self, waas_policy_id, **kwargs): "if_match", "purge_cache" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "purge_cache got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4592,7 +4592,7 @@ def update_access_rules(self, waas_policy_id, access_rules, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_access_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4679,7 +4679,7 @@ def update_address_list(self, address_list_id, **kwargs): "if_match", "update_address_list_details" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_address_list got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4771,7 +4771,7 @@ def update_caching_rules(self, waas_policy_id, caching_rules_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_caching_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4868,7 +4868,7 @@ def update_captchas(self, waas_policy_id, captchas, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_captchas got unknown kwargs: {!r}".format(extra_kwargs)) @@ -4955,7 +4955,7 @@ def update_certificate(self, certificate_id, **kwargs): "if_match", "update_certificate_details" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_certificate got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5045,7 +5045,7 @@ def update_custom_protection_rule(self, custom_protection_rule_id, update_custom "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_custom_protection_rule got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5142,7 +5142,7 @@ def update_device_fingerprint_challenge(self, waas_policy_id, update_device_fing "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_device_fingerprint_challenge got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5236,7 +5236,7 @@ def update_good_bots(self, waas_policy_id, good_bots, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_good_bots got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5327,7 +5327,7 @@ def update_human_interaction_challenge(self, waas_policy_id, update_human_intera "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_human_interaction_challenge got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5420,7 +5420,7 @@ def update_js_challenge(self, waas_policy_id, update_js_challenge_details, **kwa "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_js_challenge got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5511,7 +5511,7 @@ def update_policy_config(self, waas_policy_id, update_policy_config_details, **k "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_policy_config got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5600,7 +5600,7 @@ def update_protection_rules(self, waas_policy_id, protection_rules, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_protection_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5688,7 +5688,7 @@ def update_protection_settings(self, waas_policy_id, update_protection_settings_ "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_protection_settings got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5774,7 +5774,7 @@ def update_threat_feeds(self, waas_policy_id, threat_feeds, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_threat_feeds got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5864,7 +5864,7 @@ def update_waas_policy(self, waas_policy_id, update_waas_policy_details, **kwarg "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_waas_policy got unknown kwargs: {!r}".format(extra_kwargs)) @@ -5956,7 +5956,7 @@ def update_waas_policy_custom_protection_rules(self, waas_policy_id, update_cust "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_waas_policy_custom_protection_rules got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6047,7 +6047,7 @@ def update_waf_address_rate_limiting(self, waas_policy_id, update_waf_address_ra "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_waf_address_rate_limiting got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6145,7 +6145,7 @@ def update_waf_config(self, waas_policy_id, update_waf_config_details, **kwargs) "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_waf_config got unknown kwargs: {!r}".format(extra_kwargs)) @@ -6243,7 +6243,7 @@ def update_whitelists(self, waas_policy_id, whitelists, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_whitelists got unknown kwargs: {!r}".format(extra_kwargs)) diff --git a/src/oci/work_requests/work_request_client.py b/src/oci/work_requests/work_request_client.py index 3e92d075e8..5d07088de2 100644 --- a/src/oci/work_requests/work_request_client.py +++ b/src/oci/work_requests/work_request_client.py @@ -119,7 +119,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -217,7 +217,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_request_errors got unknown kwargs: {!r}".format(extra_kwargs)) @@ -331,7 +331,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_request_logs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -445,7 +445,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [key for key in six.iterkeys(kwargs) if key not in expected_kwargs] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_requests got unknown kwargs: {!r}".format(extra_kwargs))