Skip to content

Commit 2bfd5d8

Browse files
authored
Merge pull request #64 from oracle/release_2018-05-04
Releasing version 2.4.22
2 parents 7191db5 + 4cbdd1f commit 2bfd5d8

19 files changed

+4124
-1871
lines changed

CHANGELOG.rst

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

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

9+
2.4.22 - 2018-05-03
10+
---------------------
11+
Added
12+
~~~~~~~~
13+
* Support for returning ``event-name`` in logs extracted from Audit Service. (``oci audit event list``)
14+
* Support for multiple hostnames per listener in Load Balancer Service. An example can be found on `Github <https://github.com/oracle/oci-cli/blob/master/scripts/create_load_balancer.sh>`_ (``oci lb hostname`` and ``oci lb listener create --hostname-names``)
15+
* Support for FastConnect service. New commands as mentioned below are added:
16+
17+
* ``oci network cross-connect-group``
18+
* ``oci network cross-connect``
19+
* ``oci network cross-connect-location``
20+
* ``oci network cross-connect-port-speed-shape``
21+
* ``oci network cross-connect-status``
22+
* ``oci network fast-connect-provider-service``
23+
* ``oci network virtual-circuit``
24+
* ``oci network virtual-circuit-public-prefix``
25+
26+
Fixed
27+
~~~~~~~~
28+
* Multiple OCI CLI installation issues as specified below:
29+
30+
* Corrected usage of ``--accept-all-defaults`` to prevent an infinite loop.
31+
* An issue which causes failure of OCI CLI installations in non-default directories.
32+
* An issue related to download of virtualenv package on windows instances.
33+
934
2.4.21 - 2018-04-19
1035
---------------------
1136
Added

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Jinja2==2.9.6
1212
jmespath==0.9.3
1313
ndg-httpsclient==0.4.2
1414
mock==2.0.0
15-
oci==1.3.19
15+
oci==1.3.20
1616
packaging==16.8
1717
pluggy==0.4.0
1818
py==1.4.33

