Skip to content

Commit

Permalink
Releasing version 2.6.5
Browse files Browse the repository at this point in the history 
Releasing version 2.6.5
  • Loading branch information
@dshelbyo
dshelbyo authored Nov 19, 2019
2 parents 505daf7 + 8d2b4e6 commit 362b146
Show file tree
Hide file tree
Showing 35 changed files with 656 additions and 168 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ 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.6.5 - 2019-11-19
====================

Added
-----
* Support for four-byte autonomous system numbers (ASNs) on FastConnect resources in the Networking service
* Support for choosing fault domains when creating instance pools in the Compute service
* Support for allowing connections from only specific VCNs to autonomous data warehouse and autonomous transaction processing instances in the Database service
* Support for Streaming Client Non-Regional

====================
2.6.4 - 2019-11-12
Expand Down
8 changes: 8 additions & 0 deletions examples/showoci/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.

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

====================
19.11.19 - 2019-11-19
====================
* Added total block volume in CSV export per instance
* Added compartment_id to all JSON resources
* Changed JSON 'compartment' to 'compartment_name' to be aligned across the application
* Added VPUs to the block and boot volumes

====================
19.10.31 - 2019-10-31
====================
Expand Down
2 changes: 1 addition & 1 deletion examples/showoci/showoci.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
import argparse
import datetime

version = "19.10.31"
version = "19.11.19"

##########################################################################
# execute_extract
Expand Down
91 changes: 75 additions & 16 deletions examples/showoci/showoci_data.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,12 @@ def __get_oci_region_data(self, region_name):
continue

print(" Compartment " + compartment['path'] + "...")
data = {'compartment': compartment['name'], 'path': compartment['path']}
data = {
'compartment_id': compartment['id'],
'compartment_name': compartment['name'],
'compartment': compartment['name'],
'path': compartment['path']
}
has_data = False

# run on network module
Expand Down Expand Up @@ -321,7 +326,8 @@ def __get_core_network_vcn_nat(self, vcn_id):
for arr in list_nat_gateways:
value = {'id': arr['id'],
'name': arr['name'],
'compartment': arr['compartment_name'],
'compartment_name': arr['compartment_name'],
'compartment_id': arr['compartment_id'],
'time_created': arr['time_created'],
'defined_tags': arr['defined_tags'],
'freeform_tags': arr['freeform_tags']}
Expand All @@ -342,7 +348,11 @@ def __get_core_network_vcn_igw(self, vcn_id):
try:
list_igws = self.service.search_multi_items(self.service.C_NETWORK, self.service.C_NETWORK_IGW, 'vcn_id', vcn_id)
for arr in list_igws:
value = {'id': arr['id'], 'name': arr['name'], 'compartment': arr['compartment_name'], 'time_created': arr['time_created']}
value = {'id': arr['id'],
'name': arr['name'],
'compartment_name': arr['compartment_name'],
'compartment_id': arr['compartment_id'],
'time_created': arr['time_created']}
data.append(value)
return data

Expand All @@ -361,7 +371,9 @@ def __get_core_network_vcn_sgw(self, vcn_id):
list_service_gateways = self.service.search_multi_items(self.service.C_NETWORK, self.service.C_NETWORK_SGW, 'vcn_id', vcn_id)
for arr in list_service_gateways:
value = {'id': arr['id'], 'name': arr['name'], 'services': arr['services'],
'compartment': arr['compartment_name'], 'time_created': arr['time_created'], 'defined_tags': arr['defined_tags'], 'freeform_tags': arr['freeform_tags']}
'compartment_name': arr['compartment_name'],
'compartment_id': arr['compartment_id'],
'time_created': arr['time_created'], 'defined_tags': arr['defined_tags'], 'freeform_tags': arr['freeform_tags']}
data.append(value)
return data

Expand Down Expand Up @@ -414,7 +426,12 @@ def __get_core_network_vcn_drg_attached(self, vcn_id):
list_drg_attachments = self.service.search_multi_items(self.service.C_NETWORK, self.service.C_NETWORK_DRG_AT, 'vcn_id', vcn_id)
for da in list_drg_attachments:
val = self.__get_core_network_vcn_drg_details(da)
value = {'id': da['id'], 'drg_id': da['drg_id'], 'name': val, 'compartment': da['compartment_name'], 'time_created': da['time_created']}
value = {'id': da['id'],
'drg_id': da['drg_id'],
'name': val,
'compartment_name': da['compartment_name'],
'compartment_id': da['compartment_id'],
'time_created': da['time_created']}
data.append(value)
return data

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

