Skip to content

Commit 7b477dc

Browse files
bhagwatvyasbhagwatvyas
authored
Merge pull request #234 from oracle/release_2020-03-24
Releasing version 2.12.1
2 parents dcf955f + 9accc24 commit 7b477dc

File tree

64 files changed

+2783
-167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2783
-167
lines changed

‎CHANGELOG.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@ Change Log
33
All notable changes to this project will be documented in this file.
44

55
The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
6+
====================
7+
2.12.1 - 2020-03-24
8+
====================
9+
10+
Added
11+
-----
12+
* Support for Web Application Acceleration and Security configurations on instances in the Content and Experience service
13+
* Support for shared database homes on Exadata Cloud at Customer resources in the Database service
14+
* Support for Exadata database creation from backup in the Database service
15+
* Support for conditions on JavaScript challenges, new action types on access rules, new policy configuration settings, exclusions on custom protection rules, and IP address lists on IP whitelists in the Web Application Acceleration and Security service
16+
617
====================
718
2.12.0 - 2020-03-17
819
====================

‎docs/api/database.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ Database
7070
oci.database.models.CreateDataGuardAssociationWithNewDbSystemDetails
7171
oci.database.models.CreateDatabaseBase
7272
oci.database.models.CreateDatabaseDetails
73+
oci.database.models.CreateDatabaseFromBackup
7374
oci.database.models.CreateDatabaseFromBackupDetails
7475
oci.database.models.CreateDbHomeBase
7576
oci.database.models.CreateDbHomeDetails

‎docs/api/database/models/oci.database.models.CreateDatabaseFromBackup.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
CreateDatabaseFromBackup
2+
========================
3+
4+
.. currentmodule:: oci.database.models
5+
6+
.. autoclass:: CreateDatabaseFromBackup
7+
:show-inheritance:
8+
:special-members: __init__
9+
:members:
10+
:undoc-members:
11+
:inherited-members:

‎docs/api/waas.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Waas
2222

2323
oci.waas.models.AccessRule
2424
oci.waas.models.AccessRuleCriteria
25+
oci.waas.models.AddHttpResponseHeaderAction
2526
oci.waas.models.AddressList
2627
oci.waas.models.AddressListSummary
2728
oci.waas.models.AddressRateLimiting
@@ -51,13 +52,18 @@ Waas
5152
oci.waas.models.CustomProtectionRuleSummary
5253
oci.waas.models.DeviceFingerprintChallenge
5354
oci.waas.models.EdgeSubnet
55+
oci.waas.models.ExtendHttpResponseHeaderAction
5456
oci.waas.models.GoodBot
5557
oci.waas.models.Header
58+
oci.waas.models.HeaderManipulationAction
59+
oci.waas.models.HealthCheck
5660
oci.waas.models.HttpRedirect
5761
oci.waas.models.HttpRedirectSummary
5862
oci.waas.models.HttpRedirectTarget
5963
oci.waas.models.HumanInteractionChallenge
64+
oci.waas.models.IPHashLoadBalancingMethod
6065
oci.waas.models.JsChallenge
66+
oci.waas.models.LoadBalancingMethod
6167
oci.waas.models.Origin
6268
oci.waas.models.OriginGroup
6369
oci.waas.models.OriginGroupOrigins
@@ -68,6 +74,9 @@ Waas
6874
oci.waas.models.ProtectionSettings
6975
oci.waas.models.PurgeCache
7076
oci.waas.models.Recommendation
77+
oci.waas.models.RemoveHttpResponseHeaderAction
78+
oci.waas.models.RoundRobinLoadBalancingMethod
79+
oci.waas.models.StickyCookieLoadBalancingMethod
7180
oci.waas.models.ThreatFeed
7281
oci.waas.models.ThreatFeedAction
7382
oci.waas.models.UpdateAddressListDetails

‎docs/api/waas/models/oci.waas.models.AddHttpResponseHeaderAction.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
AddHttpResponseHeaderAction
2+
===========================
3+
4+
.. currentmodule:: oci.waas.models
5+
6+
.. autoclass:: AddHttpResponseHeaderAction
7+
:show-inheritance:
8+
:special-members: __init__
9+
:members:
10+
:undoc-members:
11+
:inherited-members:

‎docs/api/waas/models/oci.waas.models.ExtendHttpResponseHeaderAction.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ExtendHttpResponseHeaderAction
2+
==============================
3+
4+
.. currentmodule:: oci.waas.models
5+
6+
.. autoclass:: ExtendHttpResponseHeaderAction
7+
:show-inheritance:
8+
:special-members: __init__
9+
:members:
10+
:undoc-members:
11+
:inherited-members:

‎docs/api/waas/models/oci.waas.models.HeaderManipulationAction.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
HeaderManipulationAction
2+
========================
3+
4+
.. currentmodule:: oci.waas.models
5+
6+
.. autoclass:: HeaderManipulationAction
7+
:show-inheritance:
8+
:special-members: __init__
9+
:members:
10+
:undoc-members:
11+
:inherited-members:

‎docs/api/waas/models/oci.waas.models.HealthCheck.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
HealthCheck
2+
===========
3+
4+
.. currentmodule:: oci.waas.models
5+
6+
.. autoclass:: HealthCheck
7+
:show-inheritance:
8+
:special-members: __init__
9+
:members:
10+
:undoc-members:
11+
:inherited-members:

‎docs/api/waas/models/oci.waas.models.IPHashLoadBalancingMethod.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
IPHashLoadBalancingMethod
2+
=========================
3+
4+
.. currentmodule:: oci.waas.models
5+
6+
.. autoclass:: IPHashLoadBalancingMethod
7+
:show-inheritance:
8+
:special-members: __init__
9+
:members:
10+
:undoc-members:
11+
:inherited-members:

‎docs/api/waas/models/oci.waas.models.LoadBalancingMethod.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
LoadBalancingMethod
2+
===================
3+
4+
.. currentmodule:: oci.waas.models
5+
6+
.. autoclass:: LoadBalancingMethod
7+
:show-inheritance:
8+
:special-members: __init__
9+
:members:
10+
:undoc-members:
11+
:inherited-members:

‎docs/api/waas/models/oci.waas.models.RemoveHttpResponseHeaderAction.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
RemoveHttpResponseHeaderAction
2+
==============================
3+
4+
.. currentmodule:: oci.waas.models
5+
6+
.. autoclass:: RemoveHttpResponseHeaderAction
7+
:show-inheritance:
8+
:special-members: __init__
9+
:members:
10+
:undoc-members:
11+
:inherited-members:

‎docs/api/waas/models/oci.waas.models.RoundRobinLoadBalancingMethod.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
RoundRobinLoadBalancingMethod
2+
=============================
3+
4+
.. currentmodule:: oci.waas.models
5+
6+
.. autoclass:: RoundRobinLoadBalancingMethod
7+
:show-inheritance:
8+
:special-members: __init__
9+
:members:
10+
:undoc-members:
11+
:inherited-members:

‎docs/api/waas/models/oci.waas.models.StickyCookieLoadBalancingMethod.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
StickyCookieLoadBalancingMethod
2+
===============================
3+
4+
.. currentmodule:: oci.waas.models
5+
6+
.. autoclass:: StickyCookieLoadBalancingMethod
7+
:show-inheritance:
8+
:special-members: __init__
9+
:members:
10+
:undoc-members:
11+
:inherited-members:

‎examples/showoci/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44

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

7+
=====================
8+
20.03.24 - 2020-03-24
9+
=====================
10+
* Added Identity User to the CSV
11+
712
=====================
813
20.03.11 - 2020-03-11
914
=====================

‎examples/showoci/showoci.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ def set_parser_arguments():
259259
parser.add_argument('-p', default="", dest='proxy', help='Set Proxy (i.e. www-proxy-server.com:80) ')
260260
parser.add_argument('-rg', default="", dest='region', help='Filter by Region')
261261
parser.add_argument('-cp', default="", dest='compart', help='Filter by Compartment Name or OCID')
262-
parser.add_argument('-cpr', default="", dest='compart_recur', help='Filter by Comp Name or OCID Recursive')
262+
parser.add_argument('-cpr', default="", dest='compart_recur', help='Filter by Comp Name Recursive')
263263
parser.add_argument('-cpath', default="", dest='compartpath', help='Filter by Compartment path ,(i.e. -cpath "Adi / Sub"')
264264
parser.add_argument('-tenantid', default="", dest='tenantid', help='Override confile file tenancy_id')
265265
parser.add_argument('-cf', type=argparse.FileType('r'), dest='config', help="Config File")

‎examples/showoci/showoci_output.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2147,6 +2147,7 @@ def generate_csv(self, data, csv_file_header):
21472147
self.__print_header("Processing CSV Files", 0)
21482148
self.__export_to_csv_file("identity_policy", self.csv_identity_policies)
21492149
self.__export_to_csv_file("identity_groups", self.csv_identity_groups)
2150+
self.__export_to_csv_file("identity_users", self.csv_identity_users)
21502151
self.__export_to_csv_file("compute", self.csv_compute)
21512152
self.__export_to_csv_file("network_subnet", self.csv_network_subnet)
21522153
self.__export_to_csv_file("network_routes", self.csv_network_routes)
@@ -2264,6 +2265,7 @@ def __csv_identity_users(self, users):
22642265
try:
22652266
for user in users:
22662267
data = {
2268+
'id': user['id'],
22672269
'user_name': user['name'],
22682270
'description': user['description'],
22692271
'is_mfa_activated': user['is_mfa_activated'],

‎examples/showoci/showoci_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2917,7 +2917,7 @@ def __load_core_network_ips(self, virtual_network, compartments):
29172917

29182918
if tunnel.bgp_session_info:
29192919
bs = tunnel.bgp_session_info
2920-
tun_val['bgp_info'] = "BGP Status ".ljust(12) + " - " + str(bs.bgp_state + ", Cust: " + bs.customer_interface_ip + " (" + bs.customer_bgp_asn + "), Oracle: " + bs.oracle_interface_ip + " (" + bs.oracle_bgp_asn) + ")"
2920+
tun_val['bgp_info'] = "BGP Status ".ljust(12) + " - " + str(bs.bgp_state) + ", Cust: " + str(bs.customer_interface_ip) + " (ASN = " + str(bs.customer_bgp_asn) + "), Oracle: " + str(bs.oracle_interface_ip) + " (ASN = " + str(bs.oracle_bgp_asn) + ")"
29212921

29222922
data_tun.append(tun_val)
29232923
except Exception:

0 commit comments

Comments
 (0)