Merge pull request #311 from oracle/release_2020-12-08

Releasing version 2.25.1
oracle · Dec 8, 2020 · a227e82 · a227e82
2 parents bbda5bd + ada7b71
commit a227e82
Show file tree

Hide file tree

Showing 68 changed files with 2,302 additions and 242 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,18 @@ Change Log
 All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
+====================
+2.25.1 - 2020-12-08
+====================
+
+Added
+-----
+* Support for Integration Service custom endpoint feature
+* Support for metadata field in IdentityProvider Get and List response
+* Support for fine-grained data analysis and improved SQL insights
+* Support for ADB Dedicated - ORDS and SSL cert rotation at AEI
+* Support for Maintenance Schedule feature for Exadata Infrastructure resources for ExaCC
+
 ====================
 2.25.0 - 2020-12-01
 ====================

diff --git a/docs/api/integration.rst b/docs/api/integration.rst
@@ -19,9 +19,12 @@ Integration
     :template: autosummary/model_class.rst
 
     oci.integration.models.ChangeIntegrationInstanceCompartmentDetails
+    oci.integration.models.CreateCustomEndpointDetails
     oci.integration.models.CreateIntegrationInstanceDetails
+    oci.integration.models.CustomEndpointDetails
     oci.integration.models.IntegrationInstance
     oci.integration.models.IntegrationInstanceSummary
+    oci.integration.models.UpdateCustomEndpointDetails
     oci.integration.models.UpdateIntegrationInstanceDetails
     oci.integration.models.WorkRequest
     oci.integration.models.WorkRequestError

diff --git a/docs/api/integration/models/oci.integration.models.CreateCustomEndpointDetails.rst b/docs/api/integration/models/oci.integration.models.CreateCustomEndpointDetails.rst
@@ -0,0 +1,11 @@
+CreateCustomEndpointDetails
+===========================
+
+.. currentmodule:: oci.integration.models
+
+.. autoclass:: CreateCustomEndpointDetails
+    :show-inheritance:
+    :special-members: __init__
+    :members:
+    :undoc-members:
+    :inherited-members:
diff --git a/docs/api/integration/models/oci.integration.models.CustomEndpointDetails.rst b/docs/api/integration/models/oci.integration.models.CustomEndpointDetails.rst
@@ -0,0 +1,11 @@
+CustomEndpointDetails
+=====================
+
+.. currentmodule:: oci.integration.models
+
+.. autoclass:: CustomEndpointDetails
+    :show-inheritance:
+    :special-members: __init__
+    :members:
+    :undoc-members:
+    :inherited-members:
diff --git a/docs/api/integration/models/oci.integration.models.UpdateCustomEndpointDetails.rst b/docs/api/integration/models/oci.integration.models.UpdateCustomEndpointDetails.rst
@@ -0,0 +1,11 @@
+UpdateCustomEndpointDetails
+===========================
+
+.. currentmodule:: oci.integration.models
+
+.. autoclass:: UpdateCustomEndpointDetails
+    :show-inheritance:
+    :special-members: __init__
+    :members:
+    :undoc-members:
+    :inherited-members:
diff --git a/examples/object_storage/object_storage_bulk_copy.py b/examples/object_storage/object_storage_bulk_copy.py
@@ -2,6 +2,34 @@
 # Copyright (c) 2016, 2020, Oracle and/or its affiliates.  All rights reserved.
 # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
 
+##########################################################################
+# object_storage_bulk_copy.py
+#
+# @author: Tim S and Adi Z
+#
+# Supports Python 3
+##########################################################################
+# Info:
+#    Bulk copy object storage bucket to other bucket with parallel threads
+#
+##########################################################################
+# Application Command line parameters
+#
+#   -c config  - Config file section to use (tenancy profile)
+#   -t profile - Profile in config file, DEFAULT as default
+#   -p proxy   - Set Proxy (i.e. www-proxy-server.com:80)
+#   -ip        - Use Instance Principals for Authentication
+#   -dt        - Use Instance Principals with delegation token for cloud shell
+#   -sb source_bucket
+#   -sr source_region
+#   -sn source_namespace
+#   -sp source_prefix_include
+#   -se source_prefix_exclude
+#   -db destination_bucket
+#   -dr destination_region
+#   -ig ignore_check_exist
+##########################################################################
+
 import pickle
 import threading
 import time

diff --git a/examples/object_storage/object_storage_bulk_delete.py b/examples/object_storage/object_storage_bulk_delete.py
@@ -2,6 +2,29 @@
 # Copyright (c) 2016, 2020, Oracle and/or its affiliates.  All rights reserved.
 # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
 
+##########################################################################
+# object_storage_bulk_delete.py
+#
+# @author: Adi Zohar
+#
+# Supports Python 3
+##########################################################################
+# Info:
+#    Bulk delete with parallel threads
+#
+##########################################################################
+# Application Command line parameters
+#
+#   -c config  - Config file section to use (tenancy profile)
+#   -t profile - Profile in config file, DEFAULT as default
+#   -p proxy   - Set Proxy (i.e. www-proxy-server.com:80)
+#   -ip        - Use Instance Principals for Authentication
+#   -dt        - Use Instance Principals with delegation token for cloud shell
+#   -sb source_bucket
+#   -sp source_prefix
+#   -sr source_region
+##########################################################################
+
 import threading
 import time
 import queue

