Merge pull request #60 from oracle/release_2018-04-20

Releasing version 2.4.21

Author: vish1

CHANGELOG.rst

@@ -4,8 +4,20 @@ 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/>`__.
+The format is based on `Keep a Changelog <http://keepachangelog.com/>`__.
+
+2.4.21 - 2018-04-19
+---------------------
+Added
+~~~~~~~~
+* Support for the following features for the Database service:
+
+  * Tagging support for the following resources
+
+    * Update database (``oci db database update --defined-tags --freeform-tags``)
+    * Launch and update database system (``oci db system launch|update --defined-tags --freeform-tags``)
+
+  * Filter set of database versions based on database system ID (``oci db version list --db-system-id``)
 
 2.4.20 - 2018-04-05
 ---------------------

requirements.txt

@@ -12,7 +12,7 @@ Jinja2==2.9.6
 jmespath==0.9.3
 ndg-httpsclient==0.4.2
 mock==2.0.0
-oci==1.3.18
+oci==1.3.19
 packaging==16.8
 pluggy==0.4.0
 py==1.4.33
@@ -32,3 +32,4 @@ terminaltables==3.1.0
 tox==2.9.1
 vcrpy==1.11.1
 virtualenv==15.1.0
+pytest-xdist==1.22.2

setup.py

@@ -30,7 +30,7 @@ def open_relative(*path):
 
 
 requires = [
-    'oci==1.3.18',
+    'oci==1.3.19',
     'arrow==0.10.0',
     'certifi',
     'click==6.7',

src/oci_cli/bin/OciTabExpansion.ps1

@@ -194,7 +194,7 @@ $ociCommandsToLongParams = @{
     'db database list' = 'compartment-id db-system-id from-json help limit'
     'db database patch' = 'database-id from-json help patch-action patch-id'
     'db database restore' = 'database-id database-scn from-json help if-match latest timestamp'
-    'db database update' = 'auto-backup-enabled database-id force from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
+    'db database update' = 'auto-backup-enabled database-id defined-tags force freeform-tags from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
     'db node get' = 'db-node-id from-json help'
     'db node list' = 'all compartment-id db-system-id from-json help limit page page-size'
     'db node reset' = 'db-node-id from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
@@ -210,13 +210,13 @@ $ociCommandsToLongParams = @{
     'db patch-history list by-database' = 'all database-id from-json help limit page page-size'
     'db patch-history list by-db-system' = 'all db-system-id from-json help limit page page-size'
     'db system get' = 'db-system-id from-json help'
-    'db system launch' = 'admin-password availability-domain backup-subnet-id character-set cluster-name compartment-id cpu-core-count data-storage-percentage database-edition db-name db-version db-workload disk-redundancy display-name domain from-json help hostname initial-data-storage-size-in-gb license-model max-wait-seconds ncharacter-set node-count pdb-name shape ssh-authorized-keys-file subnet-id wait-for-state wait-interval-seconds'
+    'db system launch' = 'admin-password availability-domain backup-subnet-id character-set cluster-name compartment-id cpu-core-count data-storage-percentage database-edition db-name db-version db-workload defined-tags disk-redundancy display-name domain freeform-tags from-json help hostname initial-data-storage-size-in-gb license-model max-wait-seconds ncharacter-set node-count pdb-name shape ssh-authorized-keys-file subnet-id wait-for-state wait-interval-seconds'
     'db system list' = 'all backup-id compartment-id from-json help limit page page-size'
     'db system patch' = 'db-system-id from-json help patch-action patch-id'
     'db system terminate' = 'db-system-id force from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
-    'db system update' = 'cpu-core-count data-storage-size-in-gbs db-system-id force from-json help if-match max-wait-seconds patch-action patch-id ssh-authorized-keys-file wait-for-state wait-interval-seconds'
+    'db system update' = 'cpu-core-count data-storage-size-in-gbs db-system-id defined-tags force freeform-tags from-json help if-match max-wait-seconds patch-action patch-id ssh-authorized-keys-file wait-for-state wait-interval-seconds'
     'db system-shape list' = 'all availability-domain compartment-id from-json help limit page page-size'
-    'db version list' = 'all compartment-id db-system-shape from-json help limit page page-size'
+    'db version list' = 'all compartment-id db-system-id db-system-shape from-json help limit page page-size'
     'dns record domain delete' = 'compartment-id domain force from-json help if-match if-unmodified-since zone-name-or-id'
     'dns record domain get' = 'all compartment-id domain from-json help if-modified-since if-none-match limit page page-size rtype sort-by sort-order zone-name-or-id zone-version'
     'dns record domain patch' = 'compartment-id domain from-json help if-match if-unmodified-since items zone-name-or-id'

src/oci_cli/core_cli_extended.py

@@ -589,9 +589,9 @@ def detach_vnic(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_
         if hasattr(compute_client, 'get_vnic_attachment') and callable(getattr(compute_client, 'get_vnic_attachment')):
             try:
                 wait_period_kwargs = {}
-                if max_wait_seconds:
+                if max_wait_seconds is not None:
                     wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
-                if wait_interval_seconds:
+                if wait_interval_seconds is not None:
                     wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
 
                 click.echo('Action completed. Waiting until the resource has entered state: {}'.format(wait_for_state), file=sys.stderr)

src/oci_cli/database_cli_extended.py

@@ -129,7 +129,7 @@ def create_database_from_backup(ctx, **kwargs):
 @database_cli.database_group.command(name='update', help="""Update a Database based on the request parameters you provide.""")
 @cli_util.option('--auto-backup-enabled', type=click.BOOL, help="""If set to true, schedules backups automatically. Default is false.""")
 @click.pass_context
-@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'database', 'class': 'Database'})
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'defined-tags': {'module': 'database', 'class': 'dict(str, dict(str, object))'}, 'freeform-tags': {'module': 'database', 'class': 'dict(str, string)'}}, output_type={'module': 'database', 'class': 'Database'})
 @cli_util.wrap_exceptions
 def update_database_extended(ctx, **kwargs):
     if kwargs['auto_backup_enabled'] is not None:
@@ -292,7 +292,7 @@ def db_node_reset(ctx, **kwargs):
 @cli_util.option('--pdb-name', help="""Pluggable database name. It must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. Pluggable database should not be same as database name.""")
 @cli_util.option('--ssh-authorized-keys-file', type=click.File('r'), help="""A file containing one or more public SSH keys to use for SSH access to the DB System. Use a newline character to separate multiple keys. The length of the combined keys cannot exceed 10,000 characters.""")
 @click.pass_context
-@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'database', 'class': 'DbSystem'})
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'defined-tags': {'module': 'database', 'class': 'dict(str, dict(str, object))'}, 'freeform-tags': {'module': 'database', 'class': 'dict(str, string)'}}, output_type={'module': 'database', 'class': 'DbSystem'})
 @cli_util.wrap_exceptions
 def launch_db_system_extended(ctx, **kwargs):
     create_db_home_details = {}
@@ -345,7 +345,7 @@ def launch_db_system_extended(ctx, **kwargs):
 @cli_util.option('--patch-id', help="""The OCID of the patch.""")
 @cli_util.option('--ssh-authorized-keys-file', type=click.File('r'), help="""A file containing one or more public SSH keys to use for SSH access to the DB System. Use a newline character to separate multiple keys. The length of the combined keys cannot exceed 10,000 characters.""")
 @click.pass_context
-@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'database', 'class': 'DbSystem'})
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'defined-tags': {'module': 'database', 'class': 'dict(str, dict(str, object))'}, 'freeform-tags': {'module': 'database', 'class': 'dict(str, string)'}}, output_type={'module': 'database', 'class': 'DbSystem'})
 @cli_util.wrap_exceptions
 def update_db_system_extended(ctx, **kwargs):
     if 'ssh_authorized_keys_file' in kwargs and kwargs['ssh_authorized_keys_file']:

src/oci_cli/generated/audit_cli.py