value = {'id': lpg['id'], 'name': (lpg['name'] + routestr), 'compartment': lpg['compartment_name'], 'time_created': lpg['time_created']}
value = {'id': lpg['id'],
'name': (lpg['name'] + routestr),
'display_name': (lpg['display_name']),
'compartment_id': lpg['compartment_id'],
'compartment_name': lpg['compartment_name'],
'time_created': lpg['time_created'],
'route_table_id': lpg['route_table_id'],
'route_table_name': routestr,
'vcn_id': lpg['vcn_id'],
'peer_advertised_cidr': lpg['peer_advertised_cidr'],
'peer_advertised_cidr_details': lpg['peer_advertised_cidr_details'],
'is_cross_tenancy_peering': lpg['is_cross_tenancy_peering']
}
data.append(value)
return data

Expand Down Expand Up @@ -484,7 +513,8 @@ def __get_core_network_vcn_subnets(self, vcn_id):
'availability_domain': subnet['availability_domain'],
'public_private': subnet['public_private'],
'dns': subnet['dns_label'],
'compartment': subnet['compartment_name'],
'compartment_name': subnet['compartment_name'],
'compartment_id': subnet['compartment_id'],
'dhcp_options': dhcp_options,
'security_list': sec_lists,
'route': route_name,
Expand Down Expand Up @@ -512,7 +542,8 @@ def __get_core_network_vcn_security_lists(self, vcn_id):
data.append({
'id': sl['id'],
'name': sl['name'],
'compartment': sl['compartment_name'],
'compartment_name': sl['compartment_name'],
'compartment_id': sl['compartment_id'],
'sec_rules': sl['sec_rules'],
'time_created': sl['time_created'],
'defined_tags': sl['defined_tags'],
Expand All @@ -537,7 +568,8 @@ def __get_core_network_vcn_security_groups(self, vcn_id):
value = {
'id': nsg['id'],
'name': nsg['name'],
'compartment': nsg['compartment_name'],
'compartment_name': nsg['compartment_name'],
'compartment_id': nsg['compartment_id'],
'sec_rules': [],
'time_created': nsg['time_created'],
'defined_tags': nsg['defined_tags'],
Expand Down Expand Up @@ -672,10 +704,18 @@ def __get_core_network_vcn_route_tables(self, vcn_id):
for rt in route_tables:
route_rules = []
for rl in rt['route_rules']:
route_rules.append({'network_entity_id': rl['network_entity_id'], 'destination': rl['destination'], 'desc': self.__get_core_network_vcn_route_rule(rl)})
route_rules.append(
{'network_entity_id': rl['network_entity_id'],
'destination': rl['destination'],
'desc': self.__get_core_network_vcn_route_rule(rl)
})

# add route
val = {'id': rt['id'], 'name': rt['name'], 'compartment': rt['compartment_name'], 'time_created': rt['time_created'],
val = {'id': rt['id'],
'name': rt['name'],
'compartment_name': rt['compartment_name'],
'compartment_id': rt['compartment_id'],
'time_created': rt['time_created'],
'route_rules': route_rules}
data.append(val)
return data
Expand All @@ -697,7 +737,8 @@ def __get_core_network_vcn_dhcp_options(self, vcn_id):
data.append({
'id': dhcp['id'],
'name': dhcp['name'],
'compartment': dhcp['compartment_name'],
'compartment_name': dhcp['compartment_name'],
'compartment_id': dhcp['compartment_id'],
'time_created': dhcp['time_created'],
'opt': dhcp['options']
})
Expand Down Expand Up @@ -732,7 +773,13 @@ def __get_core_network_vcn(self, region_name, compartment):
'dhcp_options': self.__get_core_network_vcn_dhcp_options(vcn['id'])}

# assign the data to the vcn
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})
vcn_data.append({'id': vcn['id'],
'name': vcn['name'],
'display_name': vcn['display_name'],
'cidr_block': vcn['cidr_block'],
'compartment_name': str(compartment['name']),
'compartment_id': str(compartment['id']),
'data': val})
return vcn_data

except BaseException as e:
Expand Down Expand Up @@ -1068,8 +1115,10 @@ def __get_core_block_volume_boot(self, boot_volume_id, compartment_name):
value = {
'sum_info': 'Compute - Block Storage (GB)',
'sum_size_gb': bv['size_in_gbs'],
'desc': (str(bv['size_in_gbs']) + "GB - " + str(bv['display_name']) + " " + bv['backup_policy'] + volume_group + comp_text),
'desc': (str(bv['size_in_gbs']) + "GB - " + str(bv['display_name']) + " (" + bv['vpus_per_gb'] + " vpus) " + bv['backup_policy'] + volume_group + comp_text),
'backup_policy': "None" if bv['backup_policy'] == "" else bv['backup_policy'],
'vpus_per_gb': bv['vpus_per_gb'],
'is_hydrated': bv['is_hydrated'],
'time_created': bv['time_created'],
'display_name': bv['display_name'],
'defined_tags': bv['defined_tags'],
Expand Down Expand Up @@ -1104,10 +1153,14 @@ def __get_core_block_volume(self, volume_id, compartment_name):
value = {
'sum_info': 'Compute - Block Storage (GB)',
'sum_size_gb': bv['size_in_gbs'],
'desc': (str(bv['size_in_gbs']) + "GB - " + str(bv['display_name']) + bv['backup_policy'] + volume_group + comp_text),
'desc': (str(bv['size_in_gbs']) + "GB - " + str(bv['display_name']) + " (" + bv['vpus_per_gb'] + " vpus) " + bv['backup_policy'] + volume_group + comp_text),
'time_created': bv['time_created'],
'compartment_name': bv['compartment_name'],
'compartment_id': bv['compartment_id'],
'backup_policy': "None" if bv['backup_policy'] == "" else bv['backup_policy'],
'display_name': bv['display_name'],
'vpus_per_gb': bv['vpus_per_gb'],
'is_hydrated': bv['is_hydrated'],
'size': str(bv['size_in_gbs']),
'defined_tags': bv['defined_tags'],
'freeform_tags': bv['freeform_tags']
Expand Down Expand Up @@ -1297,6 +1350,7 @@ def __get_core_compute_instances(self, region_name, compartment):
'shape_storage_tb': instance['shape_storage_tb'],
'display_name': instance['display_name'],
'compartment_name': instance['compartment_name'],
'compartment_id': instance['compartment_id'],
'lifecycle_state': instance['lifecycle_state'],
'console_id': instance['console_id'], 'console': instance['console'],
'time_created': instance['time_created'],
Expand Down Expand Up @@ -1749,6 +1803,7 @@ def __get_database_db_systems(self, region_name, compartment):
'storage_management': dbs['storage_management'],
'vip_ips': dbs['vip_ips'],
'compartment_name': dbs['compartment_name'],
'compartment_id': dbs['compartment_id'],
'patches': self.__get_database_db_patches(dbs['patches']),
'listener_port': dbs['listener_port'],
'db_homes': self.__get_database_db_homes(dbs['db_homes']),
Expand Down Expand Up @@ -1807,6 +1862,7 @@ def __get_database_autonomous_databases(self, region_name, compartment):
'data_storage_size_in_tbs': str(dbs['data_storage_size_in_tbs']),
'db_name': str(dbs['db_name']),
'compartment_name': str(dbs['compartment_name']),
'compartment_id': str(dbs['compartment_id']),
'service_console_url': str(dbs['service_console_url']),
'time_created': str(dbs['time_created'])[0:16],
'connection_strings': str(dbs['connection_strings']),
Expand Down Expand Up @@ -2251,7 +2307,10 @@ def __get_container_main(self, region_name, compartment):
for np in nodes:
nval = {'id': np['id'], 'name': np['name'], 'node_image_id': np['node_image_id'], 'node_image_name': np['node_image_name'],
'kubernetes_version': np['kubernetes_version'], 'node_shape': np['node_shape'],
'quantity_per_subnet': np['quantity_per_subnet'], 'compartment_name': np['compartment_name'], 'subnets': [], 'subnet_ids': np['subnet_ids']}
'quantity_per_subnet': np['quantity_per_subnet'],
'compartment_name': np['compartment_name'],
'compartment_id': np['compartment_id'],
'subnets': [], 'subnet_ids': np['subnet_ids']}

# subnets
for sub in np['subnet_ids']:
Expand Down
Loading

0 comments on commit 362b146

Please sign in to comment.