diff --git a/examples/object_storage/object_storage_bulk_restore.py b/examples/object_storage/object_storage_bulk_restore.py
@@ -2,6 +2,29 @@
 # Copyright (c) 2016, 2020, Oracle and/or its affiliates.  All rights reserved.
 # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
 
+##########################################################################
+# object_storage_bulk_restore.py
+#
+# @author: Tim S and Adi Z
+#
+# Supports Python 3
+##########################################################################
+# Info:
+#    Bulk restore with parallel threads
+#
+##########################################################################
+# Application Command line parameters
+#
+#   -c config  - Config file section to use (tenancy profile)
+#   -t profile - Profile in config file, DEFAULT as default
+#   -p proxy   - Set Proxy (i.e. www-proxy-server.com:80)
+#   -ip        - Use Instance Principals for Authentication
+#   -dt        - Use Instance Principals with delegation token for cloud shell
+#   -sb source_bucket
+#   -sp source_prefix_include
+#   -sr source_region
+##########################################################################
+
 import threading
 import time
 import queue

diff --git a/examples/object_storage/object_storage_list_objects.py b/examples/object_storage/object_storage_list_objects.py
@@ -2,6 +2,31 @@
 # Copyright (c) 2016, 2020, Oracle and/or its affiliates.  All rights reserved.
 # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
 
+##########################################################################
+# object_storage_list_objects.py
+#
+# @author: Adi Zohar, Oct 18th 2020
+#
+# Supports Python 3
+##########################################################################
+# Info:
+# count objects or list objects with option to filter by prefix and write to file
+#
+##########################################################################
+# Application Command line parameters
+#
+#   -c config  - Config file section to use (tenancy profile)
+#   -t profile - Profile in config file, DEFAULT as default
+#   -p proxy   - Set Proxy (i.e. www-proxy-server.com:80)
+#   -ip        - Use Instance Principals for Authentication
+#   -dt        - Use Instance Principals with delegation token for cloud shell
+#   -co        - count only
+#   -f         - write to file
+#   -sb source_bucket
+#   -sp source_prefix_include
+#   -se source_prefix_exclude
+#   -sr source_region
+##########################################################################
 import oci
 import argparse
 import datetime

diff --git a/examples/showoci/CHANGELOG.rst b/examples/showoci/CHANGELOG.rst
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
 
+=====================
+20.12.08 - 20.12.08
+=====================
+* Added retry policy to all pagination calls
+* Added job id for resource manager
+* Added Exadata Infrastructure and VM Clusters
+
 =====================
 20.11.24 - 20.11.24
 =====================

diff --git a/examples/showoci/showoci.py b/examples/showoci/showoci.py
@@ -91,7 +91,7 @@
 import argparse
 import datetime
 
-version = "20.11.24"
+version = "20.12.08"
 
 ##########################################################################
 # check OCI version

diff --git a/examples/showoci/showoci_data.py b/examples/showoci/showoci_data.py
@@ -1859,16 +1859,106 @@ def __get_database_db_dataguard(self, dataguards):
             return data
 
     ##########################################################################
-    # Database
+    # Exadata Infra
     ##########################################################################
