From 8d2b4e649e6d9ecca53e7a5fc2d927416bde8e90 Mon Sep 17 00:00:00 2001 From: dshelbyo Date: Tue, 19 Nov 2019 17:47:44 +0000 Subject: [PATCH] Releasing version 2.6.5 --- CHANGELOG.rst | 10 ++ examples/showoci/CHANGELOG.rst | 8 ++ examples/showoci/showoci.py | 2 +- examples/showoci/showoci_data.py | 91 +++++++++++++++---- examples/showoci/showoci_output.py | 63 +++++++------ examples/showoci/showoci_service.py | 36 ++++++-- examples/showoci/showoci_to_se.py | 67 ++++++++++---- src/oci/core/compute_client.py | 2 +- src/oci/core/compute_management_client.py | 49 +++++++--- ..._management_client_composite_operations.py | 8 +- ...nge_cluster_network_compartment_details.py | 6 +- src/oci/core/models/cluster_network.py | 42 ++++++--- ...network_placement_configuration_details.py | 12 ++- .../core/models/cluster_network_summary.py | 28 ++++-- .../models/create_cluster_network_details.py | 30 ++++-- ...e_cluster_network_instance_pool_details.py | 20 +++- ...ce_pool_placement_configuration_details.py | 31 +++++++ .../models/create_virtual_circuit_details.py | 49 +++++++++- .../fast_connect_provider_service_key.py | 2 +- .../models/instance_console_connection.py | 2 +- .../instance_pool_placement_configuration.py | 31 +++++++ src/oci/core/models/security_list.py | 1 - .../models/update_cluster_network_details.py | 8 +- ...ce_pool_placement_configuration_details.py | 31 +++++++ .../models/update_virtual_circuit_details.py | 51 +++++++++-- src/oci/core/models/virtual_circuit.py | 49 ++++++++-- src/oci/core/models/volume_group.py | 2 +- .../database/models/autonomous_database.py | 8 +- .../models/autonomous_database_summary.py | 8 +- .../models/create_autonomous_database_base.py | 41 +++++++++ ...reate_autonomous_database_clone_details.py | 7 ++ .../create_autonomous_database_details.py | 7 ++ .../update_autonomous_database_details.py | 8 +- src/oci/streaming/stream_client.py | 12 +-- src/oci/version.py | 2 +- 35 files changed, 656 insertions(+), 168 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6c5cfaf5e3..e3dd479642 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,16 @@ Change Log All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_. +==================== +2.6.5 - 2019-11-19 +==================== + +Added +----- +* Support for four-byte autonomous system numbers (ASNs) on FastConnect resources in the Networking service +* Support for choosing fault domains when creating instance pools in the Compute service +* Support for allowing connections from only specific VCNs to autonomous data warehouse and autonomous transaction processing instances in the Database service +* Support for Streaming Client Non-Regional ==================== 2.6.4 - 2019-11-12 diff --git a/examples/showoci/CHANGELOG.rst b/examples/showoci/CHANGELOG.rst index 93c872be6b..82934a9b50 100755 --- a/examples/showoci/CHANGELOG.rst +++ b/examples/showoci/CHANGELOG.rst @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_. +==================== +19.11.19 - 2019-11-19 +==================== +* Added total block volume in CSV export per instance +* Added compartment_id to all JSON resources +* Changed JSON 'compartment' to 'compartment_name' to be aligned across the application +* Added VPUs to the block and boot volumes + ==================== 19.10.31 - 2019-10-31 ==================== diff --git a/examples/showoci/showoci.py b/examples/showoci/showoci.py index 4eb78a4ad2..362f1f62a8 100755 --- a/examples/showoci/showoci.py +++ b/examples/showoci/showoci.py @@ -62,7 +62,7 @@ import argparse import datetime -version = "19.10.31" +version = "19.11.19" ########################################################################## # execute_extract diff --git a/examples/showoci/showoci_data.py b/examples/showoci/showoci_data.py index 3e99756af5..34b1151024 100755 --- a/examples/showoci/showoci_data.py +++ b/examples/showoci/showoci_data.py @@ -184,7 +184,12 @@ def __get_oci_region_data(self, region_name): continue print(" Compartment " + compartment['path'] + "...") - data = {'compartment': compartment['name'], 'path': compartment['path']} + data = { + 'compartment_id': compartment['id'], + 'compartment_name': compartment['name'], + 'compartment': compartment['name'], + 'path': compartment['path'] + } has_data = False # run on network module @@ -321,7 +326,8 @@ def __get_core_network_vcn_nat(self, vcn_id): for arr in list_nat_gateways: value = {'id': arr['id'], 'name': arr['name'], - 'compartment': arr['compartment_name'], + 'compartment_name': arr['compartment_name'], + 'compartment_id': arr['compartment_id'], 'time_created': arr['time_created'], 'defined_tags': arr['defined_tags'], 'freeform_tags': arr['freeform_tags']} @@ -342,7 +348,11 @@ def __get_core_network_vcn_igw(self, vcn_id): try: list_igws = self.service.search_multi_items(self.service.C_NETWORK, self.service.C_NETWORK_IGW, 'vcn_id', vcn_id) for arr in list_igws: - value = {'id': arr['id'], 'name': arr['name'], 'compartment': arr['compartment_name'], 'time_created': arr['time_created']} + value = {'id': arr['id'], + 'name': arr['name'], + 'compartment_name': arr['compartment_name'], + 'compartment_id': arr['compartment_id'], + 'time_created': arr['time_created']} data.append(value) return data @@ -361,7 +371,9 @@ def __get_core_network_vcn_sgw(self, vcn_id): list_service_gateways = self.service.search_multi_items(self.service.C_NETWORK, self.service.C_NETWORK_SGW, 'vcn_id', vcn_id) for arr in list_service_gateways: value = {'id': arr['id'], 'name': arr['name'], 'services': arr['services'], - 'compartment': arr['compartment_name'], 'time_created': arr['time_created'], 'defined_tags': arr['defined_tags'], 'freeform_tags': arr['freeform_tags']} + 'compartment_name': arr['compartment_name'], + 'compartment_id': arr['compartment_id'], + 'time_created': arr['time_created'], 'defined_tags': arr['defined_tags'], 'freeform_tags': arr['freeform_tags']} data.append(value) return data @@ -414,7 +426,12 @@ def __get_core_network_vcn_drg_attached(self, vcn_id): list_drg_attachments = self.service.search_multi_items(self.service.C_NETWORK, self.service.C_NETWORK_DRG_AT, 'vcn_id', vcn_id) for da in list_drg_attachments: val = self.__get_core_network_vcn_drg_details(da) - value = {'id': da['id'], 'drg_id': da['drg_id'], 'name': val, 'compartment': da['compartment_name'], 'time_created': da['time_created']} + value = {'id': da['id'], + 'drg_id': da['drg_id'], + 'name': val, + 'compartment_name': da['compartment_name'], + 'compartment_id': da['compartment_id'], + 'time_created': da['time_created']} data.append(value) return data @@ -434,7 +451,19 @@ def __get_core_network_vcn_local_peering(self, vcn_id): if lpg['route_table_id'] != "None": routestr = " + Transit Route(" + str(self.__get_core_network_route(lpg['route_table_id'])) + ")" - value = {'id': lpg['id'], 'name': (lpg['name'] + routestr), 'compartment': lpg['compartment_name'], 'time_created': lpg['time_created']} + value = {'id': lpg['id'], + 'name': (lpg['name'] + routestr), + 'display_name': (lpg['display_name']), + 'compartment_id': lpg['compartment_id'], + 'compartment_name': lpg['compartment_name'], + 'time_created': lpg['time_created'], + 'route_table_id': lpg['route_table_id'], + 'route_table_name': routestr, + 'vcn_id': lpg['vcn_id'], + 'peer_advertised_cidr': lpg['peer_advertised_cidr'], + 'peer_advertised_cidr_details': lpg['peer_advertised_cidr_details'], + 'is_cross_tenancy_peering': lpg['is_cross_tenancy_peering'] + } data.append(value) return data @@ -484,7 +513,8 @@ def __get_core_network_vcn_subnets(self, vcn_id): 'availability_domain': subnet['availability_domain'], 'public_private': subnet['public_private'], 'dns': subnet['dns_label'], - 'compartment': subnet['compartment_name'], + 'compartment_name': subnet['compartment_name'], + 'compartment_id': subnet['compartment_id'], 'dhcp_options': dhcp_options, 'security_list': sec_lists, 'route': route_name, @@ -512,7 +542,8 @@ def __get_core_network_vcn_security_lists(self, vcn_id): data.append({ 'id': sl['id'], 'name': sl['name'], - 'compartment': sl['compartment_name'], + 'compartment_name': sl['compartment_name'], + 'compartment_id': sl['compartment_id'], 'sec_rules': sl['sec_rules'], 'time_created': sl['time_created'], 'defined_tags': sl['defined_tags'], @@ -537,7 +568,8 @@ def __get_core_network_vcn_security_groups(self, vcn_id): value = { 'id': nsg['id'], 'name': nsg['name'], - 'compartment': nsg['compartment_name'], + 'compartment_name': nsg['compartment_name'], + 'compartment_id': nsg['compartment_id'], 'sec_rules': [], 'time_created': nsg['time_created'], 'defined_tags': nsg['defined_tags'], @@ -672,10 +704,18 @@ def __get_core_network_vcn_route_tables(self, vcn_id): for rt in route_tables: route_rules = [] for rl in rt['route_rules']: - route_rules.append({'network_entity_id': rl['network_entity_id'], 'destination': rl['destination'], 'desc': self.__get_core_network_vcn_route_rule(rl)}) + route_rules.append( + {'network_entity_id': rl['network_entity_id'], + 'destination': rl['destination'], + 'desc': self.__get_core_network_vcn_route_rule(rl) + }) # add route - val = {'id': rt['id'], 'name': rt['name'], 'compartment': rt['compartment_name'], 'time_created': rt['time_created'], + val = {'id': rt['id'], + 'name': rt['name'], + 'compartment_name': rt['compartment_name'], + 'compartment_id': rt['compartment_id'], + 'time_created': rt['time_created'], 'route_rules': route_rules} data.append(val) return data @@ -697,7 +737,8 @@ def __get_core_network_vcn_dhcp_options(self, vcn_id): data.append({ 'id': dhcp['id'], 'name': dhcp['name'], - 'compartment': dhcp['compartment_name'], + 'compartment_name': dhcp['compartment_name'], + 'compartment_id': dhcp['compartment_id'], 'time_created': dhcp['time_created'], 'opt': dhcp['options'] }) @@ -732,7 +773,13 @@ def __get_core_network_vcn(self, region_name, compartment): 'dhcp_options': self.__get_core_network_vcn_dhcp_options(vcn['id'])} # assign the data to the vcn - vcn_data.append({'id': vcn['id'], 'name': vcn['name'], 'display_name': vcn['display_name'], 'cidr_block': vcn['cidr_block'], 'compartment': str(compartment['name']), 'data': val}) + vcn_data.append({'id': vcn['id'], + 'name': vcn['name'], + 'display_name': vcn['display_name'], + 'cidr_block': vcn['cidr_block'], + 'compartment_name': str(compartment['name']), + 'compartment_id': str(compartment['id']), + 'data': val}) return vcn_data except BaseException as e: @@ -1068,8 +1115,10 @@ def __get_core_block_volume_boot(self, boot_volume_id, compartment_name): value = { 'sum_info': 'Compute - Block Storage (GB)', 'sum_size_gb': bv['size_in_gbs'], - 'desc': (str(bv['size_in_gbs']) + "GB - " + str(bv['display_name']) + " " + bv['backup_policy'] + volume_group + comp_text), + 'desc': (str(bv['size_in_gbs']) + "GB - " + str(bv['display_name']) + " (" + bv['vpus_per_gb'] + " vpus) " + bv['backup_policy'] + volume_group + comp_text), 'backup_policy': "None" if bv['backup_policy'] == "" else bv['backup_policy'], + 'vpus_per_gb': bv['vpus_per_gb'], + 'is_hydrated': bv['is_hydrated'], 'time_created': bv['time_created'], 'display_name': bv['display_name'], 'defined_tags': bv['defined_tags'], @@ -1104,10 +1153,14 @@ def __get_core_block_volume(self, volume_id, compartment_name): value = { 'sum_info': 'Compute - Block Storage (GB)', 'sum_size_gb': bv['size_in_gbs'], - 'desc': (str(bv['size_in_gbs']) + "GB - " + str(bv['display_name']) + bv['backup_policy'] + volume_group + comp_text), + 'desc': (str(bv['size_in_gbs']) + "GB - " + str(bv['display_name']) + " (" + bv['vpus_per_gb'] + " vpus) " + bv['backup_policy'] + volume_group + comp_text), 'time_created': bv['time_created'], + 'compartment_name': bv['compartment_name'], + 'compartment_id': bv['compartment_id'], 'backup_policy': "None" if bv['backup_policy'] == "" else bv['backup_policy'], 'display_name': bv['display_name'], + 'vpus_per_gb': bv['vpus_per_gb'], + 'is_hydrated': bv['is_hydrated'], 'size': str(bv['size_in_gbs']), 'defined_tags': bv['defined_tags'], 'freeform_tags': bv['freeform_tags'] @@ -1297,6 +1350,7 @@ def __get_core_compute_instances(self, region_name, compartment): 'shape_storage_tb': instance['shape_storage_tb'], 'display_name': instance['display_name'], 'compartment_name': instance['compartment_name'], + 'compartment_id': instance['compartment_id'], 'lifecycle_state': instance['lifecycle_state'], 'console_id': instance['console_id'], 'console': instance['console'], 'time_created': instance['time_created'], @@ -1749,6 +1803,7 @@ def __get_database_db_systems(self, region_name, compartment): 'storage_management': dbs['storage_management'], 'vip_ips': dbs['vip_ips'], 'compartment_name': dbs['compartment_name'], + 'compartment_id': dbs['compartment_id'], 'patches': self.__get_database_db_patches(dbs['patches']), 'listener_port': dbs['listener_port'], 'db_homes': self.__get_database_db_homes(dbs['db_homes']), @@ -1807,6 +1862,7 @@ def __get_database_autonomous_databases(self, region_name, compartment): 'data_storage_size_in_tbs': str(dbs['data_storage_size_in_tbs']), 'db_name': str(dbs['db_name']), 'compartment_name': str(dbs['compartment_name']), + 'compartment_id': str(dbs['compartment_id']), 'service_console_url': str(dbs['service_console_url']), 'time_created': str(dbs['time_created'])[0:16], 'connection_strings': str(dbs['connection_strings']), @@ -2251,7 +2307,10 @@ def __get_container_main(self, region_name, compartment): for np in nodes: nval = {'id': np['id'], 'name': np['name'], 'node_image_id': np['node_image_id'], 'node_image_name': np['node_image_name'], 'kubernetes_version': np['kubernetes_version'], 'node_shape': np['node_shape'], - 'quantity_per_subnet': np['quantity_per_subnet'], 'compartment_name': np['compartment_name'], 'subnets': [], 'subnet_ids': np['subnet_ids']} + 'quantity_per_subnet': np['quantity_per_subnet'], + 'compartment_name': np['compartment_name'], + 'compartment_id': np['compartment_id'], + 'subnets': [], 'subnet_ids': np['subnet_ids']} # subnets for sub in np['subnet_ids']: diff --git a/examples/showoci/showoci_output.py b/examples/showoci/showoci_output.py index ae460fdc83..32687f836e 100755 --- a/examples/showoci/showoci_output.py +++ b/examples/showoci/showoci_output.py @@ -309,7 +309,7 @@ def __print_core_network_vcn_subnet(self, subnets, vcn_compartment): try: for subnet in subnets: print("") - print(self.tabs + "Subnet " + subnet['subnet'] + self.__print_core_network_vcn_compartment(vcn_compartment, subnet['compartment'])) + print(self.tabs + "Subnet " + subnet['subnet'] + self.__print_core_network_vcn_compartment(vcn_compartment, subnet['compartment_name'])) print(self.tabs + self.tabs + "Name : " + subnet['name']) print(self.tabs + self.tabs + "DNS : " + subnet['dns']) print(self.tabs + self.tabs + "DHCP : " + subnet['dhcp_options']) @@ -328,7 +328,7 @@ def __print_core_network_vcn_dhcp_options(self, dhcp_options, vcn_compartment): try: for dhcp in dhcp_options: print("") - print(self.tabs + "DHCP Options: " + dhcp['name'] + self.__print_core_network_vcn_compartment(vcn_compartment, dhcp['compartment'])) + print(self.tabs + "DHCP Options: " + dhcp['name'] + self.__print_core_network_vcn_compartment(vcn_compartment, dhcp['compartment_name'])) for opt in dhcp['opt']: print(self.tabs + self.tabs + opt) @@ -346,7 +346,7 @@ def __print_core_network_vcn_security_lists(self, sec_lists, vcn_compartment): return for sl in sec_lists: print("") - print(self.tabs + "Sec List : " + str(sl['name']) + self.__print_core_network_vcn_compartment(vcn_compartment, sl['compartment'])) + print(self.tabs + "Sec List : " + str(sl['name']) + self.__print_core_network_vcn_compartment(vcn_compartment, sl['compartment_name'])) if len(sl['sec_rules']) == 0: print(self.tabs + " : Empty.") @@ -366,7 +366,7 @@ def __print_core_network_vcn_security_groups(self, sec_groups, vcn_compartment): return for sl in sec_groups: print("") - print(self.tabs + "Sec Group : " + str(sl['name']) + self.__print_core_network_vcn_compartment(vcn_compartment, sl['compartment'])) + print(self.tabs + "Sec Group : " + str(sl['name']) + self.__print_core_network_vcn_compartment(vcn_compartment, sl['compartment_name'])) if len(sl['sec_rules']) == 0: print(self.tabs + " : Empty or no Permission.") @@ -386,7 +386,7 @@ def __print_core_network_vcn_route_tables(self, route_tables, vcn_compartment): return for rt in route_tables: print("") - print(self.tabs + "Route Table : " + rt['name'] + self.__print_core_network_vcn_compartment(vcn_compartment, rt['compartment'])) + print(self.tabs + "Route Table : " + rt['name'] + self.__print_core_network_vcn_compartment(vcn_compartment, rt['compartment_name'])) if 'route_rules' not in rt: print(self.tabs + self.tabs + "Route : Empty.") return @@ -412,27 +412,27 @@ def __print_core_network_vcn(self, vcns): self.print_header("VCNs", 2) for vcn in vcns: print(self.taba + "VCN " + vcn['name']) - vcn_compartment = vcn['compartment'] + vcn_compartment = vcn['compartment_name'] if 'igw' in vcn['data']: for igwloop in vcn['data']['igw']: - print(self.tabs + "Internet GW : " + igwloop['name'] + self.__print_core_network_vcn_compartment(vcn_compartment, igwloop['compartment'])) + print(self.tabs + "Internet GW : " + igwloop['name'] + self.__print_core_network_vcn_compartment(vcn_compartment, igwloop['compartment_name'])) if 'sgw' in vcn['data']: for sgwloop in vcn['data']['sgw']: - print(self.tabs + "Service GW : " + sgwloop['name'] + " - " + sgwloop['services'] + self.__print_core_network_vcn_compartment(vcn_compartment, sgwloop['compartment'])) + print(self.tabs + "Service GW : " + sgwloop['name'] + " - " + sgwloop['services'] + self.__print_core_network_vcn_compartment(vcn_compartment, sgwloop['compartment_name'])) if 'nat' in vcn['data']: for natloop in vcn['data']['nat']: - print(self.tabs + "NAT GW : " + natloop['name'] + self.__print_core_network_vcn_compartment(vcn_compartment, natloop['compartment'])) + print(self.tabs + "NAT GW : " + natloop['name'] + self.__print_core_network_vcn_compartment(vcn_compartment, natloop['compartment_name'])) if 'drg_attached' in vcn['data']: for drgloop in vcn['data']['drg_attached']: - print(self.tabs + "DRG Attached: " + drgloop['name'] + self.__print_core_network_vcn_compartment(vcn_compartment, drgloop['compartment'])) + print(self.tabs + "DRG Attached: " + drgloop['name'] + self.__print_core_network_vcn_compartment(vcn_compartment, drgloop['compartment_name'])) if 'local_peering' in vcn['data']: for lpeer in vcn['data']['local_peering']: - print(self.tabs + "Local Peer : " + lpeer['name'] + self.__print_core_network_vcn_compartment(vcn_compartment, lpeer['compartment'])) + print(self.tabs + "Local Peer : " + lpeer['name'] + self.__print_core_network_vcn_compartment(vcn_compartment, lpeer['compartment_name'])) if 'subnets' in vcn['data']: self.__print_core_network_vcn_subnet(vcn['data']['subnets'], vcn_compartment) @@ -1623,9 +1623,7 @@ def __summary_database_db_autonomous(self, dbs): for db in dbs: if 'sum_info' in db and 'sum_count' in db: self.summary_global_list.append({'type': db['sum_info'], 'size': float(db['sum_count'])}) - - if 'cpu_core_count' in db: - self.summary_global_list.append({'type': "Total OCPUs - Autonomous Database", 'size': float(db['cpu_core_count'])}) + self.summary_global_list.append({'type': "Total OCPUs - Autonomous Database", 'size': float(db['sum_count'])}) if 'sum_info_storage' in db and 'sum_size_tb' in db: self.summary_global_list.append({'type': db['sum_info_storage'], 'size': float(db['sum_size_tb'])}) @@ -2078,7 +2076,7 @@ def __csv_core_network_vcn_subnet(self, region_name, subnets, vcn, igw, sgw, nat data = {'region_name': region_name, 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], 'internet_gateway': igw, 'service_gateway': sgw, 'nat': nat, @@ -2087,7 +2085,7 @@ def __csv_core_network_vcn_subnet(self, region_name, subnets, vcn, igw, sgw, nat 'subnet_name': subnet['name'], 'subnet_cidr': subnet['cidr_block'], 'availability_domain': subnet['availability_domain'], - 'subnet_compartment': subnet['compartment'], + 'subnet_compartment': subnet['compartment_name'], 'public_private': subnet['public_private'], 'dhcp_options': subnet['dhcp_options'], 'route': subnet['route'], @@ -2113,9 +2111,9 @@ def __csv_core_network_vcn_security_lists(self, region_name, sec_lists, vcn): data = {'region_name': region_name, 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], 'sec_name': sl['name'], - 'sec_compartment': sl['compartment'], + 'sec_compartment': sl['compartment_name'], 'sec_protocol': "", 'is_stateless': "", 'sec_rules': "Empty", @@ -2130,9 +2128,9 @@ def __csv_core_network_vcn_security_lists(self, region_name, sec_lists, vcn): data = {'region_name': region_name, 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], 'sec_name': sl['name'], - 'sec_compartment': sl['compartment'], + 'sec_compartment': sl['compartment_name'], 'sec_protocol': slr['protocol_name'], 'is_stateless': slr['is_stateless'], 'sec_rules': slr['desc'], @@ -2155,11 +2153,11 @@ def __csv_core_network_vcn_dhcp_options(self, region_name, dhcp_options, vcn): data = {'region_name': region_name, 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], 'dhcp_name': dhcp['name'], 'option_1': "", 'option_2': "", - 'dhcp_compartment': dhcp['compartment'], + 'dhcp_compartment': dhcp['compartment_name'], 'time_created': dhcp['time_created'][0:16], 'vcn_id': vcn['id'], 'dhcp_id': dhcp['id'] @@ -2190,9 +2188,9 @@ def __csv_core_network_vcn_route_tables(self, region_name, route_tables, vcn): data = {'region_name': region_name, 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], 'route_name': rt['name'], - 'route_compartment': rt['compartment'], + 'route_compartment': rt['compartment_name'], 'destination': "", 'route': "Empty", 'time_created': rt['time_created'][0:16], @@ -2206,9 +2204,9 @@ def __csv_core_network_vcn_route_tables(self, region_name, route_tables, vcn): data = {'region_name': region_name, 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], 'route_name': rt['name'], - 'route_compartment': rt['compartment'], + 'route_compartment': rt['compartment_name'], 'destination': rl['destination'], 'route': rl['desc'], 'time_created': rt['time_created'][0:16], @@ -2232,7 +2230,7 @@ def __csv_core_network_vcn(self, region_name, vcns): for vcn in vcns: # don't extract managed compartment - if self.__if_managed_paas_compartment(vcn['compartment']): + if self.__if_managed_paas_compartment(vcn['compartment_name']): continue igw = "" @@ -2450,6 +2448,7 @@ def __csv_core_compute_instances(self, region_name, instances): 'boot_volume_size_gb': "", 'boot_volume_b_policy': "", 'block_volumes': "", + 'block_volumes_total_gb': "", 'block_volumes_size_gb': "", 'block_volumes_b_policy': "", 'freeform_tags': str(', '.join(key + "=" + instance['freeform_tags'][key] for key in instance['freeform_tags'].keys())), @@ -2476,10 +2475,14 @@ def __csv_core_compute_instances(self, region_name, instances): data['boot_volume_b_policy'] = bv['backup_policy'] if 'block_volume' in instance: + data['block_volumes'] = str(', '.join(x['display_name'] for x in instance['block_volume'])) + data['block_volumes_size_gb'] = str('+ '.join(x['size'] for x in instance['block_volume'])) + data['block_volumes_b_policy'] = str(', '.join(x['backup_policy'] for x in instance['block_volume'])) + + bv_total_size = 0 for bv in instance['block_volume']: - data['block_volumes'] = str(', '.join(x['display_name'] for x in instance['block_volume'])) - data['block_volumes_size_gb'] = str('+ '.join(x['size'] for x in instance['block_volume'])) - data['block_volumes_b_policy'] = str(', '.join(x['backup_policy'] for x in instance['block_volume'])) + bv_total_size += int(bv['size']) + data['block_volumes_total_gb'] = str(bv_total_size) self.csv_compute.append(data) diff --git a/examples/showoci/showoci_service.py b/examples/showoci/showoci_service.py index a055836d08..a93ecd6d59 100755 --- a/examples/showoci/showoci_service.py +++ b/examples/showoci/showoci_service.py @@ -104,7 +104,7 @@ def is_load_basic_network(self): # class ShowOCIService ########################################################################## class ShowOCIService(object): - oci_compatible_version = "2.5.2" + oci_compatible_version = "2.6.4" ########################################################################## # Global Constants @@ -1536,10 +1536,17 @@ def __load_core_network_lpg(self, virtual_network, compartments, vcns): cidr = "" if lpg.peer_advertised_cidr is None else " - " + str(lpg.peer_advertised_cidr) # add lpg info to data - val = {'id': str(lpg.id), 'vcn_id': str(lpg.vcn_id), + val = {'id': str(lpg.id), + 'vcn_id': str(lpg.vcn_id), 'name': str(lpg.peering_status).ljust(8) + " - " + str(lpg.display_name) + str(cidr), - 'time_created': str(lpg.time_created), 'route_table_id': str(lpg.route_table_id), - 'compartment_name': str(compartment['name']), 'compartment_id': str(compartment['id']), + 'time_created': str(lpg.time_created), + 'display_name': str(lpg.display_name), + 'peer_advertised_cidr': str(lpg.peer_advertised_cidr), + 'is_cross_tenancy_peering': str(lpg.is_cross_tenancy_peering), + 'peer_advertised_cidr_details': lpg.peer_advertised_cidr_details, + 'route_table_id': str(lpg.route_table_id), + 'compartment_name': str(compartment['name']), + 'compartment_id': str(compartment['id']), 'defined_tags': [] if lpg.defined_tags is None else lpg.defined_tags, 'freeform_tags': [] if lpg.freeform_tags is None else lpg.freeform_tags, 'region_name': str(self.config['region'])} @@ -2562,6 +2569,8 @@ def __load_core_network_cpe(self, virtual_network, compartments): for arr in arrs: val = {'id': str(arr.id), 'name': str(arr.display_name) + " - " + str(arr.ip_address), + 'display_name': str(arr.display_name), + 'ip_address': str(arr.ip_address), 'time_created': str(arr.time_created), 'compartment_name': str(compartment['name']), 'defined_tags': [] if arr.defined_tags is None else arr.defined_tags, @@ -3703,8 +3712,12 @@ def __load_core_block_boot(self, block_storage, compartments): for arr in boot_volumes: val = {'id': str(arr.id), 'display_name': str(arr.display_name), - 'size_in_gbs': str(arr.size_in_gbs), 'time_created': str(arr.time_created), - 'kms_key_id': str(arr.kms_key_id), 'volume_group_id': str(arr.volume_group_id), + 'size_in_gbs': str(arr.size_in_gbs), + 'time_created': str(arr.time_created), + 'kms_key_id': str(arr.kms_key_id), + 'vpus_per_gb': str(arr.vpus_per_gb), + 'is_hydrated': str(arr.is_hydrated), + 'volume_group_id': str(arr.volume_group_id), 'volume_group_name': "", 'availability_domain': str(arr.availability_domain), 'compartment_name': str(compartment['name']), 'compartment_id': str(compartment['id']), 'defined_tags': [] if arr.defined_tags is None else arr.defined_tags, @@ -3774,10 +3787,15 @@ def __load_core_block_volume(self, block_storage, compartments): for arr in arrs: val = {'id': str(arr.id), 'display_name': str(arr.display_name), - 'size_in_gbs': str(arr.size_in_gbs), 'time_created': str(arr.time_created), - 'kms_key_id': str(arr.kms_key_id), 'volume_group_id': str(arr.volume_group_id), + 'size_in_gbs': str(arr.size_in_gbs), + 'time_created': str(arr.time_created), + 'kms_key_id': str(arr.kms_key_id), + 'volume_group_id': str(arr.volume_group_id), 'volume_group_name': "", 'availability_domain': str(arr.availability_domain), - 'compartment_name': str(compartment['name']), 'compartment_id': str(compartment['id']), + 'compartment_name': str(compartment['name']), + 'compartment_id': str(compartment['id']), + 'vpus_per_gb': str(arr.vpus_per_gb), + 'is_hydrated': str(arr.is_hydrated), 'defined_tags': [] if arr.defined_tags is None else arr.defined_tags, 'freeform_tags': [] if arr.freeform_tags is None else arr.freeform_tags, 'region_name': str(self.config['region']), diff --git a/examples/showoci/showoci_to_se.py b/examples/showoci/showoci_to_se.py index e2f8d3d1bd..8ebccff9e1 100755 --- a/examples/showoci/showoci_to_se.py +++ b/examples/showoci/showoci_to_se.py @@ -222,12 +222,14 @@ def __convert_core_network_vcn_subnet(self, region_name, subnets, vcn): 'vcn_id': vcn['id'], 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], + 'vcn_compartment_id': vcn['compartment_id'], 'subnet_id': subnet['id'], 'subnet_name': subnet['name'], 'subnet_cidr': subnet['cidr_block'], 'availability_domain': subnet['availability_domain'], - 'subnet_compartment': subnet['compartment'], + 'subnet_compartment': subnet['compartment_name'], + 'subnet_compartment_id': subnet['compartment_id'], 'public_private': subnet['public_private'], 'dhcp_options': subnet['dhcp_options'], 'route': subnet['route'], @@ -254,10 +256,12 @@ def __convert_core_network_vcn_security_lists(self, region_name, sec_lists, vcn) 'vcn_id': vcn['id'], 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], + 'vcn_compartment_id': vcn['compartment_id'], 'sec_name': sl['name'], 'sec_id': sl['id'], - 'sec_compartment': sl['compartment'], + 'sec_compartment': sl['compartment_name'], + 'sec_compartment_id': sl['compartment_id'], 'time_created': sl['time_created'][0:16], 'sec_protocol': "", 'sec_is_stateless': "", @@ -279,10 +283,12 @@ def __convert_core_network_vcn_security_lists(self, region_name, sec_lists, vcn) 'vcn_id': vcn['id'], 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], + 'vcn_compartment_id': vcn['compartment_id'], 'sec_name': sl['name'], 'sec_id': sl['id'], - 'sec_compartment': sl['compartment'], + 'sec_compartment': sl['compartment_name'], + 'sec_compartment_id': sl['compartment_id'], 'time_created': sl['time_created'][0:16], 'sec_protocol': slr['protocol_name'], 'sec_is_stateless': slr['is_stateless'], @@ -317,10 +323,12 @@ def __convert_core_network_vcn_security_groups(self, region_name, sec_groups, vc 'vcn_id': vcn['id'], 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], + 'vcn_compartment_id': vcn['compartment_id'], 'sec_id': sl['id'], 'sec_name': sl['name'], - 'sec_compartment': sl['compartment'], + 'sec_compartment': sl['compartment_name'], + 'sec_compartment_id': sl['compartment_id'], 'time_created': sl['time_created'][0:16], 'sec_description': "", 'sec_direction': "", @@ -350,10 +358,12 @@ def __convert_core_network_vcn_security_groups(self, region_name, sec_groups, vc 'vcn_id': vcn['id'], 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], + 'vcn_compartment_id': vcn['compartment_id'], 'sec_id': sl['id'], 'sec_name': sl['name'], - 'sec_compartment': sl['compartment'], + 'sec_compartment': sl['compartment_name'], + 'sec_compartment_id': sl['compartment_id'], 'time_created': sl['time_created'], 'sec_description': slr['description'], 'sec_direction': slr['direction'], @@ -391,11 +401,13 @@ def __convert_core_network_vcn_dhcp_options(self, region_name, dhcp_options, vcn 'vcn_id': vcn['id'], 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], + 'vcn_compartment_id': vcn['compartment_id'], 'dhcp_name': dhcp['name'], 'option_1': "", 'option_2': "", - 'dhcp_compartment': dhcp['compartment'], + 'dhcp_compartment': dhcp['compartment_name'], + 'dhcp_compartment_id': dhcp['compartment_id'], 'time_created': dhcp['time_created'][0:16]} seq = 0 @@ -426,9 +438,11 @@ def __convert_core_network_vcn_route_tables(self, region_name, route_tables, vcn 'vcn_id': vcn['id'], 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], + 'vcn_compartment_id': vcn['compartment_id'], 'route_name': rt['name'], - 'route_compartment': rt['compartment'], + 'route_compartment': rt['compartment_name'], + 'route_compartment_id': rt['compartment_id'], 'destination': "", 'route': "Empty", 'time_created': rt['time_created'][0:16]} @@ -442,10 +456,12 @@ def __convert_core_network_vcn_route_tables(self, region_name, route_tables, vcn 'vcn_id': vcn['id'], 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], + 'vcn_compartment_id': vcn['compartment_id'], 'route_name': rt['name'], 'route_ocid': rt['id'], - 'route_compartment': rt['compartment'], + 'route_compartment': rt['compartment_name'], + 'route_compartment_id': rt['compartment_id'], 'network_entity_id': rl['network_entity_id'], 'destination': rl['destination'], 'route': rl['desc'], @@ -467,7 +483,7 @@ def __convert_core_network_vcn(self, region_name, vcns): for vcn in vcns: # don't extract managed compartment - if self.__if_managed_paas_compartment(vcn['compartment']): + if self.__if_managed_paas_compartment(vcn['compartment_name']): continue igw = "" @@ -495,14 +511,15 @@ def __convert_core_network_vcn(self, region_name, vcns): drg = str(', '.join(x['name'] for x in vcn['data']['drg_attached'])) if 'local_peering' in vcn['data']: - lpg = str(', '.join(x['name'] for x in vcn['data']['local_peering'])) + lpg = vcn['data']['local_peering'] self.NetworkVcnId += 1 data = {'class': 'NetworkVcn' + str(self.NetworkVcnId), 'region_name': region_name, 'vcn_name': vcn['display_name'], 'vcn_cidr': vcn['cidr_block'], - 'vcn_compartment': vcn['compartment'], + 'vcn_compartment': vcn['compartment_name'], + 'vcn_compartment_id': vcn['compartment_id'], 'vcn_id': vcn['id'], 'internet_gateway': igw, 'igw_id': igw_id, @@ -550,7 +567,14 @@ def __convert_core_network_cpe(self, region_name, cpes): continue self.NetworkCpeId += 1 - data = {'class': "NetworkCpe" + str(self.NetworkCpeId)} + data = {'class': "NetworkCpe" + str(self.NetworkCpeId), + 'region_name': region_name, + 'display_name': cpe['display_name'], + 'ip_address': cpe['ip_address'], + 'time_created': cpe['time_created'], + 'compartment_name': cpe['compartment_name'], + 'compartment_id': cpe['compartment_id'] + } data.update(cpe) # add details @@ -699,6 +723,7 @@ def __convert_database_db_system(self, region_name, list_db_systems): 'region_name': region_name, 'availability_domain': dbs['availability_domain'], 'compartment_name': dbs['compartment_name'], + 'compartment_id': dbs['compartment_id'], 'status': dbs['lifecycle_state'], 'type': "DBSystem", 'name': dbs['display_name'], @@ -744,6 +769,7 @@ def __convert_database_db_autonomous(self, region_name, databases): 'region_name': region_name, 'availability_domain': "", 'compartment_name': dbs['compartment_name'], + 'compartment_id': dbs['compartment_id'], 'status': dbs['lifecycle_state'], 'type': "Autonomous" + dbs['db_workload'], 'name': dbs['display_name'], 'shape': "", @@ -805,6 +831,7 @@ def __convert_core_compute_instances(self, region_name, instances): 'region_name': region_name, 'availability_domain': instance['availability_domain'], 'compartment_name': instance['compartment_name'], + 'compartment_id': instance['compartment_id'], 'server_name': instance['display_name'], 'Status': instance['lifecycle_state'], 'Type': instance['image_os'], diff --git a/src/oci/core/compute_client.py b/src/oci/core/compute_client.py index 6d70f6be38..4f5843f5c1 100644 --- a/src/oci/core/compute_client.py +++ b/src/oci/core/compute_client.py @@ -999,7 +999,7 @@ def create_instance_console_connection(self, create_instance_console_connection_ """ CreateInstanceConsoleConnection Creates a new console connection to the specified instance. - Once the console connection has been created and is available, + After the console connection has been created and is available, you connect to the console using SSH. For more information about console access, see `Accessing the Console`__. diff --git a/src/oci/core/compute_management_client.py b/src/oci/core/compute_management_client.py index 1039609bef..13e131830f 100644 --- a/src/oci/core/compute_management_client.py +++ b/src/oci/core/compute_management_client.py @@ -180,11 +180,20 @@ def attach_load_balancer(self, instance_pool_id, attach_load_balancer_details, * def change_cluster_network_compartment(self, cluster_network_id, change_cluster_network_compartment_details, **kwargs): """ ChangeClusterNetworkCompartment - Change the compartment of a cluster network. + Moves a cluster network into a different compartment within the same tenancy. For + information about moving resources between compartments, see + `Moving Resources to a Different Compartment`__. + + When you move a cluster network to a different compartment, associated resources such as the instances + in the cluster network, boot volumes, and VNICs are not moved. + + __ https://docs.cloud.oracle.com/iaas/Content/Identity/Tasks/managingcompartments.htm#moveRes :param str cluster_network_id: (required) - The OCID of the cluster network. + The `OCID`__ of the cluster network. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param ChangeClusterNetworkCompartmentDetails change_cluster_network_compartment_details: (required) Request to change the compartment of given cluster network. @@ -487,7 +496,10 @@ def change_instance_pool_compartment(self, instance_pool_id, change_instance_poo def create_cluster_network(self, create_cluster_network_details, **kwargs): """ CreateClusterNetwork - Create a cluster network. + Creates a cluster network. For more information about cluster networks, see + `Managing Cluster Networks`__. + + __ https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/managingclusternetworks.htm :param CreateClusterNetworkDetails create_cluster_network_details: (required) @@ -859,11 +871,13 @@ def detach_load_balancer(self, instance_pool_id, detach_load_balancer_details, * def get_cluster_network(self, cluster_network_id, **kwargs): """ GetClusterNetwork - Gets the specified cluster network + Gets information about the specified cluster network. :param str cluster_network_id: (required) - The OCID of the cluster network. + The `OCID`__ of the cluster network. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :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. @@ -1209,7 +1223,7 @@ def launch_instance_configuration(self, instance_configuration_id, instance_conf def list_cluster_network_instances(self, compartment_id, cluster_network_id, **kwargs): """ ListClusterNetworkInstances - List the instances in the specified cluster network. + Lists the instances in the specified cluster network. :param str compartment_id: (required) @@ -1218,7 +1232,9 @@ def list_cluster_network_instances(self, compartment_id, cluster_network_id, **k __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm :param str cluster_network_id: (required) - The OCID of the cluster network. + The `OCID`__ of the cluster network. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param str display_name: (optional) A filter to return only resources that match the given display name exactly. @@ -1395,7 +1411,8 @@ def list_cluster_networks(self, compartment_id, **kwargs): 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. + 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" @@ -2235,11 +2252,16 @@ def stop_instance_pool(self, instance_pool_id, **kwargs): def terminate_cluster_network(self, cluster_network_id, **kwargs): """ TerminateClusterNetwork - Terminate the specified cluster network. + Terminates the specified cluster network. + + When you delete a cluster network, all of its resources are permanently deleted, + including associated instances and instance pools. :param str cluster_network_id: (required) - The OCID of the cluster network. + The `OCID`__ of the cluster network. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param str if_match: (optional) For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` @@ -2381,12 +2403,13 @@ def terminate_instance_pool(self, instance_pool_id, **kwargs): 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. + Updates 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. + The `OCID`__ of the cluster network. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param UpdateClusterNetworkDetails update_cluster_network_details: (required) Update cluster network diff --git a/src/oci/core/compute_management_client_composite_operations.py b/src/oci/core/compute_management_client_composite_operations.py index 8b1e221bbe..4068a9d68b 100644 --- a/src/oci/core/compute_management_client_composite_operations.py +++ b/src/oci/core/compute_management_client_composite_operations.py @@ -415,7 +415,9 @@ def terminate_cluster_network_and_wait_for_work_request(self, cluster_network_id to enter the given state(s). :param str cluster_network_id: (required) - The OCID of the cluster network. + The `OCID`__ of the cluster network. + + __ https://docs.cloud.oracle.com/iaas/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` @@ -497,7 +499,9 @@ def update_cluster_network_and_wait_for_state(self, cluster_network_id, update_c to enter the given state(s). :param str cluster_network_id: (required) - The OCID of the cluster network. + The `OCID`__ of the cluster network. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param UpdateClusterNetworkDetails update_cluster_network_details: (required) Update cluster network diff --git a/src/oci/core/models/change_cluster_network_compartment_details.py b/src/oci/core/models/change_cluster_network_compartment_details.py index 7aa95c454e..39e3dc0fd3 100644 --- a/src/oci/core/models/change_cluster_network_compartment_details.py +++ b/src/oci/core/models/change_cluster_network_compartment_details.py @@ -9,7 +9,7 @@ @init_model_state_from_kwargs class ChangeClusterNetworkCompartmentDetails(object): """ - Contains details indicating which compartment the resource should move to + The configuration details for the move operation. """ def __init__(self, **kwargs): @@ -39,7 +39,7 @@ def compartment_id(self): The `OCID`__ of the compartment into which the resource should be moved. - __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :return: The compartment_id of this ChangeClusterNetworkCompartmentDetails. @@ -54,7 +54,7 @@ def compartment_id(self, compartment_id): The `OCID`__ of the compartment into which the resource should be moved. - __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param compartment_id: The compartment_id of this ChangeClusterNetworkCompartmentDetails. diff --git a/src/oci/core/models/cluster_network.py b/src/oci/core/models/cluster_network.py index 42b6052a78..a7ce119b3b 100644 --- a/src/oci/core/models/cluster_network.py +++ b/src/oci/core/models/cluster_network.py @@ -9,7 +9,11 @@ @init_model_state_from_kwargs class ClusterNetwork(object): """ - Cluster Network + A cluster network is a group of high performance computing (HPC) bare metal instances that are connected + with an ultra low latency network. For more information about cluster networks, see + `Managing Cluster Networks`__. + + __ https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/managingclusternetworks.htm """ #: A constant which can be used with the lifecycle_state property of a ClusterNetwork. @@ -133,7 +137,9 @@ def __init__(self, **kwargs): def id(self): """ **[Required]** Gets the id of this ClusterNetwork. - The OCID of the cluster network. + The `OCID`__ of the cluster network. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :return: The id of this ClusterNetwork. @@ -145,7 +151,9 @@ def id(self): def id(self, id): """ Sets the id of this ClusterNetwork. - The OCID of the cluster network. + The `OCID`__ of the cluster network. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param id: The id of this ClusterNetwork. @@ -157,7 +165,9 @@ def id(self, id): def compartment_id(self): """ **[Required]** Gets the compartment_id of this ClusterNetwork. - The OCID of the compartment containing the cluster netowrk. + The `OCID`__ of the compartment containing the cluster netowrk. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :return: The compartment_id of this ClusterNetwork. @@ -169,7 +179,9 @@ def compartment_id(self): def compartment_id(self, compartment_id): """ Sets the compartment_id of this ClusterNetwork. - The OCID of the compartment containing the cluster netowrk. + The `OCID`__ of the compartment containing the cluster netowrk. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param compartment_id: The compartment_id of this ClusterNetwork. @@ -215,7 +227,7 @@ def defined_tags(self, defined_tags): def display_name(self): """ Gets the display_name of this ClusterNetwork. - The user-friendly name. Does not have to be unique. + A user-friendly name. Does not have to be unique, and it's changeable. :return: The display_name of this ClusterNetwork. @@ -227,7 +239,7 @@ def display_name(self): def display_name(self, display_name): """ Sets the display_name of this ClusterNetwork. - The user-friendly name. Does not have to be unique. + A user-friendly name. Does not have to be unique, and it's changeable. :param display_name: The display_name of this ClusterNetwork. @@ -273,7 +285,9 @@ def freeform_tags(self, freeform_tags): def instance_pools(self): """ Gets the instance_pools of this ClusterNetwork. - the instance pools in the cluster network. + The instance pools in the cluster network. + + Each cluster network can have one instance pool. :return: The instance_pools of this ClusterNetwork. @@ -285,7 +299,9 @@ def instance_pools(self): def instance_pools(self, instance_pools): """ Sets the instance_pools of this ClusterNetwork. - the instance pools in the cluster network. + The instance pools in the cluster network. + + Each cluster network can have one instance pool. :param instance_pools: The instance_pools of this ClusterNetwork. @@ -297,7 +313,7 @@ def instance_pools(self, instance_pools): def placement_configuration(self): """ Gets the placement_configuration of this ClusterNetwork. - the placement data for the intance pools in the cluster network + The placement configuration for the instance pools in the cluster network. :return: The placement_configuration of this ClusterNetwork. @@ -309,7 +325,7 @@ def placement_configuration(self): def placement_configuration(self, placement_configuration): """ Sets the placement_configuration of this ClusterNetwork. - the placement data for the intance pools in the cluster network + The placement configuration for the instance pools in the cluster network. :param placement_configuration: The placement_configuration of this ClusterNetwork. @@ -352,6 +368,7 @@ 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` @@ -365,6 +382,7 @@ 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` @@ -378,6 +396,7 @@ 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` @@ -391,6 +410,7 @@ 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` diff --git a/src/oci/core/models/cluster_network_placement_configuration_details.py b/src/oci/core/models/cluster_network_placement_configuration_details.py index 1c2862009a..c95402a5fb 100644 --- a/src/oci/core/models/cluster_network_placement_configuration_details.py +++ b/src/oci/core/models/cluster_network_placement_configuration_details.py @@ -51,6 +51,7 @@ def availability_domain(self): """ **[Required]** Gets the availability_domain of this ClusterNetworkPlacementConfigurationDetails. The availability domain to place instances. + Example: `Uocm:PHX-AD-1` @@ -64,6 +65,7 @@ def availability_domain(self, availability_domain): """ Sets the availability_domain of this ClusterNetworkPlacementConfigurationDetails. The availability domain to place instances. + Example: `Uocm:PHX-AD-1` @@ -76,7 +78,10 @@ def availability_domain(self, availability_domain): def primary_subnet_id(self): """ **[Required]** Gets the primary_subnet_id of this ClusterNetworkPlacementConfigurationDetails. - The OCID of the primary subnet to place instances. + The `OCID`__ of the primary subnet to place + instances. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :return: The primary_subnet_id of this ClusterNetworkPlacementConfigurationDetails. @@ -88,7 +93,10 @@ def primary_subnet_id(self): 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. + The `OCID`__ of the primary subnet to place + instances. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param primary_subnet_id: The primary_subnet_id of this ClusterNetworkPlacementConfigurationDetails. diff --git a/src/oci/core/models/cluster_network_summary.py b/src/oci/core/models/cluster_network_summary.py index d0fd9c438c..1908da4500 100644 --- a/src/oci/core/models/cluster_network_summary.py +++ b/src/oci/core/models/cluster_network_summary.py @@ -9,7 +9,7 @@ @init_model_state_from_kwargs class ClusterNetworkSummary(object): """ - Condensed Cluster Network data when listing cluster networks. + Summary information for a cluster network. """ #: A constant which can be used with the lifecycle_state property of a ClusterNetworkSummary. @@ -126,7 +126,9 @@ def __init__(self, **kwargs): def id(self): """ **[Required]** Gets the id of this ClusterNetworkSummary. - The OCID of the cluster network. + The `OCID`__ of the cluster network. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :return: The id of this ClusterNetworkSummary. @@ -138,7 +140,9 @@ def id(self): def id(self, id): """ Sets the id of this ClusterNetworkSummary. - The OCID of the cluster network. + The `OCID`__ of the cluster network. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param id: The id of this ClusterNetworkSummary. @@ -150,7 +154,10 @@ def id(self, id): def compartment_id(self): """ **[Required]** Gets the compartment_id of this ClusterNetworkSummary. - The OCID of the compartment containing the cluster netowrk. + The `OCID`__ of the compartment containing the + cluster netowrk. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :return: The compartment_id of this ClusterNetworkSummary. @@ -162,7 +169,10 @@ def compartment_id(self): def compartment_id(self, compartment_id): """ Sets the compartment_id of this ClusterNetworkSummary. - The OCID of the compartment containing the cluster netowrk. + The `OCID`__ of the compartment containing the + cluster netowrk. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param compartment_id: The compartment_id of this ClusterNetworkSummary. @@ -208,7 +218,7 @@ def defined_tags(self, defined_tags): def display_name(self): """ Gets the display_name of this ClusterNetworkSummary. - The user-friendly name. Does not have to be unique. + A user-friendly name for the cluster network. Does not have to be unique, and it's changeable. :return: The display_name of this ClusterNetworkSummary. @@ -220,7 +230,7 @@ def display_name(self): def display_name(self, display_name): """ Sets the display_name of this ClusterNetworkSummary. - The user-friendly name. Does not have to be unique. + A user-friendly name for the cluster network. Does not have to be unique, and it's changeable. :param display_name: The display_name of this ClusterNetworkSummary. @@ -321,6 +331,7 @@ 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` @@ -334,6 +345,7 @@ 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` @@ -347,6 +359,7 @@ 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` @@ -360,6 +373,7 @@ 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` diff --git a/src/oci/core/models/create_cluster_network_details.py b/src/oci/core/models/create_cluster_network_details.py index 9d5d1bb59c..ac9732613b 100644 --- a/src/oci/core/models/create_cluster_network_details.py +++ b/src/oci/core/models/create_cluster_network_details.py @@ -9,7 +9,7 @@ @init_model_state_from_kwargs class CreateClusterNetworkDetails(object): """ - The data to create a cluster network + The data to create a cluster network. """ def __init__(self, **kwargs): @@ -71,7 +71,10 @@ def __init__(self, **kwargs): def compartment_id(self): """ **[Required]** Gets the compartment_id of this CreateClusterNetworkDetails. - The OCID of the compartment containing the cluster network. + The `OCID`__ of the compartment + containing the cluster network. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :return: The compartment_id of this CreateClusterNetworkDetails. @@ -83,7 +86,10 @@ def compartment_id(self): def compartment_id(self, compartment_id): """ Sets the compartment_id of this CreateClusterNetworkDetails. - The OCID of the compartment containing the cluster network. + The `OCID`__ of the compartment + containing the cluster network. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param compartment_id: The compartment_id of this CreateClusterNetworkDetails. @@ -129,7 +135,8 @@ def defined_tags(self, defined_tags): def display_name(self): """ Gets the display_name of this CreateClusterNetworkDetails. - The user-friendly name. Does not have to be unique. + A user-friendly name for the cluster network. Does not have to be unique, and it's + changeable. Avoid entering confidential information. :return: The display_name of this CreateClusterNetworkDetails. @@ -141,7 +148,8 @@ def display_name(self): def display_name(self, display_name): """ Sets the display_name of this CreateClusterNetworkDetails. - The user-friendly name. Does not have to be unique. + A user-friendly name for the cluster network. Does not have to be unique, and it's + changeable. Avoid entering confidential information. :param display_name: The display_name of this CreateClusterNetworkDetails. @@ -187,7 +195,9 @@ def freeform_tags(self, freeform_tags): def instance_pools(self): """ **[Required]** Gets the instance_pools of this CreateClusterNetworkDetails. - the data to create the instance pools in the cluster network. + The data to create the instance pools in the cluster network. + + Each cluster network can have one instance pool. :return: The instance_pools of this CreateClusterNetworkDetails. @@ -199,7 +209,9 @@ def instance_pools(self): def instance_pools(self, instance_pools): """ Sets the instance_pools of this CreateClusterNetworkDetails. - the data to create the instance pools in the cluster network. + The data to create the instance pools in the cluster network. + + Each cluster network can have one instance pool. :param instance_pools: The instance_pools of this CreateClusterNetworkDetails. @@ -211,7 +223,7 @@ def instance_pools(self, instance_pools): def placement_configuration(self): """ **[Required]** Gets the placement_configuration of this CreateClusterNetworkDetails. - the placement data for the intance pools in the cluster network + The placement configuration for the instance pools in the cluster network. :return: The placement_configuration of this CreateClusterNetworkDetails. @@ -223,7 +235,7 @@ def placement_configuration(self): def placement_configuration(self, placement_configuration): """ Sets the placement_configuration of this CreateClusterNetworkDetails. - the placement data for the intance pools in the cluster network + The placement configuration for the instance pools in the cluster network. :param placement_configuration: The placement_configuration of this CreateClusterNetworkDetails. 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 index 5f30eb050d..a355285a5c 100644 --- a/src/oci/core/models/create_cluster_network_instance_pool_details.py +++ b/src/oci/core/models/create_cluster_network_instance_pool_details.py @@ -98,7 +98,7 @@ def defined_tags(self, defined_tags): def display_name(self): """ Gets the display_name of this CreateClusterNetworkInstancePoolDetails. - The user-friendly name. Does not have to be unique. + A user-friendly name. Does not have to be unique. Avoid entering confidential information. :return: The display_name of this CreateClusterNetworkInstancePoolDetails. @@ -110,7 +110,7 @@ def display_name(self): def display_name(self, display_name): """ Sets the display_name of this CreateClusterNetworkInstancePoolDetails. - The user-friendly name. Does not have to be unique. + A user-friendly name. Does not have to be unique. Avoid entering confidential information. :param display_name: The display_name of this CreateClusterNetworkInstancePoolDetails. @@ -156,7 +156,10 @@ def freeform_tags(self, freeform_tags): 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. + The `OCID`__ of the instance configuration + associated with the instance pool. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :return: The instance_configuration_id of this CreateClusterNetworkInstancePoolDetails. @@ -168,7 +171,10 @@ def instance_configuration_id(self): 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. + The `OCID`__ of the instance configuration + associated with the instance pool. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param instance_configuration_id: The instance_configuration_id of this CreateClusterNetworkInstancePoolDetails. @@ -182,6 +188,9 @@ def size(self): **[Required]** Gets the size of this CreateClusterNetworkInstancePoolDetails. The number of instances that should be in the instance pool. + If the required number of instances is not available or if some instances fail to launch, + the cluster network is not created. + :return: The size of this CreateClusterNetworkInstancePoolDetails. :rtype: int @@ -194,6 +203,9 @@ def size(self, size): Sets the size of this CreateClusterNetworkInstancePoolDetails. The number of instances that should be in the instance pool. + If the required number of instances is not available or if some instances fail to launch, + the cluster network is not created. + :param size: The size of this CreateClusterNetworkInstancePoolDetails. :type: int diff --git a/src/oci/core/models/create_instance_pool_placement_configuration_details.py b/src/oci/core/models/create_instance_pool_placement_configuration_details.py index 91a0fa5720..789d9d3f16 100644 --- a/src/oci/core/models/create_instance_pool_placement_configuration_details.py +++ b/src/oci/core/models/create_instance_pool_placement_configuration_details.py @@ -21,6 +21,10 @@ def __init__(self, **kwargs): The value to assign to the availability_domain property of this CreateInstancePoolPlacementConfigurationDetails. :type availability_domain: str + :param fault_domains: + The value to assign to the fault_domains property of this CreateInstancePoolPlacementConfigurationDetails. + :type fault_domains: list[str] + :param primary_subnet_id: The value to assign to the primary_subnet_id property of this CreateInstancePoolPlacementConfigurationDetails. :type primary_subnet_id: str @@ -32,17 +36,20 @@ def __init__(self, **kwargs): """ self.swagger_types = { 'availability_domain': 'str', + 'fault_domains': 'list[str]', 'primary_subnet_id': 'str', 'secondary_vnic_subnets': 'list[InstancePoolPlacementSecondaryVnicSubnet]' } self.attribute_map = { 'availability_domain': 'availabilityDomain', + 'fault_domains': 'faultDomains', 'primary_subnet_id': 'primarySubnetId', 'secondary_vnic_subnets': 'secondaryVnicSubnets' } self._availability_domain = None + self._fault_domains = None self._primary_subnet_id = None self._secondary_vnic_subnets = None @@ -72,6 +79,30 @@ def availability_domain(self, availability_domain): """ self._availability_domain = availability_domain + @property + def fault_domains(self): + """ + Gets the fault_domains of this CreateInstancePoolPlacementConfigurationDetails. + The fault domains to place instances. + + + :return: The fault_domains of this CreateInstancePoolPlacementConfigurationDetails. + :rtype: list[str] + """ + return self._fault_domains + + @fault_domains.setter + def fault_domains(self, fault_domains): + """ + Sets the fault_domains of this CreateInstancePoolPlacementConfigurationDetails. + The fault domains to place instances. + + + :param fault_domains: The fault_domains of this CreateInstancePoolPlacementConfigurationDetails. + :type: list[str] + """ + self._fault_domains = fault_domains + @property def primary_subnet_id(self): """ diff --git a/src/oci/core/models/create_virtual_circuit_details.py b/src/oci/core/models/create_virtual_circuit_details.py index 118238a5f6..ae4a11b22f 100644 --- a/src/oci/core/models/create_virtual_circuit_details.py +++ b/src/oci/core/models/create_virtual_circuit_details.py @@ -41,6 +41,10 @@ def __init__(self, **kwargs): The value to assign to the customer_bgp_asn property of this CreateVirtualCircuitDetails. :type customer_bgp_asn: int + :param customer_asn: + The value to assign to the customer_asn property of this CreateVirtualCircuitDetails. + :type customer_asn: int + :param defined_tags: The value to assign to the defined_tags property of this CreateVirtualCircuitDetails. :type defined_tags: dict(str, dict(str, object)) @@ -92,6 +96,7 @@ def __init__(self, **kwargs): 'compartment_id': 'str', 'cross_connect_mappings': 'list[CrossConnectMapping]', 'customer_bgp_asn': 'int', + 'customer_asn': 'int', 'defined_tags': 'dict(str, dict(str, object))', 'display_name': 'str', 'freeform_tags': 'dict(str, str)', @@ -110,6 +115,7 @@ def __init__(self, **kwargs): 'compartment_id': 'compartmentId', 'cross_connect_mappings': 'crossConnectMappings', 'customer_bgp_asn': 'customerBgpAsn', + 'customer_asn': 'customerAsn', 'defined_tags': 'definedTags', 'display_name': 'displayName', 'freeform_tags': 'freeformTags', @@ -127,6 +133,7 @@ def __init__(self, **kwargs): self._compartment_id = None self._cross_connect_mappings = None self._customer_bgp_asn = None + self._customer_asn = None self._defined_tags = None self._display_name = None self._freeform_tags = None @@ -225,9 +232,8 @@ def cross_connect_mappings(self, cross_connect_mappings): def customer_bgp_asn(self): """ Gets the customer_bgp_asn of this CreateVirtualCircuitDetails. - Your BGP ASN (either public or private). Provide this value only if - there's a BGP session that goes from your edge router to Oracle. - Otherwise, leave this empty or null. + Deprecated. Instead use `customerAsn`. + If you specify values for both, the request will be rejected. :return: The customer_bgp_asn of this CreateVirtualCircuitDetails. @@ -239,15 +245,48 @@ def customer_bgp_asn(self): def customer_bgp_asn(self, customer_bgp_asn): """ Sets the customer_bgp_asn of this CreateVirtualCircuitDetails. + Deprecated. Instead use `customerAsn`. + If you specify values for both, the request will be rejected. + + + :param customer_bgp_asn: The customer_bgp_asn of this CreateVirtualCircuitDetails. + :type: int + """ + self._customer_bgp_asn = customer_bgp_asn + + @property + def customer_asn(self): + """ + Gets the customer_asn of this CreateVirtualCircuitDetails. Your BGP ASN (either public or private). Provide this value only if there's a BGP session that goes from your edge router to Oracle. Otherwise, leave this empty or null. + Can be a 2-byte or 4-byte ASN. Uses \"asplain\" format. + Example: `12345` (2-byte) or `1587232876` (4-byte) - :param customer_bgp_asn: The customer_bgp_asn of this CreateVirtualCircuitDetails. + + :return: The customer_asn of this CreateVirtualCircuitDetails. + :rtype: int + """ + return self._customer_asn + + @customer_asn.setter + def customer_asn(self, customer_asn): + """ + Sets the customer_asn of this CreateVirtualCircuitDetails. + Your BGP ASN (either public or private). Provide this value only if + there's a BGP session that goes from your edge router to Oracle. + Otherwise, leave this empty or null. + Can be a 2-byte or 4-byte ASN. Uses \"asplain\" format. + + Example: `12345` (2-byte) or `1587232876` (4-byte) + + + :param customer_asn: The customer_asn of this CreateVirtualCircuitDetails. :type: int """ - self._customer_bgp_asn = customer_bgp_asn + self._customer_asn = customer_asn @property def defined_tags(self): diff --git a/src/oci/core/models/fast_connect_provider_service_key.py b/src/oci/core/models/fast_connect_provider_service_key.py index 91a6b24a03..683a017331 100644 --- a/src/oci/core/models/fast_connect_provider_service_key.py +++ b/src/oci/core/models/fast_connect_provider_service_key.py @@ -50,7 +50,7 @@ def __init__(self, **kwargs): @property def name(self): """ - Gets the name of this FastConnectProviderServiceKey. + **[Required]** Gets the name of this FastConnectProviderServiceKey. The service key that the provider gives you when you set up a virtual circuit connection from the provider to Oracle Cloud Infrastructure. Use this value as the `providerServiceKeyName` query parameter for diff --git a/src/oci/core/models/instance_console_connection.py b/src/oci/core/models/instance_console_connection.py index d5294034fa..7325e8b35f 100644 --- a/src/oci/core/models/instance_console_connection.py +++ b/src/oci/core/models/instance_console_connection.py @@ -9,7 +9,7 @@ @init_model_state_from_kwargs class InstanceConsoleConnection(object): """ - The `InstanceConsoleConnection` API provides you with console access to virtual machine (VM) instances, + The `InstanceConsoleConnection` API provides you with console access to Compute instances, enabling you to troubleshoot malfunctioning instances remotely. For more information about console access, see diff --git a/src/oci/core/models/instance_pool_placement_configuration.py b/src/oci/core/models/instance_pool_placement_configuration.py index 8328675e50..1e86482a02 100644 --- a/src/oci/core/models/instance_pool_placement_configuration.py +++ b/src/oci/core/models/instance_pool_placement_configuration.py @@ -25,6 +25,10 @@ def __init__(self, **kwargs): The value to assign to the primary_subnet_id property of this InstancePoolPlacementConfiguration. :type primary_subnet_id: str + :param fault_domains: + The value to assign to the fault_domains property of this InstancePoolPlacementConfiguration. + :type fault_domains: list[str] + :param secondary_vnic_subnets: The value to assign to the secondary_vnic_subnets property of this InstancePoolPlacementConfiguration. :type secondary_vnic_subnets: list[InstancePoolPlacementSecondaryVnicSubnet] @@ -33,17 +37,20 @@ def __init__(self, **kwargs): self.swagger_types = { 'availability_domain': 'str', 'primary_subnet_id': 'str', + 'fault_domains': 'list[str]', 'secondary_vnic_subnets': 'list[InstancePoolPlacementSecondaryVnicSubnet]' } self.attribute_map = { 'availability_domain': 'availabilityDomain', 'primary_subnet_id': 'primarySubnetId', + 'fault_domains': 'faultDomains', 'secondary_vnic_subnets': 'secondaryVnicSubnets' } self._availability_domain = None self._primary_subnet_id = None + self._fault_domains = None self._secondary_vnic_subnets = None @property @@ -96,6 +103,30 @@ def primary_subnet_id(self, primary_subnet_id): """ self._primary_subnet_id = primary_subnet_id + @property + def fault_domains(self): + """ + Gets the fault_domains of this InstancePoolPlacementConfiguration. + The fault domains to place instances. + + + :return: The fault_domains of this InstancePoolPlacementConfiguration. + :rtype: list[str] + """ + return self._fault_domains + + @fault_domains.setter + def fault_domains(self, fault_domains): + """ + Sets the fault_domains of this InstancePoolPlacementConfiguration. + The fault domains to place instances. + + + :param fault_domains: The fault_domains of this InstancePoolPlacementConfiguration. + :type: list[str] + """ + self._fault_domains = fault_domains + @property def secondary_vnic_subnets(self): """ diff --git a/src/oci/core/models/security_list.py b/src/oci/core/models/security_list.py index c6d4155977..57677ca3c8 100644 --- a/src/oci/core/models/security_list.py +++ b/src/oci/core/models/security_list.py @@ -13,7 +13,6 @@ class SecurityList(object): level, but the rules are applied to the ingress and egress traffic for the individual instances in the subnet. The rules can be stateful or stateless. For more information, see `Security Lists`__. - **Note:** Compare security lists to :class:`NetworkSecurityGroup`s, which let you apply a set of security rules to a *specific set of VNICs* instead of an entire subnet. Oracle recommends using network security groups instead of security lists, although you diff --git a/src/oci/core/models/update_cluster_network_details.py b/src/oci/core/models/update_cluster_network_details.py index 510b93c0f4..a505953c5c 100644 --- a/src/oci/core/models/update_cluster_network_details.py +++ b/src/oci/core/models/update_cluster_network_details.py @@ -9,7 +9,7 @@ @init_model_state_from_kwargs class UpdateClusterNetworkDetails(object): """ - The data to update a cluster network + The data to update a cluster network. """ def __init__(self, **kwargs): @@ -84,7 +84,8 @@ def defined_tags(self, defined_tags): def display_name(self): """ Gets the display_name of this UpdateClusterNetworkDetails. - The user-friendly name. Does not have to be unique. + A user-friendly name. Does not have to be unique, and it's changeable. Avoid + entering confidential information. :return: The display_name of this UpdateClusterNetworkDetails. @@ -96,7 +97,8 @@ def display_name(self): def display_name(self, display_name): """ Sets the display_name of this UpdateClusterNetworkDetails. - The user-friendly name. Does not have to be unique. + A user-friendly name. Does not have to be unique, and it's changeable. Avoid + entering confidential information. :param display_name: The display_name of this UpdateClusterNetworkDetails. diff --git a/src/oci/core/models/update_instance_pool_placement_configuration_details.py b/src/oci/core/models/update_instance_pool_placement_configuration_details.py index 55e6a393bf..a3c14c3b64 100644 --- a/src/oci/core/models/update_instance_pool_placement_configuration_details.py +++ b/src/oci/core/models/update_instance_pool_placement_configuration_details.py @@ -21,6 +21,10 @@ def __init__(self, **kwargs): The value to assign to the availability_domain property of this UpdateInstancePoolPlacementConfigurationDetails. :type availability_domain: str + :param fault_domains: + The value to assign to the fault_domains property of this UpdateInstancePoolPlacementConfigurationDetails. + :type fault_domains: list[str] + :param primary_subnet_id: The value to assign to the primary_subnet_id property of this UpdateInstancePoolPlacementConfigurationDetails. :type primary_subnet_id: str @@ -32,17 +36,20 @@ def __init__(self, **kwargs): """ self.swagger_types = { 'availability_domain': 'str', + 'fault_domains': 'list[str]', 'primary_subnet_id': 'str', 'secondary_vnic_subnets': 'list[InstancePoolPlacementSecondaryVnicSubnet]' } self.attribute_map = { 'availability_domain': 'availabilityDomain', + 'fault_domains': 'faultDomains', 'primary_subnet_id': 'primarySubnetId', 'secondary_vnic_subnets': 'secondaryVnicSubnets' } self._availability_domain = None + self._fault_domains = None self._primary_subnet_id = None self._secondary_vnic_subnets = None @@ -72,6 +79,30 @@ def availability_domain(self, availability_domain): """ self._availability_domain = availability_domain + @property + def fault_domains(self): + """ + Gets the fault_domains of this UpdateInstancePoolPlacementConfigurationDetails. + The fault domains to place instances. + + + :return: The fault_domains of this UpdateInstancePoolPlacementConfigurationDetails. + :rtype: list[str] + """ + return self._fault_domains + + @fault_domains.setter + def fault_domains(self, fault_domains): + """ + Sets the fault_domains of this UpdateInstancePoolPlacementConfigurationDetails. + The fault domains to place instances. + + + :param fault_domains: The fault_domains of this UpdateInstancePoolPlacementConfigurationDetails. + :type: list[str] + """ + self._fault_domains = fault_domains + @property def primary_subnet_id(self): """ diff --git a/src/oci/core/models/update_virtual_circuit_details.py b/src/oci/core/models/update_virtual_circuit_details.py index d4f534da2b..b254a46011 100644 --- a/src/oci/core/models/update_virtual_circuit_details.py +++ b/src/oci/core/models/update_virtual_circuit_details.py @@ -37,6 +37,10 @@ def __init__(self, **kwargs): The value to assign to the customer_bgp_asn property of this UpdateVirtualCircuitDetails. :type customer_bgp_asn: int + :param customer_asn: + The value to assign to the customer_asn property of this UpdateVirtualCircuitDetails. + :type customer_asn: int + :param defined_tags: The value to assign to the defined_tags property of this UpdateVirtualCircuitDetails. :type defined_tags: dict(str, dict(str, object)) @@ -71,6 +75,7 @@ def __init__(self, **kwargs): 'bandwidth_shape_name': 'str', 'cross_connect_mappings': 'list[CrossConnectMapping]', 'customer_bgp_asn': 'int', + 'customer_asn': 'int', 'defined_tags': 'dict(str, dict(str, object))', 'display_name': 'str', 'freeform_tags': 'dict(str, str)', @@ -84,6 +89,7 @@ def __init__(self, **kwargs): 'bandwidth_shape_name': 'bandwidthShapeName', 'cross_connect_mappings': 'crossConnectMappings', 'customer_bgp_asn': 'customerBgpAsn', + 'customer_asn': 'customerAsn', 'defined_tags': 'definedTags', 'display_name': 'displayName', 'freeform_tags': 'freeformTags', @@ -96,6 +102,7 @@ def __init__(self, **kwargs): self._bandwidth_shape_name = None self._cross_connect_mappings = None self._customer_bgp_asn = None + self._customer_asn = None self._defined_tags = None self._display_name = None self._freeform_tags = None @@ -172,6 +179,32 @@ def cross_connect_mappings(self, cross_connect_mappings): def customer_bgp_asn(self): """ Gets the customer_bgp_asn of this UpdateVirtualCircuitDetails. + Deprecated. Instead use `customerAsn`. + If you specify values for both, the request will be rejected. + + + :return: The customer_bgp_asn of this UpdateVirtualCircuitDetails. + :rtype: int + """ + return self._customer_bgp_asn + + @customer_bgp_asn.setter + def customer_bgp_asn(self, customer_bgp_asn): + """ + Sets the customer_bgp_asn of this UpdateVirtualCircuitDetails. + Deprecated. Instead use `customerAsn`. + If you specify values for both, the request will be rejected. + + + :param customer_bgp_asn: The customer_bgp_asn of this UpdateVirtualCircuitDetails. + :type: int + """ + self._customer_bgp_asn = customer_bgp_asn + + @property + def customer_asn(self): + """ + Gets the customer_asn of this UpdateVirtualCircuitDetails. The BGP ASN of the network at the other end of the BGP session from Oracle. @@ -183,16 +216,18 @@ def customer_bgp_asn(self): required value is the provider's ASN, and it can be updated only by the provider. + Can be a 2-byte or 4-byte ASN. Uses \"asplain\" format. - :return: The customer_bgp_asn of this UpdateVirtualCircuitDetails. + + :return: The customer_asn of this UpdateVirtualCircuitDetails. :rtype: int """ - return self._customer_bgp_asn + return self._customer_asn - @customer_bgp_asn.setter - def customer_bgp_asn(self, customer_bgp_asn): + @customer_asn.setter + def customer_asn(self, customer_asn): """ - Sets the customer_bgp_asn of this UpdateVirtualCircuitDetails. + Sets the customer_asn of this UpdateVirtualCircuitDetails. The BGP ASN of the network at the other end of the BGP session from Oracle. @@ -204,11 +239,13 @@ def customer_bgp_asn(self, customer_bgp_asn): required value is the provider's ASN, and it can be updated only by the provider. + Can be a 2-byte or 4-byte ASN. Uses \"asplain\" format. - :param customer_bgp_asn: The customer_bgp_asn of this UpdateVirtualCircuitDetails. + + :param customer_asn: The customer_asn of this UpdateVirtualCircuitDetails. :type: int """ - self._customer_bgp_asn = customer_bgp_asn + self._customer_asn = customer_asn @property def defined_tags(self): diff --git a/src/oci/core/models/virtual_circuit.py b/src/oci/core/models/virtual_circuit.py index a98f5bad97..3b0c879b57 100644 --- a/src/oci/core/models/virtual_circuit.py +++ b/src/oci/core/models/virtual_circuit.py @@ -149,6 +149,10 @@ def __init__(self, **kwargs): The value to assign to the customer_bgp_asn property of this VirtualCircuit. :type customer_bgp_asn: int + :param customer_asn: + The value to assign to the customer_asn property of this VirtualCircuit. + :type customer_asn: int + :param defined_tags: The value to assign to the defined_tags property of this VirtualCircuit. :type defined_tags: dict(str, dict(str, object)) @@ -237,6 +241,7 @@ def __init__(self, **kwargs): 'compartment_id': 'str', 'cross_connect_mappings': 'list[CrossConnectMapping]', 'customer_bgp_asn': 'int', + 'customer_asn': 'int', 'defined_tags': 'dict(str, dict(str, object))', 'display_name': 'str', 'freeform_tags': 'dict(str, str)', @@ -264,6 +269,7 @@ def __init__(self, **kwargs): 'compartment_id': 'compartmentId', 'cross_connect_mappings': 'crossConnectMappings', 'customer_bgp_asn': 'customerBgpAsn', + 'customer_asn': 'customerAsn', 'defined_tags': 'definedTags', 'display_name': 'displayName', 'freeform_tags': 'freeformTags', @@ -290,6 +296,7 @@ def __init__(self, **kwargs): self._compartment_id = None self._cross_connect_mappings = None self._customer_bgp_asn = None + self._customer_asn = None self._defined_tags = None self._display_name = None self._freeform_tags = None @@ -459,11 +466,8 @@ def cross_connect_mappings(self, cross_connect_mappings): def customer_bgp_asn(self): """ Gets the customer_bgp_asn of this VirtualCircuit. - The BGP ASN of the network at the other end of the BGP - session from Oracle. If the session is between the customer's - edge router and Oracle, the value is the customer's ASN. If the BGP - session is between the provider's edge router and Oracle, the value - is the provider's ASN. + Deprecated. Instead use `customerAsn`. + If you specify values for both, the request will be rejected. :return: The customer_bgp_asn of this VirtualCircuit. @@ -475,17 +479,48 @@ def customer_bgp_asn(self): def customer_bgp_asn(self, customer_bgp_asn): """ Sets the customer_bgp_asn of this VirtualCircuit. + Deprecated. Instead use `customerAsn`. + If you specify values for both, the request will be rejected. + + + :param customer_bgp_asn: The customer_bgp_asn of this VirtualCircuit. + :type: int + """ + self._customer_bgp_asn = customer_bgp_asn + + @property + def customer_asn(self): + """ + Gets the customer_asn of this VirtualCircuit. The BGP ASN of the network at the other end of the BGP session from Oracle. If the session is between the customer's edge router and Oracle, the value is the customer's ASN. If the BGP session is between the provider's edge router and Oracle, the value is the provider's ASN. + Can be a 2-byte or 4-byte ASN. Uses \"asplain\" format. - :param customer_bgp_asn: The customer_bgp_asn of this VirtualCircuit. + :return: The customer_asn of this VirtualCircuit. + :rtype: int + """ + return self._customer_asn + + @customer_asn.setter + def customer_asn(self, customer_asn): + """ + Sets the customer_asn of this VirtualCircuit. + The BGP ASN of the network at the other end of the BGP + session from Oracle. If the session is between the customer's + edge router and Oracle, the value is the customer's ASN. If the BGP + session is between the provider's edge router and Oracle, the value + is the provider's ASN. + Can be a 2-byte or 4-byte ASN. Uses \"asplain\" format. + + + :param customer_asn: The customer_asn of this VirtualCircuit. :type: int """ - self._customer_bgp_asn = customer_bgp_asn + self._customer_asn = customer_asn @property def defined_tags(self): diff --git a/src/oci/core/models/volume_group.py b/src/oci/core/models/volume_group.py index 3823dc9d51..b58b6da44f 100644 --- a/src/oci/core/models/volume_group.py +++ b/src/oci/core/models/volume_group.py @@ -311,7 +311,7 @@ def id(self, id): @property def lifecycle_state(self): """ - Gets the lifecycle_state of this VolumeGroup. + **[Required]** Gets the lifecycle_state of this VolumeGroup. The current state of a volume group. Allowed values for this property are: "PROVISIONING", "AVAILABLE", "TERMINATING", "TERMINATED", "FAULTY", 'UNKNOWN_ENUM_VALUE'. diff --git a/src/oci/database/models/autonomous_database.py b/src/oci/database/models/autonomous_database.py index a536832969..6333676578 100644 --- a/src/oci/database/models/autonomous_database.py +++ b/src/oci/database/models/autonomous_database.py @@ -986,7 +986,9 @@ def whitelisted_ips(self): """ Gets the whitelisted_ips of this AutonomousDatabase. The client IP access control list (ACL). This feature is available for `serverless deployments`__ only. - Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet. + Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet or VCN OCID. + To add the whitelist VCN specific subnet or IP, use a semicoln ';' as a deliminator to add the VCN specific subnets or IPs. + Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.1.1\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.0.0/16\"]` __ https://docs.cloud.oracle.com/Content/Database/Concepts/adboverview.htm#AEI @@ -1001,7 +1003,9 @@ def whitelisted_ips(self, whitelisted_ips): """ Sets the whitelisted_ips of this AutonomousDatabase. The client IP access control list (ACL). This feature is available for `serverless deployments`__ only. - Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet. + Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet or VCN OCID. + To add the whitelist VCN specific subnet or IP, use a semicoln ';' as a deliminator to add the VCN specific subnets or IPs. + Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.1.1\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.0.0/16\"]` __ https://docs.cloud.oracle.com/Content/Database/Concepts/adboverview.htm#AEI diff --git a/src/oci/database/models/autonomous_database_summary.py b/src/oci/database/models/autonomous_database_summary.py index 1ca91497c7..e46af8166a 100644 --- a/src/oci/database/models/autonomous_database_summary.py +++ b/src/oci/database/models/autonomous_database_summary.py @@ -988,7 +988,9 @@ def whitelisted_ips(self): """ Gets the whitelisted_ips of this AutonomousDatabaseSummary. The client IP access control list (ACL). This feature is available for `serverless deployments`__ only. - Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet. + Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet or VCN OCID. + To add the whitelist VCN specific subnet or IP, use a semicoln ';' as a deliminator to add the VCN specific subnets or IPs. + Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.1.1\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.0.0/16\"]` __ https://docs.cloud.oracle.com/Content/Database/Concepts/adboverview.htm#AEI @@ -1003,7 +1005,9 @@ def whitelisted_ips(self, whitelisted_ips): """ Sets the whitelisted_ips of this AutonomousDatabaseSummary. The client IP access control list (ACL). This feature is available for `serverless deployments`__ only. - Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet. + Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet or VCN OCID. + To add the whitelist VCN specific subnet or IP, use a semicoln ';' as a deliminator to add the VCN specific subnets or IPs. + Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.1.1\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.0.0/16\"]` __ https://docs.cloud.oracle.com/Content/Database/Concepts/adboverview.htm#AEI diff --git a/src/oci/database/models/create_autonomous_database_base.py b/src/oci/database/models/create_autonomous_database_base.py index d64d812632..41668b27d0 100644 --- a/src/oci/database/models/create_autonomous_database_base.py +++ b/src/oci/database/models/create_autonomous_database_base.py @@ -102,6 +102,10 @@ def __init__(self, **kwargs): The value to assign to the autonomous_container_database_id property of this CreateAutonomousDatabaseBase. :type autonomous_container_database_id: str + :param whitelisted_ips: + The value to assign to the whitelisted_ips property of this CreateAutonomousDatabaseBase. + :type whitelisted_ips: list[str] + :param freeform_tags: The value to assign to the freeform_tags property of this CreateAutonomousDatabaseBase. :type freeform_tags: dict(str, str) @@ -130,6 +134,7 @@ def __init__(self, **kwargs): 'is_auto_scaling_enabled': 'bool', 'is_dedicated': 'bool', 'autonomous_container_database_id': 'str', + 'whitelisted_ips': 'list[str]', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))', 'source': 'str' @@ -149,6 +154,7 @@ def __init__(self, **kwargs): 'is_auto_scaling_enabled': 'isAutoScalingEnabled', 'is_dedicated': 'isDedicated', 'autonomous_container_database_id': 'autonomousContainerDatabaseId', + 'whitelisted_ips': 'whitelistedIps', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags', 'source': 'source' @@ -167,6 +173,7 @@ def __init__(self, **kwargs): self._is_auto_scaling_enabled = None self._is_dedicated = None self._autonomous_container_database_id = None + self._whitelisted_ips = None self._freeform_tags = None self._defined_tags = None self._source = None @@ -539,6 +546,40 @@ def autonomous_container_database_id(self, autonomous_container_database_id): """ self._autonomous_container_database_id = autonomous_container_database_id + @property + def whitelisted_ips(self): + """ + Gets the whitelisted_ips of this CreateAutonomousDatabaseBase. + The client IP access control list (ACL). This feature is available for `serverless deployments`__ only. + Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet or VCN OCID. + To add the whitelist VCN specific subnet or IP, use a semicoln ';' as a deliminator to add the VCN specific subnets or IPs. + Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.1.1\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.0.0/16\"]` + + __ https://docs.cloud.oracle.com/Content/Database/Concepts/adboverview.htm#AEI + + + :return: The whitelisted_ips of this CreateAutonomousDatabaseBase. + :rtype: list[str] + """ + return self._whitelisted_ips + + @whitelisted_ips.setter + def whitelisted_ips(self, whitelisted_ips): + """ + Sets the whitelisted_ips of this CreateAutonomousDatabaseBase. + The client IP access control list (ACL). This feature is available for `serverless deployments`__ only. + Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet or VCN OCID. + To add the whitelist VCN specific subnet or IP, use a semicoln ';' as a deliminator to add the VCN specific subnets or IPs. + Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.1.1\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.0.0/16\"]` + + __ https://docs.cloud.oracle.com/Content/Database/Concepts/adboverview.htm#AEI + + + :param whitelisted_ips: The whitelisted_ips of this CreateAutonomousDatabaseBase. + :type: list[str] + """ + self._whitelisted_ips = whitelisted_ips + @property def freeform_tags(self): """ 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 b7b7955737..679c14bd54 100644 --- a/src/oci/database/models/create_autonomous_database_clone_details.py +++ b/src/oci/database/models/create_autonomous_database_clone_details.py @@ -80,6 +80,10 @@ def __init__(self, **kwargs): The value to assign to the autonomous_container_database_id property of this CreateAutonomousDatabaseCloneDetails. :type autonomous_container_database_id: str + :param whitelisted_ips: + The value to assign to the whitelisted_ips property of this CreateAutonomousDatabaseCloneDetails. + :type whitelisted_ips: list[str] + :param freeform_tags: The value to assign to the freeform_tags property of this CreateAutonomousDatabaseCloneDetails. :type freeform_tags: dict(str, str) @@ -117,6 +121,7 @@ def __init__(self, **kwargs): 'is_auto_scaling_enabled': 'bool', 'is_dedicated': 'bool', 'autonomous_container_database_id': 'str', + 'whitelisted_ips': 'list[str]', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))', 'source': 'str', @@ -138,6 +143,7 @@ def __init__(self, **kwargs): 'is_auto_scaling_enabled': 'isAutoScalingEnabled', 'is_dedicated': 'isDedicated', 'autonomous_container_database_id': 'autonomousContainerDatabaseId', + 'whitelisted_ips': 'whitelistedIps', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags', 'source': 'source', @@ -158,6 +164,7 @@ def __init__(self, **kwargs): self._is_auto_scaling_enabled = None self._is_dedicated = None self._autonomous_container_database_id = None + self._whitelisted_ips = None self._freeform_tags = None self._defined_tags = None self._source = None diff --git a/src/oci/database/models/create_autonomous_database_details.py b/src/oci/database/models/create_autonomous_database_details.py index e78ac036d6..babda2532d 100644 --- a/src/oci/database/models/create_autonomous_database_details.py +++ b/src/oci/database/models/create_autonomous_database_details.py @@ -72,6 +72,10 @@ def __init__(self, **kwargs): The value to assign to the autonomous_container_database_id property of this CreateAutonomousDatabaseDetails. :type autonomous_container_database_id: str + :param whitelisted_ips: + The value to assign to the whitelisted_ips property of this CreateAutonomousDatabaseDetails. + :type whitelisted_ips: list[str] + :param freeform_tags: The value to assign to the freeform_tags property of this CreateAutonomousDatabaseDetails. :type freeform_tags: dict(str, str) @@ -100,6 +104,7 @@ def __init__(self, **kwargs): 'is_auto_scaling_enabled': 'bool', 'is_dedicated': 'bool', 'autonomous_container_database_id': 'str', + 'whitelisted_ips': 'list[str]', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))', 'source': 'str' @@ -119,6 +124,7 @@ def __init__(self, **kwargs): 'is_auto_scaling_enabled': 'isAutoScalingEnabled', 'is_dedicated': 'isDedicated', 'autonomous_container_database_id': 'autonomousContainerDatabaseId', + 'whitelisted_ips': 'whitelistedIps', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags', 'source': 'source' @@ -137,6 +143,7 @@ def __init__(self, **kwargs): self._is_auto_scaling_enabled = None self._is_dedicated = None self._autonomous_container_database_id = None + self._whitelisted_ips = None self._freeform_tags = None self._defined_tags = None self._source = None diff --git a/src/oci/database/models/update_autonomous_database_details.py b/src/oci/database/models/update_autonomous_database_details.py index 03edf1117e..dfbfb74848 100644 --- a/src/oci/database/models/update_autonomous_database_details.py +++ b/src/oci/database/models/update_autonomous_database_details.py @@ -366,7 +366,9 @@ def whitelisted_ips(self): """ Gets the whitelisted_ips of this UpdateAutonomousDatabaseDetails. The client IP access control list (ACL). This feature is available for `serverless deployments`__ only. - Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet. To delete all the existing white listed IP\u2019s, use an array with a single empty string entry. + Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet or VCN OCID. To delete all the existing white listed IP\u2019s, use an array with a single empty string entry. + To add the whitelist VCN specific subnet or IP, use a semicoln ';' as a deliminator to add the VCN specific subnets or IPs. + Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.1.1\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw\"]` __ https://docs.cloud.oracle.com/Content/Database/Concepts/adboverview.htm#AEI @@ -381,7 +383,9 @@ def whitelisted_ips(self, whitelisted_ips): """ Sets the whitelisted_ips of this UpdateAutonomousDatabaseDetails. The client IP access control list (ACL). This feature is available for `serverless deployments`__ only. - Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet. To delete all the existing white listed IP\u2019s, use an array with a single empty string entry. + Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet or VCN OCID. To delete all the existing white listed IP\u2019s, use an array with a single empty string entry. + To add the whitelist VCN specific subnet or IP, use a semicoln ';' as a deliminator to add the VCN specific subnets or IPs. + Example: `[\"1.1.1.1\",\"1.1.1.0/24\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw;1.1.1.1\",\"ocid1.vcn.oc1.sea.aaaaaaaard2hfx2nn3e5xeo6j6o62jga44xjizkw\"]` __ https://docs.cloud.oracle.com/Content/Database/Concepts/adboverview.htm#AEI diff --git a/src/oci/streaming/stream_client.py b/src/oci/streaming/stream_client.py index e7e74cf3ce..6d165dc3b2 100644 --- a/src/oci/streaming/stream_client.py +++ b/src/oci/streaming/stream_client.py @@ -20,7 +20,7 @@ class StreamClient(object): The API for the Streaming Service. """ - def __init__(self, config, **kwargs): + def __init__(self, config, service_endpoint, **kwargs): """ Creates a new service client @@ -29,10 +29,8 @@ def __init__(self, config, **kwargs): The :py:meth:`~oci.config.from_file` method can be used to load configuration from a file. Alternatively, a ``dict`` can be passed. You can validate_config the dict using :py:meth:`~oci.config.validate_config` - :param str service_endpoint: (optional) - The endpoint of the service to call using this client. For example ``https://iaas.us-ashburn-1.oraclecloud.com``. If this keyword argument is - not provided then it will be derived using the region in the config parameter. You should only provide this keyword argument if you have an explicit - need to specify a service endpoint. + :param str service_endpoint: + The endpoint of the service to call using this client. For example ``https://iaas.us-ashburn-1.oraclecloud.com``. :param timeout: (optional) The connection and read timeouts for the client. The default is that the client never times out. This keyword argument can be provided @@ -70,8 +68,8 @@ def __init__(self, config, **kwargs): ) base_client_init_kwargs = { - 'regional_client': True, - 'service_endpoint': kwargs.get('service_endpoint'), + 'regional_client': False, + 'service_endpoint': service_endpoint, 'timeout': kwargs.get('timeout'), 'base_path': '/20180418', 'service_endpoint_template': 'https://streaming.{region}.oci.{secondLevelDomain}', diff --git a/src/oci/version.py b/src/oci/version.py index 6f91f6b0e3..be2ee8c4bf 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.6.4" +__version__ = "2.6.5"