Skip to content

Commit 362b146

Browse files
dshelbyodshelbyo
authored
Releasing version 2.6.5
Releasing version 2.6.5
2 parents 505daf7 + 8d2b4e6 commit 362b146

35 files changed

+656
-168
lines changed

‎CHANGELOG.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ 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.6.5 - 2019-11-19
8+
====================
9+
10+
Added
11+
-----
12+
* Support for four-byte autonomous system numbers (ASNs) on FastConnect resources in the Networking service
13+
* Support for choosing fault domains when creating instance pools in the Compute service
14+
* Support for allowing connections from only specific VCNs to autonomous data warehouse and autonomous transaction processing instances in the Database service
15+
* Support for Streaming Client Non-Regional
616

717
====================
818
2.6.4 - 2019-11-12

‎examples/showoci/CHANGELOG.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ 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+
19.11.19 - 2019-11-19
9+
====================
10+
* Added total block volume in CSV export per instance
11+
* Added compartment_id to all JSON resources
12+
* Changed JSON 'compartment' to 'compartment_name' to be aligned across the application
13+
* Added VPUs to the block and boot volumes
14+
715
====================
816
19.10.31 - 2019-10-31
917
====================

‎examples/showoci/showoci.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import argparse
6363
import datetime
6464

65-
version = "19.10.31"
65+
version = "19.11.19"
6666

6767
##########################################################################
6868
# execute_extract

‎examples/showoci/showoci_data.py‎

Lines changed: 75 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,12 @@ def __get_oci_region_data(self, region_name):
184184
continue
185185

186186
print(" Compartment " + compartment['path'] + "...")
187-
data = {'compartment': compartment['name'], 'path': compartment['path']}
187+
data = {
188+
'compartment_id': compartment['id'],
189+
'compartment_name': compartment['name'],
190+
'compartment': compartment['name'],
191+
'path': compartment['path']
192+
}
188193
has_data = False
189194

190195
# run on network module
@@ -321,7 +326,8 @@ def __get_core_network_vcn_nat(self, vcn_id):
321326
for arr in list_nat_gateways:
322327
value = {'id': arr['id'],
323328
'name': arr['name'],
324-
'compartment': arr['compartment_name'],
329+
'compartment_name': arr['compartment_name'],
330+
'compartment_id': arr['compartment_id'],
325331
'time_created': arr['time_created'],
326332
'defined_tags': arr['defined_tags'],
327333
'freeform_tags': arr['freeform_tags']}
@@ -342,7 +348,11 @@ def __get_core_network_vcn_igw(self, vcn_id):
342348
try:
343349
list_igws = self.service.search_multi_items(self.service.C_NETWORK, self.service.C_NETWORK_IGW, 'vcn_id', vcn_id)
344350
for arr in list_igws:
345-
value = {'id': arr['id'], 'name': arr['name'], 'compartment': arr['compartment_name'], 'time_created': arr['time_created']}
351+
value = {'id': arr['id'],
352+
'name': arr['name'],
353+
'compartment_name': arr['compartment_name'],
354+
'compartment_id': arr['compartment_id'],
355+
'time_created': arr['time_created']}
346356
data.append(value)
347357
return data
348358

@@ -361,7 +371,9 @@ def __get_core_network_vcn_sgw(self, vcn_id):
361371
list_service_gateways = self.service.search_multi_items(self.service.C_NETWORK, self.service.C_NETWORK_SGW, 'vcn_id', vcn_id)
362372
for arr in list_service_gateways:
363373
value = {'id': arr['id'], 'name': arr['name'], 'services': arr['services'],
364-
'compartment': arr['compartment_name'], 'time_created': arr['time_created'], 'defined_tags': arr['defined_tags'], 'freeform_tags': arr['freeform_tags']}
374+
'compartment_name': arr['compartment_name'],
375+
'compartment_id': arr['compartment_id'],
376+
'time_created': arr['time_created'], 'defined_tags': arr['defined_tags'], 'freeform_tags': arr['freeform_tags']}
365377
data.append(value)
366378
return data
367379

@@ -414,7 +426,12 @@ def __get_core_network_vcn_drg_attached(self, vcn_id):
414426
list_drg_attachments = self.service.search_multi_items(self.service.C_NETWORK, self.service.C_NETWORK_DRG_AT, 'vcn_id', vcn_id)
415427
for da in list_drg_attachments:
416428
val = self.__get_core_network_vcn_drg_details(da)
417-
value = {'id': da['id'], 'drg_id': da['drg_id'], 'name': val, 'compartment': da['compartment_name'], 'time_created': da['time_created']}
429+
value = {'id': da['id'],
430+
'drg_id': da['drg_id'],
431+
'name': val,
432+
'compartment_name': da['compartment_name'],
433+
'compartment_id': da['compartment_id'],
434+
'time_created': da['time_created']}
418435
data.append(value)
419436
return data
420437