-    #
-    # class oci.database.DatabaseClient(config, **kwargs)
-    #
-    # Below APIs not done:
-    # list_db_home_patch_history_entries
-    # list_db_system_patch_history_entries
-    # list_data_guard_associations
-    #
+    def __get_database_db_exadata(self, region_name, compartment):
+
+        data = []
+        try:
+            list_exas = self.service.search_multi_items(self.service.C_DATABASE, self.service.C_DATABASE_EXADATA, 'region_name', region_name, 'compartment_id', compartment['id'])
+
+            for dbs in list_exas:
+                value = {
+                    'id': dbs['id'],
+                    'display_name': dbs['display_name'],
+                    'shape': dbs['shape'],
+                    'shape_ocpu': dbs['shape_ocpu'],
+                    'shape_memory_gb': dbs['shape_memory_gb'],
+                    'shape_storage_tb': dbs['shape_storage_tb'],
+                    'version': dbs['version'],
+                    'lifecycle_state': dbs['lifecycle_state'],
+                    'lifecycle_details': dbs['lifecycle_details'],
+                    'availability_domain': dbs['availability_domain'],
+                    'compute_count': dbs['compute_count'],
+                    'storage_count': dbs['storage_count'],
+                    'total_storage_size_in_gbs': dbs['total_storage_size_in_gbs'],
+                    'available_storage_size_in_gbs': dbs['available_storage_size_in_gbs'],
+                    'compartment_name': dbs['compartment_name'],
+                    'compartment_id': dbs['compartment_id'],
+                    'time_created': dbs['time_created'],
+                    'last_maintenance_run': dbs['last_maintenance_run'],
+                    'next_maintenance_run': dbs['next_maintenance_run'],
+                    'maintenance_window': dbs['maintenance_window'],
+                    'defined_tags': dbs['defined_tags'],
+                    'freeform_tags': dbs['freeform_tags'],
+                    'region_name': dbs['region_name'],
+                    'name': dbs['display_name'] + " - " + dbs['shape'] + " - " + dbs['lifecycle_state'],
+                    'sum_info': 'Database XP - ' + dbs['shape'],
+                    'sum_info_storage': 'Database - Storage (GB)',
+                    'sum_size_gb': dbs['total_storage_size_in_gbs'],
+                    'data': str(dbs['available_storage_size_in_gbs']) + "GB",
+                    'vm_clusters': []
+                }
+
+                for vm in dbs['vm_clusters']:
+                    valvm = {
+                        'id': vm['id'],
+                        'cluster_name': vm['cluster_name'],
+                        'hostname': vm['hostname'],
+                        'compartment_id': vm['compartment_id'],
+                        'availability_domain': vm['availability_domain'],
+                        'data_subnet_id': vm['data_subnet_id'],
+                        'data_subnet': vm['data_subnet'],
+                        'backup_subnet_id': vm['backup_subnet_id'],
+                        'backup_subnet': vm['backup_subnet'],
+                        'nsg_ids': vm['nsg_ids'],
+                        'backup_network_nsg_ids': vm['backup_network_nsg_ids'],
+                        'last_update_history_entry_id': vm['last_update_history_entry_id'],
+                        'shape': vm['shape'],
+                        'listener_port': vm['listener_port'],
+                        'lifecycle_state': vm['lifecycle_state'],
+                        'node_count': vm['node_count'],
+                        'storage_size_in_gbs': vm['storage_size_in_gbs'],
+                        'display_name': vm['display_name'],
+                        'time_created': vm['time_created'],
+                        'lifecycle_details': vm['lifecycle_details'],
+                        'time_zone': vm['time_zone'],
+                        'domain': vm['domain'],
+                        'cpu_core_count': vm['cpu_core_count'],
+                        'data_storage_percentage': vm['data_storage_percentage'],
+                        'is_local_backup_enabled': vm['is_local_backup_enabled'],
+                        'is_sparse_diskgroup_enabled': vm['is_sparse_diskgroup_enabled'],
+                        'gi_version': vm['gi_version'],
+                        'system_version': vm['system_version'],
+                        'ssh_public_keys': vm['ssh_public_keys'],
+                        'license_model': vm['license_model'],
+                        'disk_redundancy': vm['disk_redundancy'],
+                        'scan_ip_ids': vm['scan_ip_ids'],
+                        'scan_ips': vm['scan_ips'],
+                        'vip_ids': vm['vip_ids'],
+                        'vip_ips': vm['vip_ips'],
+                        'scan_dns_record_id': vm['scan_dns_record_id'],
+                        'defined_tags': vm['defined_tags'],
+                        'freeform_tags': vm['freeform_tags'],
+                        'region_name': vm['region_name'],
+                        'sum_info': 'Database XP - ' + dbs['shape'],
+                        'sum_info_storage': 'Database - Storage (GB)',
+                        'sum_size_gb': vm['storage_size_in_gbs'],
+                        'patches': self.__get_database_db_patches(vm['patches']),
+                        'db_homes': self.__get_database_db_homes(vm['db_homes']),
+                        'db_nodes': self.__get_database_db_nodes(vm['db_nodes'])
+                    }
+                    value['vm_clusters'].append(valvm)
+
+                data.append(value)
+            return data
+
+        except Exception as e:
+            self.__print_error("__get_database_db_exadata", e)
+            return data
+
+    ##########################################################################
+    # Database Systems
     ##########################################################################
     def __get_database_db_systems(self, region_name, compartment):
 
@@ -2086,6 +2176,11 @@ def __get_database_main(self, region_name, compartment):
                 if len(data) > 0:
                     return_data['db_system'] = data
 
+            data = self.__get_database_db_exadata(region_name, compartment)
+            if data:
+                if len(data) > 0:
+                    return_data['exadata_infrustructure'] = data
+
             data = self.__get_database_autonomous_databases(region_name, compartment)
             if data:
                 if len(data) > 0:
@@ -2422,25 +2517,14 @@ def __get_resource_management_main(self, region_name, compartment):
                            'stack_name': str(stack['display_name']) + " - " + str(stack['description']),
                            'display_name': stack['display_name'],
                            'description': stack['description'],
+                           'jobs': stack['jobs'],
                            'compartment_id': stack['compartment_id'],
                            'compartment_name': stack['compartment_name'],
                            'region_name': stack['region_name'],
                            'time_created': stack['time_created'],
                            'defined_tags': stack['defined_tags'],
                            'freeform_tags': stack['freeform_tags']}
 
-                # query jobs
-                datajob = []
-                for job in stack['jobs']:
-                    datajob.append(
-                        str(job['display_name']) + " - " +
-                        str(job['operation']).ljust(10) + " - " +
-                        str(job['lifecycle_state']).ljust(10) + " - " +
-                        str(job['time_finished'])[0:16]
-                    )
-
-                # add the jobs to the array
-                dataval['jobs'] = datajob
                 data.append(dataval)
 
             return data