Releasing version 2.15.0

Releasing version 2.15.0

CHANGELOG.rst

@@ -3,6 +3,27 @@ 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.15.0 - 2020-06-02
+====================
+
+Added
+-----
+* Support for optionally supplying a signature when deleting an agreement in the Marketplace service
+* Support for launching paid listings in non-US regions in the Marketplace service
+* Support for returning the image id of packages in the Marketplace service
+* Support for calling Oracle Cloud Infrastructure services in the ap-chuncheon-1 region
+* Support for authenticating via Resource Principals. An example of how to use resource principals is available on `GitHub <https://github.com/oracle/oci-python-sdk/blob/master/examples/resource_principals_example.py>`__
+
+Fixed
+-----
+* Fixed a bug where `oci.waiter.wait_until()` was not invoking `wait_callback` correctly based on the resource property
+* Fixed a bug in `ExponentialBackoffWithFullJitterRetryStrategy.do_sleep()` where it was assuming time in milliseconds but it should be seconds
+
+Breaking
+--------
+* Field `signature` in `delete_accepted_agreement_id` from Marketplace Service changed from required to optional
+
 ====================
 2.14.3 - 2020-05-19
 ====================

NOTICE.txt

@@ -0,0 +1 @@
+Copyright (c) 2016, 2020, Oracle and/or its affiliates.

examples/showoci/CHANGELOG.rst

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
 
+=====================
+20.06.02 - 2020-06-02
+=====================
+* Added image to the summary if it is custom image (from the marketplace)
+* Added step by step installation guide
+
 =====================
 20.05.18 - 2020-05-18
 =====================

examples/showoci/showoci_data.py

@@ -1373,9 +1373,19 @@ def __get_core_compute_instances(self, region_name, compartment):
             instances = self.service.search_multi_items(self.service.C_COMPUTE, self.service.C_COMPUTE_INST, 'region_name', region_name, 'compartment_id', compartment['id'])
 
             for instance in instances:
+
+                # fix the shape image for the summary
+                sum_shape = ""
+                if instance['image'] == "Not Found" or instance['image'] == "Custom" or instance['image_os'] == "Oracle Linux":
+                    sum_shape = instance['image_os'][0:35]
+                elif 'Windows-Server' in instance['image']:
+                    sum_shape = instance['image'][0:19]
+                else:
+                    sum_shape = instance['image'][0:35]
+
                 inst = {'id': instance['id'], 'name': instance['shape'] + " - " + instance['display_name'] + " - " + instance['lifecycle_state'],
                         'sum_info': 'Compute',
-                        'sum_shape': instance['image_os'][0:14] + " - " + instance['shape'],
+                        'sum_shape': instance['shape'].ljust(16, ' ')[0:15] + " - " + sum_shape,
                         'availability_domain': instance['availability_domain'],
                         'fault_domain': instance['fault_domain'],
                         'time_maintenance_reboot_due': str(instance['time_maintenance_reboot_due']),

examples/showoci/showoci_output.py

@@ -1484,7 +1484,7 @@ def __print_core_compute_instances(self, instances):
                         print(self.tabs2 + "MRB  : Maintenance Reboot Due " + instance['time_maintenance_reboot_due'])
 
                 if 'image' in instance:
-                    print(self.tabs2 + "Img  : " + instance['image'])
+                    print(self.tabs2 + "Img  : " + instance['image'] + " (" + instance['image_os'] + ")")
 
                 if 'boot_volume' in instance:
                     for bv in instance['boot_volume']:

examples/showoci/step_by_step_installation.md

@@ -0,0 +1,100 @@
+# showoci - Oracle Cloud Infrastructure Reporting Tool
+
+## Step by Step installation Guide on OCI VM
+SHOWOCI is a reporting tool which uses the Python SDK to extract list of resources from your tenant. 
+It covers most of OCI components, 
+Authentication by User or Compute using instance principals, 
+Output can be printer friendly, CSV files or JSON file.
+
+**Developed by Adi Zohar**
+
+** DISCLAIMER – This is not an official Oracle application **
+
+## 1. Deploy VM Compute instance to run the python script
+```
+   OCI -> Menu -> Compute -> Instances
+   Create Instance
+   --> Name = ShowOCIVM
+   --> Image = Oracle Linux 7
+   --> Shape = VM.Standard2.1 (Free Micro can be used as well)
+   --> Choose your network VCN and Subnet (any type of VCN and Subnet)
+   --> Assign public IP -  Optional if on public subnet
+   --> Add your public SSH key
+   --> Press Create
+```
+![](img/Image_01.png)
+
+![](img/Image_02.png)
+
+![](img/Image_03.png)
+
+```
+   Copy Instance Info:
+   --> Compute OCID to be used for Dynamic Group Permission
+   --> Compute IP
+```
+
+## 2. Create Dynamic Group for Instance Principles
+
+```
+   OCI -> Menu -> Identity -> Dynamic Groups -> Create Dynamic Group
+   --> Name = ShowOCIDynamicGroup 
+   --> Desc = Dynamic Group for the showoci VM
+   --> Rule 1 = ANY { instance.id = 'OCID_Of_Step_1_Instance' }
+```
+![](img/Image_04.png)
+
+## 3. Create Policy to allow the Dynamic Group to run showoci report
+
+```
+   OCI -> Menu -> Identity -> Policies
+   Choose Root Compartment
+   Create Policy
+   --> Name = showociPolicy
+   --> Desc = Allow Dynamic Group ShowOCIDynamicGroup to extract tenant information using showoci
+   --> Statement = allow dynamic-group ShowOCIDynamicGroup to read all-resources in tenancy
+   
+```
+
+![](img/Image_05.png)
+
+## 4. Login to Linux Machine
+
+```
+   Using the SSH key you provided, SSH to the linux machine from step #1
+   ssh opc@UsageVM
+```
+
+## 5. Install Python 3, GIT and OCI packages
+
+```
+   sudo yum install -y python3 git
+   sudo pip3 install --upgrade oci oci-cli 
+
+   # test instance principle is working using oci-cli
+   oci os ns get --auth instance_principal
+   
+   [opc@ShowOCIVM ~]$ oci os ns get --auth instance_principal
+   {
+       "data": "orasenatdplxxxx"
+   }
+```
+
+## 6. Clone the OCI SDK Repo from Git Hub
+
+```
+   git clone https://github.com/oracle/oci-python-sdk
+```
+
+## 7. Execute the python script - showoci.py
+
+```
+    cd oci-python-sdk/examples/showoci
+    python3 showoci.py -ip -ani
+```
+
+## License
+
+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.

examples/usage_reports_to_adw/CHANGELOG.rst

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
 
+=====================
+20.06.02 - 2020-06-02
+=====================
+* Added Summary cost per day to the Data Statistics - if you manage many tenants, it is a great view to see them all
+* Added Cost by SKU to the Cost Over Time - Daily/Weekly and Monthly
+
 =====================
 20.05.18 - 2020-05-18
 =====================