docs: Split storage supported methods into two tables - storage and CDN.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/6bf42e1e Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/6bf42e1e Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/6bf42e1e Branch: refs/heads/trunk Commit: 6bf42e1e768f8ecb7246823ac5d4775b29d53f2f Parents: 5b7f71a Author: Tomaz Muraus <[email protected]> Authored: Tue Aug 13 00:53:04 2013 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Tue Aug 13 00:53:04 2013 +0200 ---------------------------------------------------------------------- .../generate_provider_feature_matrix_table.py | 28 +++++++++++++++----- docs/storage/supported_providers.rst | 11 +++++--- 2 files changed, 29 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/6bf42e1e/contrib/generate_provider_feature_matrix_table.py ---------------------------------------------------------------------- diff --git a/contrib/generate_provider_feature_matrix_table.py b/contrib/generate_provider_feature_matrix_table.py index e08b224..919420c 100755 --- a/contrib/generate_provider_feature_matrix_table.py +++ b/contrib/generate_provider_feature_matrix_table.py @@ -55,11 +55,13 @@ BASE_API_METHODS = { 'loadbalancer': ['create_balancer', 'list_balancers', 'balancer_list_members', 'balancer_attach_member', 'balancer_detach_member', 'balancer_attach_compute_node'], - 'storage': ['list_containers', 'list_container_objects', - 'create_container', - 'delete_container', 'upload_object', - 'upload_object_via_stream', 'download_object', - 'download_object_as_stream', 'delete_object'], + 'storage_main': ['list_containers', 'list_container_objects', + 'create_container', + 'delete_container', 'upload_object', + 'upload_object_via_stream', 'download_object', + 'download_object_as_stream', 'delete_object'], + 'storage_cdn': ['enable_container_cdn', 'enable_object_cdn', + 'get_container_cdn_url', 'get_object_cdn_url'], 'dns': ['list_zones', 'list_records', 'create_zone', 'update_zone', 'create_record', 'update_record', 'delete_zone', 'delete_record'] } @@ -91,7 +93,7 @@ FRIENDLY_METHODS_NAMES = { 'balancer_detach_member': 'detach member', 'balancer_attach_compute_node': 'attach compute node' }, - 'storage': { + 'storage_main': { 'list_containers': 'list containers', 'list_container_objects': 'list objects', 'create_container': 'create container', @@ -102,6 +104,12 @@ FRIENDLY_METHODS_NAMES = { 'download_object_as_stream': 'streaming object download', 'delete_object': 'delete object' }, + 'storage_cdn': { + 'enable_container_cdn': 'enable container cdn', + 'enable_object_cdn': 'enable object cdn', + 'get_container_cdn_url': 'get container cdn URL', + 'get_object_cdn_url': 'get object cdn URL', + }, 'dns': { 'list_zones': 'list zones', 'list_records': 'list records', @@ -134,7 +142,7 @@ def generate_providers_table(api): drivers = LB_DRIVERS provider = LBProvider get_driver_method = get_lb_driver - elif api == 'storage': + elif api in ['storage_main', 'storage_cdn']: driver = StorageDriver drivers = STORAGE_DRIVERS provider = StorageProvider @@ -255,6 +263,8 @@ def generate_tables(): if api.startswith('compute'): docs_dir = 'compute' + elif api.startswith('storage'): + docs_dir = 'storage' current_path = os.path.dirname(__file__) target_dir = os.path.abspath(pjoin(current_path, @@ -267,6 +277,10 @@ def generate_tables(): file_name_2 = '_supported_methods_main.rst' elif api == 'compute_block_storage': file_name_2 = '_supported_methods_block_storage.rst' + elif api == 'storage_main': + file_name_2 = '_supported_methods_main.rst' + elif api == 'storage_cdn': + file_name_2 = '_supported_methods_cdn.rst' supported_providers_path = pjoin(target_dir, file_name_1) supported_methods_path = pjoin(target_dir, file_name_2) http://git-wip-us.apache.org/repos/asf/libcloud/blob/6bf42e1e/docs/storage/supported_providers.rst ---------------------------------------------------------------------- diff --git a/docs/storage/supported_providers.rst b/docs/storage/supported_providers.rst index b04c521..b755e62 100644 --- a/docs/storage/supported_providers.rst +++ b/docs/storage/supported_providers.rst @@ -6,7 +6,12 @@ Provider Matrix .. include:: _supported_providers.rst -Supported Methods ------------------ +Supported Methods (storage) +--------------------------- -.. include:: _supported_methods.rst +.. include:: _supported_methods_main.rst + +Supported Methods (CND) +----------------------- + +.. include:: _supported_methods_cdn.rst