@@ -434,7 +451,19 @@ def __get_core_network_vcn_local_peering(self, vcn_id):
434451
if lpg['route_table_id'] != "None":
435452
routestr = " + Transit Route(" + str(self.__get_core_network_route(lpg['route_table_id'])) + ")"
436453

437-
value = {'id': lpg['id'], 'name': (lpg['name'] + routestr), 'compartment': lpg['compartment_name'], 'time_created': lpg['time_created']}
454+
value = {'id': lpg['id'],
455+
'name': (lpg['name'] + routestr),
456+
'display_name': (lpg['display_name']),
457+
'compartment_id': lpg['compartment_id'],
458+
'compartment_name': lpg['compartment_name'],
459+
'time_created': lpg['time_created'],
460+
'route_table_id': lpg['route_table_id'],
461+
'route_table_name': routestr,
462+
'vcn_id': lpg['vcn_id'],
463+
'peer_advertised_cidr': lpg['peer_advertised_cidr'],
464+
'peer_advertised_cidr_details': lpg['peer_advertised_cidr_details'],
465+
'is_cross_tenancy_peering': lpg['is_cross_tenancy_peering']
466+
}
438467
data.append(value)
439468
return data
440469

@@ -484,7 +513,8 @@ def __get_core_network_vcn_subnets(self, vcn_id):
484513
'availability_domain': subnet['availability_domain'],
485514
'public_private': subnet['public_private'],
486515
'dns': subnet['dns_label'],
487-
'compartment': subnet['compartment_name'],
516+
'compartment_name': subnet['compartment_name'],
517+
'compartment_id': subnet['compartment_id'],
488518
'dhcp_options': dhcp_options,
489519
'security_list': sec_lists,
490520
'route': route_name,
@@ -512,7 +542,8 @@ def __get_core_network_vcn_security_lists(self, vcn_id):
512542
data.append({
513543
'id': sl['id'],
514544
'name': sl['name'],
515-
'compartment': sl['compartment_name'],
545+
'compartment_name': sl['compartment_name'],
546+
'compartment_id': sl['compartment_id'],
516547
'sec_rules': sl['sec_rules'],
517548
'time_created': sl['time_created'],
518549
'defined_tags': sl['defined_tags'],
@@ -537,7 +568,8 @@ def __get_core_network_vcn_security_groups(self, vcn_id):
537568
value = {
538569
'id': nsg['id'],
539570
'name': nsg['name'],
540-
'compartment': nsg['compartment_name'],
571+
'compartment_name': nsg['compartment_name'],
572+
'compartment_id': nsg['compartment_id'],
541573
'sec_rules': [],
542574
'time_created': nsg['time_created'],
543575
'defined_tags': nsg['defined_tags'],
@@ -672,10 +704,18 @@ def __get_core_network_vcn_route_tables(self, vcn_id):
672704
for rt in route_tables:
673705
route_rules = []
674706
for rl in rt['route_rules']:
675-
route_rules.append({'network_entity_id': rl['network_entity_id'], 'destination': rl['destination'], 'desc': self.__get_core_network_vcn_route_rule(rl)})
707+
route_rules.append(
708+
{'network_entity_id': rl['network_entity_id'],
709+
'destination': rl['destination'],
710+
'desc': self.__get_core_network_vcn_route_rule(rl)
711+
})
676712

677713
# add route
678-
val = {'id': rt['id'], 'name': rt['name'], 'compartment': rt['compartment_name'], 'time_created': rt['time_created'],
714+
val = {'id': rt['id'],
715+
'name': rt['name'],
716+
'compartment_name': rt['compartment_name'],
717+
'compartment_id': rt['compartment_id'],
718+
'time_created': rt['time_created'],
679719
'route_rules': route_rules}
680720
data.append(val)
681721
return data
@@ -697,7 +737,8 @@ def __get_core_network_vcn_dhcp_options(self, vcn_id):
697737
data.append({
698738
'id': dhcp['id'],
699739
'name': dhcp['name'],
700-
'compartment': dhcp['compartment_name'],
740+
'compartment_name': dhcp['compartment_name'],
741+
'compartment_id': dhcp['compartment_id'],
701742
'time_created': dhcp['time_created'],
702743
'opt': dhcp['options']
703744
})
@@ -732,7 +773,13 @@ def __get_core_network_vcn(self, region_name, compartment):
732773
'dhcp_options': self.__get_core_network_vcn_dhcp_options(vcn['id'])}
733774

734775
# assign the data to the vcn
735-
vcn_data.append({'id': vcn['id'], 'name': vcn['name'], 'display_name': vcn['display_name'], 'cidr_block': vcn['cidr_block'], 'compartment': str(compartment['name']), 'data': val})
776+
vcn_data.append({'id': vcn['id'],
777+
'name': vcn['name'],
778+
'display_name': vcn['display_name'],
779+
'cidr_block': vcn['cidr_block'],
780+
'compartment_name': str(compartment['name']),
781+
'compartment_id': str(compartment['id']),
782+
'data': val})
736783
return vcn_data
737784

738785
except BaseException as e:
@@ -1068,8 +1115,10 @@ def __get_core_block_volume_boot(self, boot_volume_id, compartment_name):
10681115
value = {
10691116
'sum_info': 'Compute - Block Storage (GB)',
10701117
'sum_size_gb': bv['size_in_gbs'],
1071-
'desc': (str(bv['size_in_gbs']) + "GB - " + str(bv['display_name']) + " " + bv['backup_policy'] + volume_group + comp_text),
1118+
'desc': (str(bv['size_in_gbs']) + "GB - " + str(bv['display_name']) + " (" + bv['vpus_per_gb'] + " vpus) " + bv['backup_policy'] + volume_group + comp_text),
10721119
'backup_policy': "None" if bv['backup_policy'] == "" else bv['backup_policy'],
1120+
'vpus_per_gb': bv['vpus_per_gb'],
1121+
'is_hydrated': bv['is_hydrated'],
10731122
'time_created': bv['time_created'],
10741123
'display_name': bv['display_name'],
10751124
'defined_tags': bv['defined_tags'],
@@ -1104,10 +1153,14 @@ def __get_core_block_volume(self, volume_id, compartment_name):
11041153
value = {
11051154
'sum_info': 'Compute - Block Storage (GB)',
11061155
'sum_size_gb': bv['size_in_gbs'],
1107-
'desc': (str(bv['size_in_gbs']) + "GB - " + str(bv['display_name']) + bv['backup_policy'] + volume_group + comp_text),
1156+
'desc': (str(bv['size_in_gbs']) + "GB - " + str(bv['display_name']) + " (" + bv['vpus_per_gb'] + " vpus) " + bv['backup_policy'] + volume_group + comp_text),
11081157
'time_created': bv['time_created'],
1158+
'compartment_name': bv['compartment_name'],
1159+
'compartment_id': bv['compartment_id'],
11091160
'backup_policy': "None" if bv['backup_policy'] == "" else bv['backup_policy'],
11101161
'display_name': bv['display_name'],
1162+
'vpus_per_gb': bv['vpus_per_gb'],
1163+
'is_hydrated': bv['is_hydrated'],
11111164
'size': str(bv['size_in_gbs']),
11121165
'defined_tags': bv['defined_tags'],
11131166
'freeform_tags': bv['freeform_tags']
@@ -1297,6 +1350,7 @@ def __get_core_compute_instances(self, region_name, compartment):
12971350
'shape_storage_tb': instance['shape_storage_tb'],
12981351
'display_name': instance['display_name'],
12991352
'compartment_name': instance['compartment_name'],
1353+
'compartment_id': instance['compartment_id'],
13001354
'lifecycle_state': instance['lifecycle_state'],
13011355
'console_id': instance['console_id'], 'console': instance['console'],
13021356
'time_created': instance['time_created'],
@@ -1749,6 +1803,7 @@ def __get_database_db_systems(self, region_name, compartment):
17491803
'storage_management': dbs['storage_management'],
17501804
'vip_ips': dbs['vip_ips'],
17511805
'compartment_name': dbs['compartment_name'],
1806+
'compartment_id': dbs['compartment_id'],
17521807
'patches': self.__get_database_db_patches(dbs['patches']),
17531808
'listener_port': dbs['listener_port'],
17541809
'db_homes': self.__get_database_db_homes(dbs['db_homes']),
@@ -1807,6 +1862,7 @@ def __get_database_autonomous_databases(self, region_name, compartment):
18071862
'data_storage_size_in_tbs': str(dbs['data_storage_size_in_tbs']),
18081863
'db_name': str(dbs['db_name']),
18091864
'compartment_name': str(dbs['compartment_name']),
1865+
'compartment_id': str(dbs['compartment_id']),
18101866
'service_console_url': str(dbs['service_console_url']),
18111867
'time_created': str(dbs['time_created'])[0:16],
18121868
'connection_strings': str(dbs['connection_strings']),
@@ -2251,7 +2307,10 @@ def __get_container_main(self, region_name, compartment):
22512307
for np in nodes:
22522308
nval = {'id': np['id'], 'name': np['name'], 'node_image_id': np['node_image_id'], 'node_image_name': np['node_image_name'],
22532309
'kubernetes_version': np['kubernetes_version'], 'node_shape': np['node_shape'],
2254-
'quantity_per_subnet': np['quantity_per_subnet'], 'compartment_name': np['compartment_name'], 'subnets': [], 'subnet_ids': np['subnet_ids']}
2310+
'quantity_per_subnet': np['quantity_per_subnet'],
2311+
'compartment_name': np['compartment_name'],
2312+
'compartment_id': np['compartment_id'],
2313+
'subnets': [], 'subnet_ids': np['subnet_ids']}
22552314

22562315
# subnets
22572316
for sub in np['subnet_ids']:

0 commit comments

Comments
 (0)