Skip to content

Commit

Permalink
Merge pull request #80 from oracle/release_2018-08-23
Browse files Browse the repository at this point in the history
Releasing version 2.4.31
  • Loading branch information
viralmodi authored Aug 23, 2018
2 parents 500e10e + 5996c80 commit 373060d
Show file tree
Hide file tree
Showing 23 changed files with 2,782 additions and 306 deletions.
19 changes: 18 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,24 @@ All notable changes to this project will be documented in this file.

The format is based on `Keep a Changelog <http://keepachangelog.com/>`__.

2.4.31 - 2018-08-23
---------------------
Added
~~~~~~~~
* Support for Autonomous DataWarehouse and Autonomous Transaction Processing features as a part of the Database Service

* (``oci db autonomous-data-warehouse``)
* (``oci db autonomous-data-warehouse-backup``)
* (``oci db autonomous-database``)
* (``oci db autonomous-database-backup``)

* Ability to increase size of boot and block volumes in the Block Storage Service.

* (``oci bv boot-volume update --size-in-gbs``)
* (``oci bv volume update --size-in-gbs``)

* Support for Fault Domains feature in the Identity Service. (``oci iam fault-domain``)

2.4.30 - 2018-08-09
---------------------
Added
Expand All @@ -20,7 +38,6 @@ Fixed
~~~~~~~~
* The minimum python version check in the Windows install script now works properly with the following scenario. Previously version 2.7.13 was not being detected as greater than 2.7.5.


Changed
~~~~~~~~
* Moved all example scripts to separate 'examples' directory under scripts
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Jinja2==2.9.6
jmespath==0.9.3
ndg-httpsclient==0.4.2
mock==2.0.0
oci==2.0.1
oci==2.0.2
packaging==16.8
pluggy==0.4.0
py==1.4.33
Expand Down
114 changes: 114 additions & 0 deletions scripts/examples/database_example.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
#!/bin/bash
# This script provides examples of how to create the following resources in Database Service
# 1 - Autonomous DataWarehouse
# 2 - AutonomousTransaction Processing (Autonomous Database)

# The following variables must be populated at the top of this script:
# * The compartment ID where the Database Service resources will be created

COMPARTMENT_ID=""
DISPLAY_NAME1="displayName"
DISPLAY_NAME2="newDisplayName"
DB_NAME1="cliTest1"
DB_NAME2="cliTest2"
PASSWORD1="DBaaS12345_#"
CPU="1"
SCALED_CPU="2"
SCALED_STORAGE="2"
STORAGE="1"
LICENSE_TYPE="LICENSE_INCLUDED"


##############################################################################AutonomousDataWarehouse##############################################################################

echo 'Starting Autonomous DataWarehouse Examples'

echo 'Create AutonomousDatawarehouse...'
CREATE_ADW=$(oci db autonomous-data-warehouse create -c $COMPARTMENT_ID --db-name $DB_NAME1 --admin-password $PASSWORD1 --cpu-core-count $CPU \
--data-storage-size-in-tbs $STORAGE --display-name $DISPLAY_NAME1 --license-model $LICENSE_TYPE \
--wait-for-state AVAILABLE)

ADW_ID=$(jq -r '.data.id' <<< "$CREATE_ADW")

echo "Created AutonomousDatawarehouse with OCID:"
echo $CREATE_ADW

echo 'Get AutonomousDatawarehouse'
oci db autonomous-data-warehouse get --autonomous-data-warehouse-id $ADW_ID

echo 'List all AutonomousDatawarehouses in compartment'
oci db autonomous-data-warehouse list --compartment-id $COMPARTMENT_ID

echo 'List all AutonomousDatawarehouses in compartment in AVAILABLE state'
oci db autonomous-data-warehouse list --compartment-id $COMPARTMENT_ID --lifecycle-state AVAILABLE

echo 'List 2 AutonomousDatawarehouses in compartment'
oci db autonomous-data-warehouse list --compartment-id $COMPARTMENT_ID --limit 2

echo 'List all AutonomousDatawarehouses in compartment with specific display name, in descending order'
oci db autonomous-data-warehouse list --compartment-id $COMPARTMENT_ID --sort-by $DISPLAY_NAME1 --sort-order DESC

echo 'Update AutonomousDatawarehouse DisplayName'
oci db autonomous-data-warehouse update --autonomous-data-warehouse-id $ADW_ID --display-name $DISPLAY_NAME2
echo 'Updated AutonomousDatawarehouse DisplayName'