scripts/create_load_balancer.sh

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ function create_lb_with_all_options_as_individual_options() {
5555
# load balancer feature set by providing traffic routing flexibility.
5656
# More info about the feature can be found in scripts/create_load_balancer_example/path_route_sets_with_comments.json
5757
jsonlint -Sf scripts/create_load_balancer_example/path_route_sets_with_comments.json > scripts/create_load_balancer_example/path_route_sets.json
58+
# Hostname are not mandatory parameter to load balancer create. They allow traffic to route to
59+
# different backend sets by allowing multiple hostnames to map to a single listener in load balancer
60+
jsonlint -Sf scripts/create_load_balancer_example/hostnames_with_comments.json > scripts/create_load_balancer_example/hostnames.json
5861

5962
# Subnets are passed as a JSON array where each entry is a subnet OCID. For example:
6063
#
@@ -71,7 +74,15 @@ function create_lb_with_all_options_as_individual_options() {
7174
# - The listener information (--listeners) may need the name of the certificate bundle specified in --certificates
7275
#
7376
# So you need to take that into account when preparing your files for input
74-
CREATED_LB=$(oci lb load-balancer create -c $COMPARTMENT_ID --display-name exampleLb --shape-name $LB_SHAPE --subnet-ids file://scripts/create_load_balancer_example/subnets.json --certificates file://scripts/create_load_balancer_example/certificates.json --backend-sets file://scripts/create_load_balancer_example/backend_sets.json --listeners file://scripts/create_load_balancer_example/listeners.json --path-route-sets file://scripts/create_load_balancer_example/path_route_sets.json)
77+
CREATED_LB=$(oci lb load-balancer create -c $COMPARTMENT_ID \
78+
--display-name exampleLb \
79+
--shape-name $LB_SHAPE \
80+
--subnet-ids file://scripts/create_load_balancer_example/subnets.json \
81+
--certificates file://scripts/create_load_balancer_example/certificates.json \
82+
--backend-sets file://scripts/create_load_balancer_example/backend_sets.json \
83+
--listeners file://scripts/create_load_balancer_example/listeners.json \
84+
--path-route-sets file://scripts/create_load_balancer_example/path_route_sets.json \
85+
--hostnames file://scripts/create_load_balancer_example/hostnames.json)
7586
WORK_REQUEST_ID=$(jq -r '."opc-work-request-id"' <<< "$CREATED_LB")
7687
echo "Create Load Balancer Work Request ID: $WORK_REQUEST_ID"
7788

@@ -205,6 +216,16 @@ function create_lb_with_minimum_then_add_related_resources() {
205216
--wait-for-state SUCCEEDED \
206217
--max-wait-seconds 300
207218

219+
# We can create multiple hostnames here to eventually attach them to load balancer listener.
220+
# Each hostname can correspond to an application served from your backend.
221+
oci lb hostname create --load-balancer-id $LB_ID \
222+
--hostname host1.name.com \
223+
--name hostname1
224+
225+
oci lb hostname create --load-balancer-id $LB_ID \
226+
--hostname host2.name.com \
227+
--name hostname2
228+
208229
# Now that we have our certificates, backend set and path route set, we can add a listener. We need to specify a backend set which exists (e.g. the one we made)
209230
#
210231
# The valid values for --protocol can be found via "oci lb protocol list"
@@ -218,6 +239,7 @@ function create_lb_with_minimum_then_add_related_resources() {
218239
--ssl-certificate-name my_cert_bundle \
219240
--ssl-verify-depth 3 \
220241
--ssl-verify-peer-certificate false \
242+
--hostname-names '["hostname1", "hostname2"]' \
221243
--path-route-set-name PathRouteSetName
222244

223245
# Print out information about the load balancer

scripts/create_load_balancer_example/create_load_balancer_all_complex_params_with_comments.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,27 @@
4949
}
5050
}
5151
},
52+
"hostnames": {
53+
// The content here aligns with the example in the hostnames_with_comments.json file
54+
"hostname1": {
55+
"hostname": "host1.name.com",
56+
"name": "hostname1"
57+
},
58+
"hostname2": {
59+
"hostname": "host2.name.com",
60+
"name": "hostname2"
61+
}
62+
},
5263
"listeners": {
5364
// The content here aligns with the example in the listeners_with_comments.json file
5465
"listenerName": {
5566
"defaultBackendSetName": "backendSetName",
67+
"hostnameNames": [
68+
"hostname1",
69+
"hostname2"
70+
],
5671
"port": 8080,
57-
"protocol": "HTTP"
72+
"protocol": "HTTP",
5873
"pathRouteSetName": "PathRouteSetName"
5974
}
6075
},
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
/*
3+
* Each entry in this dictionary represents a virtual hostname. You can assign a virtual hostname
4+
* to any listener you create for your load balancer. Each hostname can correspond to an
5+
* application served from your backend. For more information on virtual hostnames, see
6+
* https://docs.us-phoenix-1.oraclecloud.com/Content/Balance/Tasks/managingrequest.htm#vhost
7+
*/
8+
9+
// The key value below should be the name of the "hostname" resource.
10+
"hostname1": {
11+
12+
// hostname is the URL associated with the listener and hence a backend set.
13+
// Multiple hostnames, backed by DNS entries, can point to the same load balancer IP address.
14+
// Once the request reaches the LB service the hostname in used to identify the backendset
15+
"hostname": "host1.name.com",
16+
17+
// The name attribute mentioned below is optional since we already mention the name of the resource as
18+
// the key above.
19+
"name": "hostname1"
20+
},
21+
"hostname2": {
22+
"hostname": "host2.name.com",
23+
"name": "hostname2"
24+
}
25+
}

scripts/create_load_balancer_example/listeners_with_comments.json

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,20 @@
1515
// --backend-sets option when doing a "oci lb load-balancer create")
1616
"defaultBackendSetName": "backendSetName",
1717

18+
// This should match the name of hostname group which has been/will be associated with a load balancer (e.g. via the
19+
// --hostnames option when doing a "oci lb load-balancer create")
20+
// You can assign one or more virtual hostnames to any listener you create for your load balancer.
21+
// Each hostname can correspond to an application served from your backend.
22+
"hostnameNames": [
23+
"hostname1",
24+
"hostname2"
25+
],
26+
27+
// This should match the name of a path route set which has been/will be associated with a load balancer (e.g. via the
28+
// --path-route-sets option when doing a "oci lb load-balancer create")
29+
// A path route set includes all path route strings and matching rules that define the data routing for a particular listener.
30+
"pathRouteSetName": "PathRouteSetName",
31+
1832
"port": 8080,
1933

2034
// You can get valid protocol values by calling "oci lb protocol list"
@@ -24,7 +38,15 @@
2438
// as many times as necessary to add all the listeners you need
2539
/*
2640
, "mySecondListenerName": {
27-
"defaultBackendSetName": "backendSetName",
41+
"connectionConfiguration": {
42+
"idleTimeout": 0
43+
},
44+
"defaultBackendSetName": "backendSetName2",
45+
"hostnameNames": [
46+
"hostname3",
47+
"hostname4"
48+
],
49+
"pathRouteSetName": "pathRouteSetName2",
2850
"port": 80,
2951
"protocol": "HTTP",
3052
"sslConfiguration": {

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def open_relative(*path):
3030

3131

3232
requires = [
33-
'oci==1.3.19',
33+
'oci==1.3.20',
3434
'arrow==0.10.0',
3535
'certifi',
3636
'click==6.7',

0 commit comments

Comments
 (0)