diff --git a/pkg/pip_requirements.txt b/pkg/pip_requirements.txt index fad8fcde..54069794 100644 --- a/pkg/pip_requirements.txt +++ b/pkg/pip_requirements.txt @@ -16,5 +16,4 @@ azure-keyvault-secrets azure-mgmt-rdbms azure-mgmt-cosmosdb azure-mgmt-containerinstance -azure-mgmt-webpubsub -pympler \ No newline at end of file +azure-mgmt-webpubsub \ No newline at end of file diff --git a/src/spaceone/inventory/manager/storage_accounts/instance_manager.py b/src/spaceone/inventory/manager/storage_accounts/instance_manager.py index 58504a7a..11ebb305 100644 --- a/src/spaceone/inventory/manager/storage_accounts/instance_manager.py +++ b/src/spaceone/inventory/manager/storage_accounts/instance_manager.py @@ -2,7 +2,6 @@ import logging import time -from pympler import asizeof from spaceone.inventory.libs.manager import AzureManager from spaceone.inventory.libs.schema.base import ReferenceModel from spaceone.inventory.connector.storage_accounts import StorageAccountsConnector @@ -59,13 +58,10 @@ def collect_cloud_service(self, params): }) if storage_account_dict.get('name') is not None: - # container_item = self.list_blob_containers(storage_account_conn, resource_group, storage_account_dict['name']) container_count = self.get_blob_containers_count(storage_account_conn, resource_group, storage_account_dict['name']) - storage_account_dict.update({ - # 'container_item': container_item, - 'container_count_display': container_count - }) + + storage_account_dict.update({'container_count_display': container_count}) _LOGGER.debug(f'[collect_cloud_service] {storage_account_id} container count : {container_count}') if storage_account_dict.get('routing_preference') is not None: @@ -97,7 +93,6 @@ def collect_cloud_service(self, params): 'instance_type': storage_account_data.sku.tier }) - _LOGGER.debug(f'[collect_cloud_service] {storage_account_id} size : {asizeof.asizeof(storage_account_resource)} bytes') # Must set_region_code method for region collection self.set_region_code(storage_account_data['location']) @@ -108,7 +103,6 @@ def collect_cloud_service(self, params): error_resource_response = self.generate_resource_error_response(e, 'Storage', 'StorageAccount', storage_account_id) error_responses.append(error_resource_response) - _LOGGER.debug(f'[collect_cloud_service] storage_account_responses size : {asizeof.asizeof(storage_account_responses)} bytes') _LOGGER.debug(f'** Storage Account Finished {time.time() - start_time} Seconds **') return storage_account_responses, error_responses diff --git a/src/spaceone/inventory/model/storage_accounts/cloud_service.py b/src/spaceone/inventory/model/storage_accounts/cloud_service.py index fe8f678d..30f9d29d 100644 --- a/src/spaceone/inventory/model/storage_accounts/cloud_service.py +++ b/src/spaceone/inventory/model/storage_accounts/cloud_service.py @@ -54,19 +54,6 @@ TextDyField.data_source('Internet Endpoints', 'data.routing_preference.publish_internet_endpoints') ]) -# # TAB - Containers -# storage_account_containers = TableDynamicLayout.set_fields('Containers', 'data.container_item', fields=[ -# TextDyField.data_source('Name', 'name'), -# TextDyField.data_source('Public Access Level', 'public_access'), -# DateTimeDyField.data_source('Last Modified', 'last_modified_time'), -# TextDyField.data_source('ETAG', 'etag'), -# TextDyField.data_source('Lease Status', 'lease_status'), -# TextDyField.data_source('Lease State', 'lease_state'), -# TextDyField.data_source('Lease Duration', 'lease_duration'), -# TextDyField.data_source('Encryption Score', 'default_encryption_scope') -# -# ]) - # TAB - Encryption storage_account_encryption = ItemDynamicLayout.set_fields('Encryption', 'data.encryption', fields=[ TextDyField.data_source('Key Source', 'key_source'),