echo 'Update AutonomousDatawarehouse cpuCoreCount and storage'
oci db autonomous-data-warehouse update --autonomous-data-warehouse-id $ADW_ID --data-storage-size-in-tbs $SCALED_STORAGE \
--cpu-core-count $SCALED_CPU --wait-for-state AVAILABLE
echo 'Updated AutonomousDatawarehouse cpuCoreCount and storageSize'

echo 'Delete AutonomousDatawarehouse'
oci db autonomous-data-warehouse delete --autonomous-data-warehouse-id $ADW_ID --force --wait-for-state TERMINATED
echo 'Deleted AutonomousDatawarehouse'

echo 'Trying to Get Deleted AutonomousDatawarehouse. Should not find it.'
oci db autonomous-data-warehouse get --autonomous-data-warehouse-id $ADW_ID

echo 'End of AutonomousDatawarehouse Examples.'

##############################################################################Autonomous Transaction Processing##############################################################################

echo 'Starting Autonomous Transaction Processing Examples'

echo 'Create Autonomous Transaction Processing...'
CREATE_ATP=$(oci db autonomous-database create -c $COMPARTMENT_ID --db-name $DB_NAME2 --admin-password $PASSWORD1 --cpu-core-count $CPU \
--data-storage-size-in-tbs $STORAGE --display-name $DISPLAY_NAME1 --license-model $LICENSE_TYPE \
--wait-for-state AVAILABLE)

ADB_ID=$(jq -r '.data.id' <<< "$CREATE_ATP")

echo "Created Autonomous Transaction Processing with OCID:"
echo $CREATE_ATP

echo 'Get Autonomous Transaction Processing'
oci db autonomous-database get --autonomous-database-id $ADB_ID

echo 'List all Autonomous Transaction Processings in compartment'
oci db autonomous-database list --compartment-id $COMPARTMENT_ID

echo 'List all Autonomous Transaction Processings in compartment in AVAILABLE state'
oci db autonomous-database list --compartment-id $COMPARTMENT_ID --lifecycle-state AVAILABLE

echo 'List 2 Autonomous Transaction Processings in compartment'
oci db autonomous-database list --compartment-id $COMPARTMENT_ID --limit 2

echo 'List all Autonomous Transaction Processings in compartment with specific display name, in descending order'
oci db autonomous-database list --compartment-id $COMPARTMENT_ID --sort-by $DISPLAY_NAME1 --sort-order DESC

echo 'Update Autonomous Transaction Processing DisplayName'
oci db autonomous-database update --autonomous-database-id $ADB_ID --display-name $DISPLAY_NAME2
echo 'Updated Autonomous Transaction Processing DisplayName'

echo 'Update Autonomous Transaction Processing cpuCoreCount and storage'
oci db autonomous-database update --autonomous-database-id $ADB_ID --data-storage-size-in-tbs $SCALED_STORAGE \
--cpu-core-count $SCALED_CPU --wait-for-state AVAILABLE
echo 'Updated Autonomous Transaction Processing cpuCoreCount and storageSize'

echo 'Delete Autonomous Transaction Processing'
oci db autonomous-database delete --autonomous-database-id $ADB_ID --force --wait-for-state TERMINATED
echo 'Deleted Autonomous Transaction Processing'

echo 'Trying to Get Deleted Autonomous Transaction Processing. Should not find it.'
oci db autonomous-database get --autonomous-database-id $ADB_ID

echo 'End of Autonomous Transaction Processing Examples.'
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def open_relative(*path):
readme = f.read()

