Update provider table
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/f4c1e2e8 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f4c1e2e8 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f4c1e2e8 Branch: refs/heads/trunk Commit: f4c1e2e82789789b9ea05cd2ecead6df65dc3544 Parents: c82230f Author: anthony-shaw <[email protected]> Authored: Tue Dec 29 19:58:26 2015 +1100 Committer: anthony-shaw <[email protected]> Committed: Tue Dec 29 19:58:26 2015 +1100 ---------------------------------------------------------------------- contrib/generate_provider_feature_matrix_table.py | 8 ++++---- docs/compute/_supported_methods_block_storage.rst | 2 ++ docs/compute/_supported_methods_image_management.rst | 2 ++ .../_supported_methods_key_pair_management.rst | 2 ++ docs/compute/_supported_methods_main.rst | 2 ++ docs/compute/_supported_providers.rst | 2 ++ docs/container/_supported_methods.rst | 14 ++++++++------ docs/container/_supported_providers.rst | 14 ++++++++------ libcloud/container/providers.py | 2 ++ libcloud/container/types.py | 1 + 10 files changed, 33 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/f4c1e2e8/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 3995eb2..f5ccb2c 100755 --- a/contrib/generate_provider_feature_matrix_table.py +++ b/contrib/generate_provider_feature_matrix_table.py @@ -96,8 +96,8 @@ BASE_API_METHODS = { 'delete_zone', 'delete_record'], 'container': ['install_image', 'list_images', 'deploy_container', 'get_container', 'start_container', 'stop_container', - 'restart_container', 'delete_container', 'list_containers', - 'list_locations', 'create_cluster', 'delete_cluster', + 'restart_container', 'destroy_container', 'list_containers', + 'list_locations', 'create_cluster', 'destroy_cluster', 'list_clusters'] } @@ -179,10 +179,10 @@ FRIENDLY_METHODS_NAMES = { 'start_container': 'start container', 'stop_container': 'stop container', 'restart_container': 'restart container', - 'delete_container': 'delete container', + 'destroy_container': 'destroy container', 'list_locations': 'list locations', 'create_cluster': 'create cluster', - 'delete_cluster': 'delete cluster', + 'destroy_cluster': 'destroy cluster', 'list_clusters': 'list clusters' } } http://git-wip-us.apache.org/repos/asf/libcloud/blob/f4c1e2e8/docs/compute/_supported_methods_block_storage.rst ---------------------------------------------------------------------- diff --git a/docs/compute/_supported_methods_block_storage.rst b/docs/compute/_supported_methods_block_storage.rst index f7e8c69..e2f34ed 100644 --- a/docs/compute/_supported_methods_block_storage.rst +++ b/docs/compute/_supported_methods_block_storage.rst @@ -13,6 +13,7 @@ Provider list volumes create volume destroy volume `CloudStack`_ yes yes yes yes yes no yes `Cloudwatt`_ yes yes yes yes yes yes yes `DigitalOcean`_ no no no no no no no +`DimensionData`_ no no no no no no no `Amazon EC2`_ yes yes yes yes yes yes yes `Amazon EC2 (ap-northeast-1)`_ yes yes yes yes yes yes yes `Amazon EC2 (ap-southeast-1)`_ yes yes yes yes yes yes yes @@ -84,6 +85,7 @@ Provider list volumes create volume destroy volume .. _`CloudStack`: http://cloudstack.org/ .. _`Cloudwatt`: https://www.cloudwatt.com/ .. _`DigitalOcean`: https://www.digitalocean.com +.. _`DimensionData`: http://www.dimensiondata.com/ .. _`Amazon EC2`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-northeast-1)`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-southeast-1)`: http://aws.amazon.com/ec2/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/f4c1e2e8/docs/compute/_supported_methods_image_management.rst ---------------------------------------------------------------------- diff --git a/docs/compute/_supported_methods_image_management.rst b/docs/compute/_supported_methods_image_management.rst index 7c60f7a..bcd6d6b 100644 --- a/docs/compute/_supported_methods_image_management.rst +++ b/docs/compute/_supported_methods_image_management.rst @@ -13,6 +13,7 @@ Provider list images get image create image delete `CloudStack`_ yes no no no no `Cloudwatt`_ yes yes yes yes no `DigitalOcean`_ yes yes yes yes no +`DimensionData`_ yes no no no no `Amazon EC2`_ yes yes yes yes yes `Amazon EC2 (ap-northeast-1)`_ yes yes yes yes yes `Amazon EC2 (ap-southeast-1)`_ yes yes yes yes yes @@ -84,6 +85,7 @@ Provider list images get image create image delete .. _`CloudStack`: http://cloudstack.org/ .. _`Cloudwatt`: https://www.cloudwatt.com/ .. _`DigitalOcean`: https://www.digitalocean.com +.. _`DimensionData`: http://www.dimensiondata.com/ .. _`Amazon EC2`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-northeast-1)`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-southeast-1)`: http://aws.amazon.com/ec2/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/f4c1e2e8/docs/compute/_supported_methods_key_pair_management.rst ---------------------------------------------------------------------- diff --git a/docs/compute/_supported_methods_key_pair_management.rst b/docs/compute/_supported_methods_key_pair_management.rst index d39e3cf..b0cfce4 100644 --- a/docs/compute/_supported_methods_key_pair_management.rst +++ b/docs/compute/_supported_methods_key_pair_management.rst @@ -13,6 +13,7 @@ Provider list key pairs get key pair create key pai `CloudStack`_ yes yes yes yes no yes `Cloudwatt`_ yes yes yes yes no yes `DigitalOcean`_ yes yes yes no no yes +`DimensionData`_ no no no no no no `Amazon EC2`_ yes yes yes yes no yes `Amazon EC2 (ap-northeast-1)`_ yes yes yes yes no yes `Amazon EC2 (ap-southeast-1)`_ yes yes yes yes no yes @@ -84,6 +85,7 @@ Provider list key pairs get key pair create key pai .. _`CloudStack`: http://cloudstack.org/ .. _`Cloudwatt`: https://www.cloudwatt.com/ .. _`DigitalOcean`: https://www.digitalocean.com +.. _`DimensionData`: http://www.dimensiondata.com/ .. _`Amazon EC2`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-northeast-1)`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-southeast-1)`: http://aws.amazon.com/ec2/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/f4c1e2e8/docs/compute/_supported_methods_main.rst ---------------------------------------------------------------------- diff --git a/docs/compute/_supported_methods_main.rst b/docs/compute/_supported_methods_main.rst index 1ad3620..67c8966 100644 --- a/docs/compute/_supported_methods_main.rst +++ b/docs/compute/_supported_methods_main.rst @@ -13,6 +13,7 @@ Provider list nodes create node reboot node destroy `CloudStack`_ yes yes yes yes yes yes yes `Cloudwatt`_ yes yes yes yes yes yes yes `DigitalOcean`_ yes yes yes yes yes yes no +`DimensionData`_ yes yes yes yes yes yes yes `Amazon EC2`_ yes yes yes yes yes yes yes `Amazon EC2 (ap-northeast-1)`_ yes yes yes yes yes yes yes `Amazon EC2 (ap-southeast-1)`_ yes yes yes yes yes yes yes @@ -84,6 +85,7 @@ Provider list nodes create node reboot node destroy .. _`CloudStack`: http://cloudstack.org/ .. _`Cloudwatt`: https://www.cloudwatt.com/ .. _`DigitalOcean`: https://www.digitalocean.com +.. _`DimensionData`: http://www.dimensiondata.com/ .. _`Amazon EC2`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-northeast-1)`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-southeast-1)`: http://aws.amazon.com/ec2/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/f4c1e2e8/docs/compute/_supported_providers.rst ---------------------------------------------------------------------- diff --git a/docs/compute/_supported_providers.rst b/docs/compute/_supported_providers.rst index 337bcef..ab7b9d9 100644 --- a/docs/compute/_supported_providers.rst +++ b/docs/compute/_supported_providers.rst @@ -13,6 +13,7 @@ Provider Documentation `CloudStack`_ :doc:`Click </compute/drivers/cloudstack>` CLOUDSTACK :mod:`libcloud.compute.drivers.cloudstack` :class:`CloudStackNodeDriver` `Cloudwatt`_ :doc:`Click </compute/drivers/cloudwatt>` CLOUDWATT :mod:`libcloud.compute.drivers.cloudwatt` :class:`CloudwattNodeDriver` `DigitalOcean`_ :doc:`Click </compute/drivers/digital_ocean>` DIGITAL_OCEAN :mod:`libcloud.compute.drivers.digitalocean` :class:`DigitalOceanNodeDriver` +`DimensionData`_ :doc:`Click </compute/drivers/dimensiondata>` DIMENSIONDATA :mod:`libcloud.compute.drivers.dimensiondata` :class:`DimensionDataNodeDriver` `Amazon EC2`_ :doc:`Click </compute/drivers/ec2>` EC2 :mod:`libcloud.compute.drivers.ec2` :class:`EC2NodeDriver` `Amazon EC2 (ap-northeast-1)`_ EC2_AP_NORTHEAST :mod:`libcloud.compute.drivers.ec2` :class:`EC2APNENodeDriver` `Amazon EC2 (ap-southeast-1)`_ EC2_AP_SOUTHEAST :mod:`libcloud.compute.drivers.ec2` :class:`EC2APSENodeDriver` @@ -84,6 +85,7 @@ Provider Documentation .. _`CloudStack`: http://cloudstack.org/ .. _`Cloudwatt`: https://www.cloudwatt.com/ .. _`DigitalOcean`: https://www.digitalocean.com +.. _`DimensionData`: http://www.dimensiondata.com/ .. _`Amazon EC2`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-northeast-1)`: http://aws.amazon.com/ec2/ .. _`Amazon EC2 (ap-southeast-1)`: http://aws.amazon.com/ec2/ http://git-wip-us.apache.org/repos/asf/libcloud/blob/f4c1e2e8/docs/container/_supported_methods.rst ---------------------------------------------------------------------- diff --git a/docs/container/_supported_methods.rst b/docs/container/_supported_methods.rst index 1a8c963..a62a8e5 100644 --- a/docs/container/_supported_methods.rst +++ b/docs/container/_supported_methods.rst @@ -1,11 +1,13 @@ .. NOTE: This file has been generated automatically using generate_provider_feature_matrix_table.py script, don't manually edit it -========= ============= =========== ================ ============= =============== ============== ================= ================ =============== ============== ============== ============== ============= -Provider install image list images deploy container get container start container stop container restart container delete container list containers list locations create cluster delete cluster list clusters -========= ============= =========== ================ ============= =============== ============== ================= ================ =============== ============== ============== ============== ============= -`Docker`_ yes yes yes yes yes yes yes yes yes no no no no -`Joyent`_ yes yes yes yes yes yes yes yes yes no no no no -========= ============= =========== ================ ============= =============== ============== ================= ================ =============== ============== ============== ============== ============= +=================================== ============= =========== ================ ============= =============== ============== ================= ================= =============== ============== ============== =============== ============= +Provider install image list images deploy container get container start container stop container restart container destroy container list containers list locations create cluster destroy cluster list clusters +=================================== ============= =========== ================ ============= =============== ============== ================= ================= =============== ============== ============== =============== ============= +`Docker`_ yes yes yes yes yes yes yes yes yes no no no no +`Amazon Elastic Container Service`_ yes yes yes yes yes yes yes yes yes no yes yes yes +`Joyent`_ yes yes yes yes yes yes yes yes yes no no no no +=================================== ============= =========== ================ ============= =============== ============== ================= ================= =============== ============== ============== =============== ============= .. _`Docker`: http://docker.io +.. _`Amazon Elastic Container Service`: https://aws.amazon.com/ecs/details/ .. _`Joyent`: http://joyent.com http://git-wip-us.apache.org/repos/asf/libcloud/blob/f4c1e2e8/docs/container/_supported_providers.rst ---------------------------------------------------------------------- diff --git a/docs/container/_supported_providers.rst b/docs/container/_supported_providers.rst index 26f4755..da86a80 100644 --- a/docs/container/_supported_providers.rst +++ b/docs/container/_supported_providers.rst @@ -1,11 +1,13 @@ .. NOTE: This file has been generated automatically using generate_provider_feature_matrix_table.py script, don't manually edit it -========= ======================================== ================= ======================================== ============================== -Provider Documentation Provider constant Module Class Name -========= ======================================== ================= ======================================== ============================== -`Docker`_ :doc:`Click </container/drivers/docker>` DOCKER :mod:`libcloud.container.drivers.docker` :class:`DockerContainerDriver` -`Joyent`_ :doc:`Click </container/drivers/joyent>` JOYENT :mod:`libcloud.container.drivers.joyent` :class:`JoyentContainerDriver` -========= ======================================== ================= ======================================== ============================== +=================================== ======================================== ================= ======================================== =============================== +Provider Documentation Provider constant Module Class Name +=================================== ======================================== ================= ======================================== =============================== +`Docker`_ :doc:`Click </container/drivers/docker>` DOCKER :mod:`libcloud.container.drivers.docker` :class:`DockerContainerDriver` +`Amazon Elastic Container Service`_ ECS :mod:`libcloud.container.drivers.ecs` :class:`ElasticContainerDriver` +`Joyent`_ :doc:`Click </container/drivers/joyent>` JOYENT :mod:`libcloud.container.drivers.joyent` :class:`JoyentContainerDriver` +=================================== ======================================== ================= ======================================== =============================== .. _`Docker`: http://docker.io +.. _`Amazon Elastic Container Service`: https://aws.amazon.com/ecs/details/ .. _`Joyent`: http://joyent.com http://git-wip-us.apache.org/repos/asf/libcloud/blob/f4c1e2e8/libcloud/container/providers.py ---------------------------------------------------------------------- diff --git a/libcloud/container/providers.py b/libcloud/container/providers.py index 45daa88..458eae8 100644 --- a/libcloud/container/providers.py +++ b/libcloud/container/providers.py @@ -24,6 +24,8 @@ DRIVERS = { ('libcloud.container.drivers.docker', 'DockerContainerDriver'), Provider.JOYENT: ('libcloud.container.drivers.joyent', 'JoyentContainerDriver'), + Provider.ECS: + ('libcloud.container.drivers.ecs', 'ElasticContainerDriver'), } http://git-wip-us.apache.org/repos/asf/libcloud/blob/f4c1e2e8/libcloud/container/types.py ---------------------------------------------------------------------- diff --git a/libcloud/container/types.py b/libcloud/container/types.py index 559d779..6236468 100644 --- a/libcloud/container/types.py +++ b/libcloud/container/types.py @@ -43,6 +43,7 @@ class Provider(object): DUMMY = 'dummy' DOCKER = 'docker' JOYENT = 'joyent' + ECS = 'ecs' class ContainerState(Type):