@@ -114,9 +114,9 @@ def update_configuration(ctx, from_json, wait_for_state, max_wait_seconds, wait_
         if hasattr(client, 'get_work_request') and callable(getattr(client, 'get_work_request')):
             try:
                 wait_period_kwargs = {}
-                if max_wait_seconds:
+                if max_wait_seconds is not None:
                     wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
-                if wait_interval_seconds:
+                if wait_interval_seconds is not None:
                     wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
 
                 click.echo('Action completed. Waiting until the work request has entered state: {}'.format(wait_for_state), file=sys.stderr)

src/oci_cli/generated/blockstorage_cli.py

@@ -125,9 +125,9 @@ def create_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva
         if hasattr(client, 'get_volume') and callable(getattr(client, 'get_volume')):
             try:
                 wait_period_kwargs = {}
-                if max_wait_seconds:
+                if max_wait_seconds is not None:
                     wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
-                if wait_interval_seconds:
+                if wait_interval_seconds is not None:
                     wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
 
                 click.echo('Action completed. Waiting until the resource has entered state: {}'.format(wait_for_state), file=sys.stderr)
@@ -187,9 +187,9 @@ def create_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_
         if hasattr(client, 'get_volume_backup') and callable(getattr(client, 'get_volume_backup')):
             try:
                 wait_period_kwargs = {}
-                if max_wait_seconds:
+                if max_wait_seconds is not None:
                     wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
-                if wait_interval_seconds:
+                if wait_interval_seconds is not None:
                     wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
 
                 click.echo('Action completed. Waiting until the resource has entered state: {}'.format(wait_for_state), file=sys.stderr)
@@ -253,9 +253,9 @@ def delete_boot_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_in
         if hasattr(client, 'get_boot_volume') and callable(getattr(client, 'get_boot_volume')):
             try:
                 wait_period_kwargs = {}
-                if max_wait_seconds:
+                if max_wait_seconds is not None:
                     wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
-                if wait_interval_seconds:
+                if wait_interval_seconds is not None:
                     wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
 
                 click.echo('Action completed. Waiting until the resource has entered state: {}'.format(wait_for_state), file=sys.stderr)
@@ -308,9 +308,9 @@ def delete_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_interva
         if hasattr(client, 'get_volume') and callable(getattr(client, 'get_volume')):
             try:
                 wait_period_kwargs = {}
-                if max_wait_seconds:
+                if max_wait_seconds is not None:
                     wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
-                if wait_interval_seconds:
+                if wait_interval_seconds is not None:
                     wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
 
                 click.echo('Action completed. Waiting until the resource has entered state: {}'.format(wait_for_state), file=sys.stderr)
@@ -363,9 +363,9 @@ def delete_volume_backup(ctx, from_json, wait_for_state, max_wait_seconds, wait_
         if hasattr(client, 'get_volume_backup') and callable(getattr(client, 'get_volume_backup')):
             try:
                 wait_period_kwargs = {}
-                if max_wait_seconds:
+                if max_wait_seconds is not None:
                     wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
-                if wait_interval_seconds:
+                if wait_interval_seconds is not None:
                     wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
 
                 click.echo('Action completed. Waiting until the resource has entered state: {}'.format(wait_for_state), file=sys.stderr)
@@ -806,9 +806,9 @@ def update_boot_volume(ctx, from_json, wait_for_state, max_wait_seconds, wait_in
         if hasattr(client, 'get_boot_volume') and callable(getattr(client, 'get_boot_volume')):
             try:
                 wait_period_kwargs = {}
-                if max_wait_seconds:
+                if max_wait_seconds is not None:
                     wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
-                if wait_interval_seconds:
+                if wait_interval_seconds is not None:
                     wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
 
                 click.echo('Action completed. Waiting until the resource has entered state: {}'.format(wait_for_state), file=sys.stderr)
@@ -873,9 +873,9 @@ def update_volume(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_
         if hasattr(client, 'get_volume') and callable(getattr(client, 'get_volume')):
             try:
                 wait_period_kwargs = {}
-                if max_wait_seconds:
+                if max_wait_seconds is not None:
                     wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
-                if wait_interval_seconds:
+                if wait_interval_seconds is not None:
                     wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
 
                 click.echo('Action completed. Waiting until the resource has entered state: {}'.format(wait_for_state), file=sys.stderr)
@@ -940,9 +940,9 @@ def update_volume_backup(ctx, from_json, force, wait_for_state, max_wait_seconds
         if hasattr(client, 'get_volume_backup') and callable(getattr(client, 'get_volume_backup')):
             try:
                 wait_period_kwargs = {}
-                if max_wait_seconds:
+                if max_wait_seconds is not None:
                     wait_period_kwargs['max_wait_seconds'] = max_wait_seconds
-                if wait_interval_seconds:
+                if wait_interval_seconds is not None:
                     wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds
 
                 click.echo('Action completed. Waiting until the resource has entered state: {}'.format(wait_for_state), file=sys.stderr)