requires = [
'oci==2.0.1',
'oci==2.0.2',
'arrow==0.10.0',
'certifi',
'click==6.7',
Expand Down
59 changes: 55 additions & 4 deletions src/oci_cli/bin/OciTabExpansion.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ $ociSubcommands = @{
'compute shape' = 'list'
'compute vnic-attachment' = 'get list'
'compute volume-attachment' = 'attach detach get list'
'db' = 'backup data-guard-association database node patch patch-history system system-shape version'
'db' = 'autonomous-data-warehouse autonomous-data-warehouse-backup autonomous-database autonomous-database-backup backup data-guard-association database node patch patch-history system system-shape version'
'db autonomous-data-warehouse' = 'create delete get list restore start stop update'
'db autonomous-data-warehouse-backup' = 'create get list'
'db autonomous-database' = 'create delete get list restore start stop update'
'db autonomous-database-backup' = 'create get list'
'db backup' = 'create delete get list'
'db data-guard-association' = 'create failover get list reinstate switchover'
'db data-guard-association create' = 'from-existing-db-system'
Expand Down Expand Up @@ -66,12 +70,13 @@ $ociSubcommands = @{
'fs file-system' = 'create delete get list update'
'fs mount-target' = 'create delete get list update'
'fs snapshot' = 'create delete get list'
'iam' = 'auth-token availability-domain compartment customer-secret-key dynamic-group group policy region region-subscription smtp-credential tag tag-namespace user'
'iam' = 'auth-token availability-domain compartment customer-secret-key dynamic-group fault-domain group policy region region-subscription smtp-credential tag tag-namespace user'
'iam auth-token' = 'create delete list update'
'iam availability-domain' = 'list'
'iam compartment' = 'create get list update'
'iam customer-secret-key' = 'create delete list update'
'iam dynamic-group' = 'create delete get list update'
'iam fault-domain' = 'list'
'iam group' = 'add-user create delete get list list-users remove-user update'
'iam policy' = 'create delete get list update'
'iam region' = 'list'
Expand Down Expand Up @@ -152,7 +157,7 @@ $ociCommandsToLongParams = @{
'bv boot-volume delete' = 'boot-volume-id force from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
'bv boot-volume get' = 'boot-volume-id from-json help'
'bv boot-volume list' = 'all availability-domain compartment-id from-json help limit page page-size volume-group-id'
'bv boot-volume update' = 'boot-volume-id defined-tags display-name force freeform-tags from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
'bv boot-volume update' = 'boot-volume-id defined-tags display-name force freeform-tags from-json help if-match max-wait-seconds size-in-gbs wait-for-state wait-interval-seconds'
'bv boot-volume-backup create' = 'boot-volume-id defined-tags display-name freeform-tags from-json help max-wait-seconds type wait-for-state wait-interval-seconds'
'bv boot-volume-backup delete' = 'boot-volume-backup-id force from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
'bv boot-volume-backup get' = 'boot-volume-backup-id from-json help'
Expand All @@ -162,7 +167,7 @@ $ociCommandsToLongParams = @{
'bv volume delete' = 'force from-json help if-match max-wait-seconds volume-id wait-for-state wait-interval-seconds'
'bv volume get' = 'from-json help volume-id'
'bv volume list' = 'all availability-domain compartment-id display-name from-json help lifecycle-state limit page page-size sort-by sort-order volume-group-id'
'bv volume update' = 'defined-tags display-name force freeform-tags from-json help if-match max-wait-seconds volume-id wait-for-state wait-interval-seconds'
'bv volume update' = 'defined-tags display-name force freeform-tags from-json help if-match max-wait-seconds size-in-gbs volume-id wait-for-state wait-interval-seconds'
'bv volume-backup-policy get' = 'from-json help policy-id'
'bv volume-backup-policy list' = 'all from-json help limit page page-size'
'bv volume-backup-policy-assignment create' = 'asset-id from-json help policy-id'
Expand Down Expand Up @@ -238,6 +243,28 @@ $ociCommandsToLongParams = @{
'compute volume-attachment detach' = 'force from-json help if-match max-wait-seconds volume-attachment-id wait-for-state wait-interval-seconds'
'compute volume-attachment get' = 'from-json help volume-attachment-id'
'compute volume-attachment list' = 'all availability-domain compartment-id from-json help instance-id limit page page-size volume-id'
'db autonomous-data-warehouse create' = 'admin-password compartment-id cpu-core-count data-storage-size-in-tbs db-name defined-tags display-name freeform-tags from-json help license-model max-wait-seconds wait-for-state wait-interval-seconds'
'db autonomous-data-warehouse delete' = 'autonomous-data-warehouse-id force from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
'db autonomous-data-warehouse get' = 'autonomous-data-warehouse-id from-json help'
'db autonomous-data-warehouse list' = 'all compartment-id display-name from-json help lifecycle-state limit page page-size sort-by sort-order'
'db autonomous-data-warehouse restore' = 'autonomous-data-warehouse-id from-json help if-match timestamp'
'db autonomous-data-warehouse start' = 'autonomous-data-warehouse-id from-json help if-match'
'db autonomous-data-warehouse stop' = 'autonomous-data-warehouse-id from-json help if-match'
'db autonomous-data-warehouse update' = 'admin-password autonomous-data-warehouse-id cpu-core-count data-storage-size-in-tbs defined-tags display-name force freeform-tags from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
'db autonomous-data-warehouse-backup create' = 'autonomous-data-warehouse-id display-name from-json help max-wait-seconds wait-for-state wait-interval-seconds'
'db autonomous-data-warehouse-backup get' = 'autonomous-data-warehouse-backup-id from-json help'
'db autonomous-data-warehouse-backup list' = 'all autonomous-data-warehouse-id compartment-id display-name from-json help lifecycle-state limit page page-size sort-by sort-order'
'db autonomous-database create' = 'admin-password compartment-id cpu-core-count data-storage-size-in-tbs db-name defined-tags display-name freeform-tags from-json help license-model max-wait-seconds wait-for-state wait-interval-seconds'
'db autonomous-database delete' = 'autonomous-database-id force from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
'db autonomous-database get' = 'autonomous-database-id from-json help'
'db autonomous-database list' = 'all compartment-id display-name from-json help lifecycle-state limit page page-size sort-by sort-order'
'db autonomous-database restore' = 'autonomous-database-id from-json help if-match timestamp'
'db autonomous-database start' = 'autonomous-database-id from-json help if-match'
'db autonomous-database stop' = 'autonomous-database-id from-json help if-match'
'db autonomous-database update' = 'admin-password autonomous-database-id cpu-core-count data-storage-size-in-tbs defined-tags display-name force freeform-tags from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
'db autonomous-database-backup create' = 'autonomous-database-id display-name from-json help max-wait-seconds wait-for-state wait-interval-seconds'
'db autonomous-database-backup get' = 'autonomous-database-backup-id from-json help'
'db autonomous-database-backup list' = 'all autonomous-database-id compartment-id display-name from-json help lifecycle-state limit page page-size sort-by sort-order'
'db backup create' = 'database-id display-name from-json help max-wait-seconds wait-for-state wait-interval-seconds'
'db backup delete' = 'backup-id force from-json help if-match max-wait-seconds wait-for-state wait-interval-seconds'
'db backup get' = 'backup-id from-json help'
Expand Down Expand Up @@ -343,6 +370,7 @@ $ociCommandsToLongParams = @{
'iam dynamic-group get' = 'dynamic-group-id from-json help'
'iam dynamic-group list' = 'all compartment-id from-json help limit page page-size'
'iam dynamic-group update' = 'description dynamic-group-id from-json help if-match matching-rule max-wait-seconds wait-for-state wait-interval-seconds'
'iam fault-domain list' = 'availability-domain compartment-id from-json help'
'iam group add-user' = 'from-json group-id help user-id'
'iam group create' = 'compartment-id defined-tags description freeform-tags from-json help max-wait-seconds name wait-for-state wait-interval-seconds'
'iam group delete' = 'force from-json group-id help if-match max-wait-seconds wait-for-state wait-interval-seconds'
Expand Down Expand Up @@ -679,6 +707,28 @@ $ociCommandsToShortParams = @{
'compute volume-attachment detach' = '? h'
'compute volume-attachment get' = '? h'
'compute volume-attachment list' = '? c h'
'db autonomous-data-warehouse create' = '? c h'
'db autonomous-data-warehouse delete' = '? h'
'db autonomous-data-warehouse get' = '? h'
'db autonomous-data-warehouse list' = '? c h'
'db autonomous-data-warehouse restore' = '? h'
'db autonomous-data-warehouse start' = '? h'
'db autonomous-data-warehouse stop' = '? h'
'db autonomous-data-warehouse update' = '? h'
'db autonomous-data-warehouse-backup create' = '? h'
'db autonomous-data-warehouse-backup get' = '? h'
'db autonomous-data-warehouse-backup list' = '? c h'
'db autonomous-database create' = '? c h'
'db autonomous-database delete' = '? h'
'db autonomous-database get' = '? h'
'db autonomous-database list' = '? c h'
'db autonomous-database restore' = '? h'
'db autonomous-database start' = '? h'
'db autonomous-database stop' = '? h'
'db autonomous-database update' = '? h'
'db autonomous-database-backup create' = '? h'
'db autonomous-database-backup get' = '? h'
'db autonomous-database-backup list' = '? c h'
'db backup create' = '? h'
'db backup delete' = '? h'
'db backup get' = '? h'
Expand Down Expand Up @@ -784,6 +834,7 @@ $ociCommandsToShortParams = @{
'iam dynamic-group get' = '? h'
'iam dynamic-group list' = '? c h'
'iam dynamic-group update' = '? h'
'iam fault-domain list' = '? c h'
'iam group add-user' = '? h'
'iam group create' = '? c h'
'iam group delete' = '? h'
Expand Down
Loading

0 comments on commit 373060d

Please sign in to comment.