You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2018/12/13 11:26:28 UTC
[19/45] libcloud git commit: Added documentation for drs via sphinx
and added tests for expand journal.
Added documentation for drs via sphinx and added tests for expand journal.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/614b43d4
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/614b43d4
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/614b43d4
Branch: refs/heads/trunk
Commit: 614b43d47673d626909bfcf23c6c0f020cf232fa
Parents: 1935b5f
Author: mitch <mi...@itaas.dimensiondata.com>
Authored: Tue Nov 6 16:37:56 2018 -0500
Committer: mitch <mi...@itaas.dimensiondata.com>
Committed: Tue Nov 6 16:37:56 2018 -0500
----------------------------------------------------------------------
.../generate_provider_feature_matrix_table.py | 26 ++++
.../_supported_methods_block_storage.rst | 6 +
.../_supported_methods_image_management.rst | 6 +
.../_supported_methods_key_pair_management.rst | 6 +
docs/compute/_supported_methods_main.rst | 6 +
docs/compute/_supported_providers.rst | 127 ++++++++++---------
docs/dns/_supported_providers.rst | 2 +-
docs/drs/drivers/index.rst | 12 ++
docs/drs/drivers/nttcis.rst | 18 +++
docs/drs/index.rst | 15 +++
docs/drs/supported_providers.rst | 14 ++
docs/examples/drs/__init__.py | 0
docs/examples/drs/nttcis/__init__.py | 0
.../drs/nttcis/add_consistency_group.py | 26 ++++
docs/index.rst | 2 +
docs/loadbalancer/_supported_methods.rst | 2 +
docs/loadbalancer/_supported_providers.rst | 2 +
docs/storage/_supported_methods_cdn.rst | 4 +
docs/storage/_supported_methods_main.rst | 2 +
docs/storage/_supported_providers.rst | 2 +
libcloud/common/nttcis.py | 4 -
libcloud/compute/drivers/nttcis.py | 111 ++++++++++++++--
libcloud/drs/base.py | 4 +-
libcloud/drs/drivers/nttcis.py | 42 ++++--
libcloud/loadbalancer/drivers/nttcis.py | 1 +
libcloud/test/drs/fixtures/nttcis/expand_cg.xml | 6 +
libcloud/test/drs/test_nttcis.py | 19 +++
tests/lib_edit_test.py | 7 +
28 files changed, 380 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/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 f492001..419baee 100755
--- a/contrib/generate_provider_feature_matrix_table.py
+++ b/contrib/generate_provider_feature_matrix_table.py
@@ -45,6 +45,11 @@ from libcloud.dns.providers import get_driver as get_dns_driver
from libcloud.dns.providers import DRIVERS as DNS_DRIVERS
from libcloud.dns.types import Provider as DNSProvider
+from libcloud.drs.base import DRSDriver
+from libcloud.drs.providers import get_driver as get_drs_driver
+from libcloud.drs.providers import DRIVERS as DRS_DRIVERS
+from libcloud.drs.types import Provider as DRSProvider
+
from libcloud.container.base import ContainerDriver
from libcloud.container.providers import get_driver as get_container_driver
from libcloud.container.providers import DRIVERS as CONTAINER_DRIVERS
@@ -89,6 +94,11 @@ BASE_API_METHODS = {
'dns': ['list_zones', 'list_records', 'iterate_zones', 'iterate_records',
'create_zone', 'update_zone', 'create_record', 'update_record',
'delete_zone', 'delete_record'],
+ 'drs': ['create_consistency_group', 'list_consistency_groups',
+ 'get_consistency_group', 'delete_consistency_group',
+ 'list_consistency_group_snapshots', 'expand_journal',
+ 'start_failover_preview', 'stop_failover_preview',
+ 'initiate_failover'],
'container': ['install_image', 'list_images', 'deploy_container',
'get_container', 'start_container', 'stop_container',
'restart_container', 'destroy_container', 'list_containers',
@@ -169,6 +179,17 @@ FRIENDLY_METHODS_NAMES = {
'delete_zone': 'delete zone',
'delete_record': 'delete record'
},
+ 'drs': {
+ 'create_consistency_group': 'create_consistency_group',
+ 'list_consistency_groups': 'list_consistency_groups',
+ 'get_consistency_group': 'get_consistency_group',
+ 'delete_consistency_group': 'delete_consistency_group',
+ 'list_consistency_group_snapshots': 'list_consistency_group_snapshots',
+ 'expand_journal': 'expand_journal',
+ 'start_failover_preview': 'start_failover_preview',
+ 'stop_failover_preview': 'stop_failover_preview',
+ 'initiate_failover': 'initiate_failover'
+ },
'container': {
'install_image': 'install image',
'list_images': 'list images',
@@ -242,6 +263,11 @@ def generate_providers_table(api):
drivers = DNS_DRIVERS
provider = DNSProvider
get_driver_method = get_dns_driver
+ elif api == 'drs':
+ driver = DRSDriver
+ drivers = DRS_DRIVERS
+ provider = DRSProvider
+ get_driver_method = get_drs_driver
elif api == 'container':
driver = ContainerDriver
drivers = CONTAINER_DRIVERS
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/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 bacdb08..fea231c 100644
--- a/docs/compute/_supported_methods_block_storage.rst
+++ b/docs/compute/_supported_methods_block_storage.rst
@@ -38,6 +38,7 @@ Provider list volumes create volume destroy volume
`NephoScale`_ no no no no no no no
`Nimbus`_ yes yes yes yes yes yes yes
`NTTAmerica`_ no no no no no no no
+`NTTC-CIS`_ no no no no no no no
`OnApp`_ no no no no no no no
`1and1`_ no no no no no no no
`OpenNebula (v3.8)`_ yes yes yes yes yes no no
@@ -50,10 +51,12 @@ Provider list volumes create volume destroy volume
`Rackspace Cloud (Next Gen)`_ yes yes yes yes yes yes yes
`Rackspace Cloud (First Gen)`_ yes yes yes yes yes no no
`RimuHosting`_ no no no no no no no
+`Scaleway`_ yes yes yes no no yes yes
`ServerLove`_ no no no no no no no
`skalicloud`_ no no no no no no no
`SoftLayer`_ no no no no no no no
`vCloud`_ no no no no no no no
+`Upcloud`_ no no no no no no no
`VCL`_ no no no no no no no
`vCloud`_ no no no no no no no
`Voxel VoxCLOUD`_ no no no no no no no
@@ -96,6 +99,7 @@ Provider list volumes create volume destroy volume
.. _`NephoScale`: http://www.nephoscale.com
.. _`Nimbus`: http://www.nimbusproject.org/
.. _`NTTAmerica`: http://www.nttamerica.com/
+.. _`NTTC-CIS`: https://www.us.ntt.com/en/services/cloud/enterprise-cloud.html
.. _`OnApp`: http://onapp.com/
.. _`1and1`: http://www.1and1.com
.. _`OpenNebula (v3.8)`: http://opennebula.org/
@@ -108,10 +112,12 @@ Provider list volumes create volume destroy volume
.. _`Rackspace Cloud (Next Gen)`: http://www.rackspace.com
.. _`Rackspace Cloud (First Gen)`: http://www.rackspace.com
.. _`RimuHosting`: http://rimuhosting.com/
+.. _`Scaleway`: https://www.scaleway.com/
.. _`ServerLove`: http://www.serverlove.com/
.. _`skalicloud`: http://www.skalicloud.com/
.. _`SoftLayer`: http://www.softlayer.com/
.. _`vCloud`: http://www.vmware.com/products/vcloud/
+.. _`Upcloud`: https://www.upcloud.com
.. _`VCL`: http://incubator.apache.org/vcl/
.. _`vCloud`: http://www.vmware.com/products/vcloud/
.. _`Voxel VoxCLOUD`: http://www.voxel.net/
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/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 a426a8c..0a4ec92 100644
--- a/docs/compute/_supported_methods_image_management.rst
+++ b/docs/compute/_supported_methods_image_management.rst
@@ -38,6 +38,7 @@ Provider list images get image create image delete
`NephoScale`_ yes no no no no
`Nimbus`_ yes yes yes yes yes
`NTTAmerica`_ yes no no no no
+`NTTC-CIS`_ yes no no no no
`OnApp`_ yes no no no no
`1and1`_ yes yes no no no
`OpenNebula (v3.8)`_ yes no no no no
@@ -50,10 +51,12 @@ Provider list images get image create image delete
`Rackspace Cloud (Next Gen)`_ yes yes yes yes no
`Rackspace Cloud (First Gen)`_ yes yes yes yes no
`RimuHosting`_ yes no no no no
+`Scaleway`_ yes yes yes yes no
`ServerLove`_ yes no no no no
`skalicloud`_ yes no no no no
`SoftLayer`_ yes yes no no no
`vCloud`_ yes no no no no
+`Upcloud`_ yes no no no no
`VCL`_ yes no no no no
`vCloud`_ yes no no no no
`Voxel VoxCLOUD`_ yes no no no no
@@ -96,6 +99,7 @@ Provider list images get image create image delete
.. _`NephoScale`: http://www.nephoscale.com
.. _`Nimbus`: http://www.nimbusproject.org/
.. _`NTTAmerica`: http://www.nttamerica.com/
+.. _`NTTC-CIS`: https://www.us.ntt.com/en/services/cloud/enterprise-cloud.html
.. _`OnApp`: http://onapp.com/
.. _`1and1`: http://www.1and1.com
.. _`OpenNebula (v3.8)`: http://opennebula.org/
@@ -108,10 +112,12 @@ Provider list images get image create image delete
.. _`Rackspace Cloud (Next Gen)`: http://www.rackspace.com
.. _`Rackspace Cloud (First Gen)`: http://www.rackspace.com
.. _`RimuHosting`: http://rimuhosting.com/
+.. _`Scaleway`: https://www.scaleway.com/
.. _`ServerLove`: http://www.serverlove.com/
.. _`skalicloud`: http://www.skalicloud.com/
.. _`SoftLayer`: http://www.softlayer.com/
.. _`vCloud`: http://www.vmware.com/products/vcloud/
+.. _`Upcloud`: https://www.upcloud.com
.. _`VCL`: http://incubator.apache.org/vcl/
.. _`vCloud`: http://www.vmware.com/products/vcloud/
.. _`Voxel VoxCLOUD`: http://www.voxel.net/
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/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 a3799f8..11bfe45 100644
--- a/docs/compute/_supported_methods_key_pair_management.rst
+++ b/docs/compute/_supported_methods_key_pair_management.rst
@@ -38,6 +38,7 @@ Provider list key pairs get key pair create key pai
`NephoScale`_ no no no no no no
`Nimbus`_ yes yes yes yes no yes
`NTTAmerica`_ no no no no no no
+`NTTC-CIS`_ no no no no no no
`OnApp`_ yes yes no yes no yes
`1and1`_ no no no no no no
`OpenNebula (v3.8)`_ no no no no no no
@@ -50,10 +51,12 @@ Provider list key pairs get key pair create key pai
`Rackspace Cloud (Next Gen)`_ yes yes yes yes no yes
`Rackspace Cloud (First Gen)`_ no no no no no no
`RimuHosting`_ no no no no no no
+`Scaleway`_ yes no no yes no yes
`ServerLove`_ no no no no no no
`skalicloud`_ no no no no no no
`SoftLayer`_ yes yes yes yes no yes
`vCloud`_ no no no no no no
+`Upcloud`_ no no no no no no
`VCL`_ no no no no no no
`vCloud`_ no no no no no no
`Voxel VoxCLOUD`_ no no no no no no
@@ -96,6 +99,7 @@ Provider list key pairs get key pair create key pai
.. _`NephoScale`: http://www.nephoscale.com
.. _`Nimbus`: http://www.nimbusproject.org/
.. _`NTTAmerica`: http://www.nttamerica.com/
+.. _`NTTC-CIS`: https://www.us.ntt.com/en/services/cloud/enterprise-cloud.html
.. _`OnApp`: http://onapp.com/
.. _`1and1`: http://www.1and1.com
.. _`OpenNebula (v3.8)`: http://opennebula.org/
@@ -108,10 +112,12 @@ Provider list key pairs get key pair create key pai
.. _`Rackspace Cloud (Next Gen)`: http://www.rackspace.com
.. _`Rackspace Cloud (First Gen)`: http://www.rackspace.com
.. _`RimuHosting`: http://rimuhosting.com/
+.. _`Scaleway`: https://www.scaleway.com/
.. _`ServerLove`: http://www.serverlove.com/
.. _`skalicloud`: http://www.skalicloud.com/
.. _`SoftLayer`: http://www.softlayer.com/
.. _`vCloud`: http://www.vmware.com/products/vcloud/
+.. _`Upcloud`: https://www.upcloud.com
.. _`VCL`: http://incubator.apache.org/vcl/
.. _`vCloud`: http://www.vmware.com/products/vcloud/
.. _`Voxel VoxCLOUD`: http://www.voxel.net/
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/compute/_supported_methods_main.rst
----------------------------------------------------------------------
diff --git a/docs/compute/_supported_methods_main.rst b/docs/compute/_supported_methods_main.rst
index 4f0e0ca..325181e 100644
--- a/docs/compute/_supported_methods_main.rst
+++ b/docs/compute/_supported_methods_main.rst
@@ -38,6 +38,7 @@ Provider list nodes create node reboot node destroy
`NephoScale`_ yes yes yes yes yes yes yes
`Nimbus`_ yes yes yes yes yes yes yes
`NTTAmerica`_ yes yes yes yes yes yes yes
+`NTTC-CIS`_ yes yes yes yes yes yes yes
`OnApp`_ yes yes no yes yes no no
`1and1`_ yes yes yes yes yes yes no
`OpenNebula (v3.8)`_ yes yes yes yes yes yes no
@@ -50,10 +51,12 @@ Provider list nodes create node reboot node destroy
`Rackspace Cloud (Next Gen)`_ yes yes yes yes yes yes yes
`Rackspace Cloud (First Gen)`_ yes yes yes yes yes yes yes
`RimuHosting`_ yes yes yes yes yes yes yes
+`Scaleway`_ yes yes yes yes yes yes no
`ServerLove`_ yes yes yes yes yes yes yes
`skalicloud`_ yes yes yes yes yes yes yes
`SoftLayer`_ yes yes yes yes yes yes yes
`vCloud`_ yes yes yes yes yes yes yes
+`Upcloud`_ yes yes yes yes yes yes yes
`VCL`_ yes yes no yes yes yes no
`vCloud`_ yes yes yes yes yes yes yes
`Voxel VoxCLOUD`_ yes yes yes yes yes yes no
@@ -96,6 +99,7 @@ Provider list nodes create node reboot node destroy
.. _`NephoScale`: http://www.nephoscale.com
.. _`Nimbus`: http://www.nimbusproject.org/
.. _`NTTAmerica`: http://www.nttamerica.com/
+.. _`NTTC-CIS`: https://www.us.ntt.com/en/services/cloud/enterprise-cloud.html
.. _`OnApp`: http://onapp.com/
.. _`1and1`: http://www.1and1.com
.. _`OpenNebula (v3.8)`: http://opennebula.org/
@@ -108,10 +112,12 @@ Provider list nodes create node reboot node destroy
.. _`Rackspace Cloud (Next Gen)`: http://www.rackspace.com
.. _`Rackspace Cloud (First Gen)`: http://www.rackspace.com
.. _`RimuHosting`: http://rimuhosting.com/
+.. _`Scaleway`: https://www.scaleway.com/
.. _`ServerLove`: http://www.serverlove.com/
.. _`skalicloud`: http://www.skalicloud.com/
.. _`SoftLayer`: http://www.softlayer.com/
.. _`vCloud`: http://www.vmware.com/products/vcloud/
+.. _`Upcloud`: https://www.upcloud.com
.. _`VCL`: http://incubator.apache.org/vcl/
.. _`vCloud`: http://www.vmware.com/products/vcloud/
.. _`Voxel VoxCLOUD`: http://www.voxel.net/
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/compute/_supported_providers.rst
----------------------------------------------------------------------
diff --git a/docs/compute/_supported_providers.rst b/docs/compute/_supported_providers.rst
index 2c0c8f8..bea6246 100644
--- a/docs/compute/_supported_providers.rst
+++ b/docs/compute/_supported_providers.rst
@@ -1,66 +1,68 @@
.. NOTE: This file has been generated automatically using generate_provider_feature_matrix_table.py script, don't manually edit it
-===================================== ================================================= =================== ================================================================================================================================================================================================== ================================================= ====================================
-Provider Documentation Provider Constant Supported Regions Module Class Name
-===================================== ================================================= =================== ================================================================================================================================================================================================== ================================================= ====================================
-`Abiquo`_ ABIQUO single region driver :mod:`libcloud.compute.drivers.abiquo` :class:`AbiquoNodeDriver`
-`Aliyun ECS`_ :doc:`Click </compute/drivers/aliyun_ecs>` ALIYUN_ECS single region driver :mod:`libcloud.compute.drivers.ecs` :class:`ECSDriver`
-`PCextreme AuroraCompute`_ :doc:`Click </compute/drivers/auroracompute>` AURORACOMPUTE single region driver :mod:`libcloud.compute.drivers.auroracompute` :class:`AuroraComputeNodeDriver`
-`Azure Virtual machines`_ :doc:`Click </compute/drivers/azure>` AZURE single region driver :mod:`libcloud.compute.drivers.azure` :class:`AzureNodeDriver`
-`Azure Virtual machines`_ :doc:`Click </compute/drivers/azure_arm>` AZURE_ARM single region driver :mod:`libcloud.compute.drivers.azure_arm` :class:`AzureNodeDriver`
-`Bluebox Blocks`_ BLUEBOX single region driver :mod:`libcloud.compute.drivers.bluebox` :class:`BlueboxNodeDriver`
-`Brightbox`_ BRIGHTBOX single region driver :mod:`libcloud.compute.drivers.brightbox` :class:`BrightboxNodeDriver`
-`BSNL`_ :doc:`Click </compute/drivers/bsnl>` BSNL single region driver :mod:`libcloud.compute.drivers.bsnl` :class:`BSNLNodeDriver`
-`Cloudscale`_ :doc:`Click </compute/drivers/cloudscale>` CLOUDSCALE single region driver :mod:`libcloud.compute.drivers.cloudscale` :class:`CloudscaleNodeDriver`
-`CloudSigma (API v2.0)`_ :doc:`Click </compute/drivers/cloudsigma>` CLOUDSIGMA single region driver :mod:`libcloud.compute.drivers.cloudsigma` :class:`CloudSigmaNodeDriver`
-`CloudStack`_ :doc:`Click </compute/drivers/cloudstack>` CLOUDSTACK single region driver :mod:`libcloud.compute.drivers.cloudstack` :class:`CloudStackNodeDriver`
-`Cloudwatt`_ :doc:`Click </compute/drivers/cloudwatt>` CLOUDWATT single region driver :mod:`libcloud.compute.drivers.cloudwatt` :class:`CloudwattNodeDriver`
-`DigitalOcean`_ :doc:`Click </compute/drivers/digital_ocean>` DIGITAL_OCEAN single region driver :mod:`libcloud.compute.drivers.digitalocean` :class:`DigitalOceanNodeDriver`
-`DimensionData`_ :doc:`Click </compute/drivers/dimensiondata>` DIMENSIONDATA single region driver :mod:`libcloud.compute.drivers.dimensiondata` :class:`DimensionDataNodeDriver`
-`Amazon EC2`_ :doc:`Click </compute/drivers/ec2>` EC2 ap-northeast-1, ap-northeast-2, ap-south-1, ap-southeast-1, ap-southeast-2, ca-central-1, eu-central-1, eu-west-1, eu-west-2, sa-east-1, us-east-1, us-east-2, us-gov-west-1, us-west-1, us-west-2 :mod:`libcloud.compute.drivers.ec2` :class:`EC2NodeDriver`
-`Enomaly Elastic Computing Platform`_ ECP single region driver :mod:`libcloud.compute.drivers.ecp` :class:`ECPNodeDriver`
-`ElasticHosts`_ ELASTICHOSTS single region driver :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsNodeDriver`
-`Eucalyptus`_ EUCALYPTUS single region driver :mod:`libcloud.compute.drivers.ec2` :class:`EucNodeDriver`
-`Exoscale`_ :doc:`Click </compute/drivers/exoscale>` EXOSCALE single region driver :mod:`libcloud.compute.drivers.exoscale` :class:`ExoscaleNodeDriver`
-`Gandi`_ :doc:`Click </compute/drivers/gandi>` GANDI single region driver :mod:`libcloud.compute.drivers.gandi` :class:`GandiNodeDriver`
-`Google Compute Engine`_ :doc:`Click </compute/drivers/gce>` GCE single region driver :mod:`libcloud.compute.drivers.gce` :class:`GCENodeDriver`
-`GoGrid`_ GOGRID single region driver :mod:`libcloud.compute.drivers.gogrid` :class:`GoGridNodeDriver`
-`HostVirtual`_ HOSTVIRTUAL single region driver :mod:`libcloud.compute.drivers.hostvirtual` :class:`HostVirtualNodeDriver`
-`Ikoula`_ :doc:`Click </compute/drivers/ikoula>` IKOULA single region driver :mod:`libcloud.compute.drivers.ikoula` :class:`IkoulaNodeDriver`
-`Indosat`_ :doc:`Click </compute/drivers/indosat>` INDOSAT single region driver :mod:`libcloud.compute.drivers.indosat` :class:`IndosatNodeDriver`
-`InternetSolutions`_ :doc:`Click </compute/drivers/internetsolutions>` INTERNETSOLUTIONS single region driver :mod:`libcloud.compute.drivers.internetsolutions` :class:`InternetSolutionsNodeDriver`
-`Joyent`_ JOYENT single region driver :mod:`libcloud.compute.drivers.joyent` :class:`JoyentNodeDriver`
-`Kili Public Cloud`_ :doc:`Click </compute/drivers/kili>` KILI single region driver :mod:`libcloud.compute.drivers.kili` :class:`KiliCloudNodeDriver`
-`KTUCloud`_ KTUCLOUD single region driver :mod:`libcloud.compute.drivers.ktucloud` :class:`KTUCloudNodeDriver`
-`Libvirt`_ :doc:`Click </compute/drivers/libvirt>` LIBVIRT single region driver :mod:`libcloud.compute.drivers.libvirt_driver` :class:`LibvirtNodeDriver`
-`Linode`_ LINODE single region driver :mod:`libcloud.compute.drivers.linode` :class:`LinodeNodeDriver`
-`MedOne`_ :doc:`Click </compute/drivers/medone>` MEDONE single region driver :mod:`libcloud.compute.drivers.medone` :class:`MedOneNodeDriver`
-`NephoScale`_ NEPHOSCALE single region driver :mod:`libcloud.compute.drivers.nephoscale` :class:`NephoscaleNodeDriver`
-`Nimbus`_ :doc:`Click </compute/drivers/nimbus>` NIMBUS single region driver :mod:`libcloud.compute.drivers.ec2` :class:`NimbusNodeDriver`
-`NTTAmerica`_ :doc:`Click </compute/drivers/ntta>` NTTA single region driver :mod:`libcloud.compute.drivers.ntta` :class:`NTTAmericaNodeDriver`
-`NTTC-CIS`_ :doc:`Click </compute/drivers/nttcis>` NTTC single region driver :mod:`libcloud.compute.dirver.nttcis` :class:`NttCisNodeDriver`
-`OnApp`_ :doc:`Click </compute/drivers/onapp>` ONAPP single region driver :mod:`libcloud.compute.drivers.onapp` :class:`OnAppNodeDriver`
-`1and1`_ :doc:`Click </compute/drivers/oneandone>` ONEANDONE single region driver :mod:`libcloud.compute.drivers.oneandone` :class:`OneAndOneNodeDriver`
-`OpenNebula (v3.8)`_ OPENNEBULA single region driver :mod:`libcloud.compute.drivers.opennebula` :class:`OpenNebulaNodeDriver`
-`OpenStack`_ :doc:`Click </compute/drivers/openstack>` OPENSTACK single region driver :mod:`libcloud.compute.drivers.openstack` :class:`OpenStackNodeDriver`
-`Outscale INC`_ :doc:`Click </compute/drivers/outscale_inc>` OUTSCALE_INC single region driver :mod:`libcloud.compute.drivers.ec2` :class:`OutscaleINCNodeDriver`
-`Outscale SAS`_ :doc:`Click </compute/drivers/outscale_sas>` OUTSCALE_SAS single region driver :mod:`libcloud.compute.drivers.ec2` :class:`OutscaleSASNodeDriver`
-`Ovh`_ :doc:`Click </compute/drivers/ovh>` OVH single region driver :mod:`libcloud.compute.drivers.ovh` :class:`OvhNodeDriver`
-`Packet`_ :doc:`Click </compute/drivers/packet>` PACKET single region driver :mod:`libcloud.compute.drivers.packet` :class:`PacketNodeDriver`
-`ProfitBricks`_ PROFIT_BRICKS single region driver :mod:`libcloud.compute.drivers.profitbricks` :class:`ProfitBricksNodeDriver`
-`Rackspace Cloud (Next Gen)`_ :doc:`Click </compute/drivers/rackspace>` RACKSPACE single region driver :mod:`libcloud.compute.drivers.rackspace` :class:`RackspaceNodeDriver`
-`Rackspace Cloud (First Gen)`_ RACKSPACE_FIRST_GEN single region driver :mod:`libcloud.compute.drivers.rackspace` :class:`RackspaceFirstGenNodeDriver`
-`RimuHosting`_ RIMUHOSTING single region driver :mod:`libcloud.compute.drivers.rimuhosting` :class:`RimuHostingNodeDriver`
-`ServerLove`_ SERVERLOVE single region driver :mod:`libcloud.compute.drivers.serverlove` :class:`ServerLoveNodeDriver`
-`skalicloud`_ SKALICLOUD single region driver :mod:`libcloud.compute.drivers.skalicloud` :class:`SkaliCloudNodeDriver`
-`SoftLayer`_ SOFTLAYER single region driver :mod:`libcloud.compute.drivers.softlayer` :class:`SoftLayerNodeDriver`
-`vCloud`_ TERREMARK single region driver :mod:`libcloud.compute.drivers.vcloud` :class:`TerremarkDriver`
-`VCL`_ VCL single region driver :mod:`libcloud.compute.drivers.vcl` :class:`VCLNodeDriver`
-`vCloud`_ :doc:`Click </compute/drivers/vcloud>` VCLOUD single region driver :mod:`libcloud.compute.drivers.vcloud` :class:`VCloudNodeDriver`
-`Voxel VoxCLOUD`_ VOXEL single region driver :mod:`libcloud.compute.drivers.voxel` :class:`VoxelNodeDriver`
-`vps.net`_ VPSNET single region driver :mod:`libcloud.compute.drivers.vpsnet` :class:`VPSNetNodeDriver`
-`Vultr`_ :doc:`Click </compute/drivers/vultr>` VULTR single region driver :mod:`libcloud.compute.drivers.vultr` :class:`VultrNodeDriver`
-===================================== ================================================= =================== ================================================================================================================================================================================================== ================================================= ====================================
+===================================== ================================================= =================== ========================================================================================================================================================================================================================================================= ================================================= ====================================
+Provider Documentation Provider Constant Supported Regions Module Class Name
+===================================== ================================================= =================== ========================================================================================================================================================================================================================================================= ================================================= ====================================
+`Abiquo`_ ABIQUO single region driver :mod:`libcloud.compute.drivers.abiquo` :class:`AbiquoNodeDriver`
+`Aliyun ECS`_ :doc:`Click </compute/drivers/aliyun_ecs>` ALIYUN_ECS single region driver :mod:`libcloud.compute.drivers.ecs` :class:`ECSDriver`
+`PCextreme AuroraCompute`_ :doc:`Click </compute/drivers/auroracompute>` AURORACOMPUTE single region driver :mod:`libcloud.compute.drivers.auroracompute` :class:`AuroraComputeNodeDriver`
+`Azure Virtual machines`_ :doc:`Click </compute/drivers/azure>` AZURE single region driver :mod:`libcloud.compute.drivers.azure` :class:`AzureNodeDriver`
+`Azure Virtual machines`_ :doc:`Click </compute/drivers/azure_arm>` AZURE_ARM single region driver :mod:`libcloud.compute.drivers.azure_arm` :class:`AzureNodeDriver`
+`Bluebox Blocks`_ BLUEBOX single region driver :mod:`libcloud.compute.drivers.bluebox` :class:`BlueboxNodeDriver`
+`Brightbox`_ BRIGHTBOX single region driver :mod:`libcloud.compute.drivers.brightbox` :class:`BrightboxNodeDriver`
+`BSNL`_ :doc:`Click </compute/drivers/bsnl>` BSNL single region driver :mod:`libcloud.compute.drivers.bsnl` :class:`BSNLNodeDriver`
+`Cloudscale`_ :doc:`Click </compute/drivers/cloudscale>` CLOUDSCALE single region driver :mod:`libcloud.compute.drivers.cloudscale` :class:`CloudscaleNodeDriver`
+`CloudSigma (API v2.0)`_ :doc:`Click </compute/drivers/cloudsigma>` CLOUDSIGMA single region driver :mod:`libcloud.compute.drivers.cloudsigma` :class:`CloudSigmaNodeDriver`
+`CloudStack`_ :doc:`Click </compute/drivers/cloudstack>` CLOUDSTACK single region driver :mod:`libcloud.compute.drivers.cloudstack` :class:`CloudStackNodeDriver`
+`Cloudwatt`_ :doc:`Click </compute/drivers/cloudwatt>` CLOUDWATT single region driver :mod:`libcloud.compute.drivers.cloudwatt` :class:`CloudwattNodeDriver`
+`DigitalOcean`_ :doc:`Click </compute/drivers/digital_ocean>` DIGITAL_OCEAN single region driver :mod:`libcloud.compute.drivers.digitalocean` :class:`DigitalOceanNodeDriver`
+`DimensionData`_ :doc:`Click </compute/drivers/dimensiondata>` DIMENSIONDATA single region driver :mod:`libcloud.compute.drivers.dimensiondata` :class:`DimensionDataNodeDriver`
+`Amazon EC2`_ :doc:`Click </compute/drivers/ec2>` EC2 ap-northeast-1, ap-northeast-2, ap-northeast-3, ap-south-1, ap-southeast-1, ap-southeast-2, ca-central-1, cn-north-1, cn-northwest-1, eu-central-1, eu-west-1, eu-west-2, eu-west-3, sa-east-1, us-east-1, us-east-2, us-gov-west-1, us-west-1, us-west-2 :mod:`libcloud.compute.drivers.ec2` :class:`EC2NodeDriver`
+`Enomaly Elastic Computing Platform`_ ECP single region driver :mod:`libcloud.compute.drivers.ecp` :class:`ECPNodeDriver`
+`ElasticHosts`_ ELASTICHOSTS single region driver :mod:`libcloud.compute.drivers.elastichosts` :class:`ElasticHostsNodeDriver`
+`Eucalyptus`_ EUCALYPTUS single region driver :mod:`libcloud.compute.drivers.ec2` :class:`EucNodeDriver`
+`Exoscale`_ :doc:`Click </compute/drivers/exoscale>` EXOSCALE single region driver :mod:`libcloud.compute.drivers.exoscale` :class:`ExoscaleNodeDriver`
+`Gandi`_ :doc:`Click </compute/drivers/gandi>` GANDI single region driver :mod:`libcloud.compute.drivers.gandi` :class:`GandiNodeDriver`
+`Google Compute Engine`_ :doc:`Click </compute/drivers/gce>` GCE single region driver :mod:`libcloud.compute.drivers.gce` :class:`GCENodeDriver`
+`GoGrid`_ GOGRID single region driver :mod:`libcloud.compute.drivers.gogrid` :class:`GoGridNodeDriver`
+`HostVirtual`_ HOSTVIRTUAL single region driver :mod:`libcloud.compute.drivers.hostvirtual` :class:`HostVirtualNodeDriver`
+`Ikoula`_ :doc:`Click </compute/drivers/ikoula>` IKOULA single region driver :mod:`libcloud.compute.drivers.ikoula` :class:`IkoulaNodeDriver`
+`Indosat`_ :doc:`Click </compute/drivers/indosat>` INDOSAT single region driver :mod:`libcloud.compute.drivers.indosat` :class:`IndosatNodeDriver`
+`InternetSolutions`_ :doc:`Click </compute/drivers/internetsolutions>` INTERNETSOLUTIONS single region driver :mod:`libcloud.compute.drivers.internetsolutions` :class:`InternetSolutionsNodeDriver`
+`Joyent`_ JOYENT single region driver :mod:`libcloud.compute.drivers.joyent` :class:`JoyentNodeDriver`
+`Kili Public Cloud`_ :doc:`Click </compute/drivers/kili>` KILI single region driver :mod:`libcloud.compute.drivers.kili` :class:`KiliCloudNodeDriver`
+`KTUCloud`_ KTUCLOUD single region driver :mod:`libcloud.compute.drivers.ktucloud` :class:`KTUCloudNodeDriver`
+`Libvirt`_ :doc:`Click </compute/drivers/libvirt>` LIBVIRT single region driver :mod:`libcloud.compute.drivers.libvirt_driver` :class:`LibvirtNodeDriver`
+`Linode`_ LINODE single region driver :mod:`libcloud.compute.drivers.linode` :class:`LinodeNodeDriver`
+`MedOne`_ :doc:`Click </compute/drivers/medone>` MEDONE single region driver :mod:`libcloud.compute.drivers.medone` :class:`MedOneNodeDriver`
+`NephoScale`_ NEPHOSCALE single region driver :mod:`libcloud.compute.drivers.nephoscale` :class:`NephoscaleNodeDriver`
+`Nimbus`_ :doc:`Click </compute/drivers/nimbus>` NIMBUS single region driver :mod:`libcloud.compute.drivers.ec2` :class:`NimbusNodeDriver`
+`NTTAmerica`_ :doc:`Click </compute/drivers/ntta>` NTTA single region driver :mod:`libcloud.compute.drivers.ntta` :class:`NTTAmericaNodeDriver`
+`NTTC-CIS`_ :doc:`Click </compute/drivers/nttcis>` NTTCIS single region driver :mod:`libcloud.compute.drivers.nttcis` :class:`NttCisNodeDriver`
+`OnApp`_ :doc:`Click </compute/drivers/onapp>` ONAPP single region driver :mod:`libcloud.compute.drivers.onapp` :class:`OnAppNodeDriver`
+`1and1`_ :doc:`Click </compute/drivers/oneandone>` ONEANDONE single region driver :mod:`libcloud.compute.drivers.oneandone` :class:`OneAndOneNodeDriver`
+`OpenNebula (v3.8)`_ OPENNEBULA single region driver :mod:`libcloud.compute.drivers.opennebula` :class:`OpenNebulaNodeDriver`
+`OpenStack`_ :doc:`Click </compute/drivers/openstack>` OPENSTACK single region driver :mod:`libcloud.compute.drivers.openstack` :class:`OpenStackNodeDriver`
+`Outscale INC`_ :doc:`Click </compute/drivers/outscale_inc>` OUTSCALE_INC single region driver :mod:`libcloud.compute.drivers.ec2` :class:`OutscaleINCNodeDriver`
+`Outscale SAS`_ :doc:`Click </compute/drivers/outscale_sas>` OUTSCALE_SAS single region driver :mod:`libcloud.compute.drivers.ec2` :class:`OutscaleSASNodeDriver`
+`Ovh`_ :doc:`Click </compute/drivers/ovh>` OVH single region driver :mod:`libcloud.compute.drivers.ovh` :class:`OvhNodeDriver`
+`Packet`_ :doc:`Click </compute/drivers/packet>` PACKET single region driver :mod:`libcloud.compute.drivers.packet` :class:`PacketNodeDriver`
+`ProfitBricks`_ PROFIT_BRICKS single region driver :mod:`libcloud.compute.drivers.profitbricks` :class:`ProfitBricksNodeDriver`
+`Rackspace Cloud (Next Gen)`_ :doc:`Click </compute/drivers/rackspace>` RACKSPACE single region driver :mod:`libcloud.compute.drivers.rackspace` :class:`RackspaceNodeDriver`
+`Rackspace Cloud (First Gen)`_ RACKSPACE_FIRST_GEN single region driver :mod:`libcloud.compute.drivers.rackspace` :class:`RackspaceFirstGenNodeDriver`
+`RimuHosting`_ RIMUHOSTING single region driver :mod:`libcloud.compute.drivers.rimuhosting` :class:`RimuHostingNodeDriver`
+`Scaleway`_ :doc:`Click </compute/drivers/scaleway>` SCALEWAY single region driver :mod:`libcloud.compute.drivers.scaleway` :class:`ScalewayNodeDriver`
+`ServerLove`_ SERVERLOVE single region driver :mod:`libcloud.compute.drivers.serverlove` :class:`ServerLoveNodeDriver`
+`skalicloud`_ SKALICLOUD single region driver :mod:`libcloud.compute.drivers.skalicloud` :class:`SkaliCloudNodeDriver`
+`SoftLayer`_ SOFTLAYER single region driver :mod:`libcloud.compute.drivers.softlayer` :class:`SoftLayerNodeDriver`
+`vCloud`_ TERREMARK single region driver :mod:`libcloud.compute.drivers.vcloud` :class:`TerremarkDriver`
+`Upcloud`_ :doc:`Click </compute/drivers/upcloud>` UPCLOUD single region driver :mod:`libcloud.compute.drivers.upcloud` :class:`UpcloudDriver`
+`VCL`_ VCL single region driver :mod:`libcloud.compute.drivers.vcl` :class:`VCLNodeDriver`
+`vCloud`_ :doc:`Click </compute/drivers/vcloud>` VCLOUD single region driver :mod:`libcloud.compute.drivers.vcloud` :class:`VCloudNodeDriver`
+`Voxel VoxCLOUD`_ VOXEL single region driver :mod:`libcloud.compute.drivers.voxel` :class:`VoxelNodeDriver`
+`vps.net`_ VPSNET single region driver :mod:`libcloud.compute.drivers.vpsnet` :class:`VPSNetNodeDriver`
+`Vultr`_ :doc:`Click </compute/drivers/vultr>` VULTR single region driver :mod:`libcloud.compute.drivers.vultr` :class:`VultrNodeDriver`
+===================================== ================================================= =================== ========================================================================================================================================================================================================================================================= ================================================= ====================================
.. _`Abiquo`: http://www.abiquo.com/
.. _`Aliyun ECS`: https://www.aliyun.com/product/ecs
@@ -97,6 +99,7 @@ Provider Documentation
.. _`NephoScale`: http://www.nephoscale.com
.. _`Nimbus`: http://www.nimbusproject.org/
.. _`NTTAmerica`: http://www.nttamerica.com/
+.. _`NTTC-CIS`: https://www.us.ntt.com/en/services/cloud/enterprise-cloud.html
.. _`OnApp`: http://onapp.com/
.. _`1and1`: http://www.1and1.com
.. _`OpenNebula (v3.8)`: http://opennebula.org/
@@ -109,10 +112,12 @@ Provider Documentation
.. _`Rackspace Cloud (Next Gen)`: http://www.rackspace.com
.. _`Rackspace Cloud (First Gen)`: http://www.rackspace.com
.. _`RimuHosting`: http://rimuhosting.com/
+.. _`Scaleway`: https://www.scaleway.com/
.. _`ServerLove`: http://www.serverlove.com/
.. _`skalicloud`: http://www.skalicloud.com/
.. _`SoftLayer`: http://www.softlayer.com/
.. _`vCloud`: http://www.vmware.com/products/vcloud/
+.. _`Upcloud`: https://www.upcloud.com
.. _`VCL`: http://incubator.apache.org/vcl/
.. _`vCloud`: http://www.vmware.com/products/vcloud/
.. _`Voxel VoxCLOUD`: http://www.voxel.net/
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/dns/_supported_providers.rst
----------------------------------------------------------------------
diff --git a/docs/dns/_supported_providers.rst b/docs/dns/_supported_providers.rst
index f9f2fd4..00a3237 100644
--- a/docs/dns/_supported_providers.rst
+++ b/docs/dns/_supported_providers.rst
@@ -11,7 +11,7 @@ Provider Documentation Provider Constant
`DurableDNS`_ :doc:`Click </dns/drivers/durabledns>` DURABLEDNS single region driver :mod:`libcloud.dns.drivers.durabledns` :class:`DurableDNSDriver`
`Gandi DNS`_ GANDI single region driver :mod:`libcloud.dns.drivers.gandi` :class:`GandiDNSDriver`
`GoDaddy DNS`_ :doc:`Click </dns/drivers/godaddy>` GODADDY single region driver :mod:`libcloud.dns.drivers.godaddy` :class:`GoDaddyDNSDriver`
-`Google DNS`_ GOOGLE single region driver :mod:`libcloud.dns.drivers.google` :class:`GoogleDNSDriver`
+`Google DNS`_ :doc:`Click </dns/drivers/google>` GOOGLE single region driver :mod:`libcloud.dns.drivers.google` :class:`GoogleDNSDriver`
`Host Virtual DNS`_ :doc:`Click </dns/drivers/hostvirtual>` HOSTVIRTUAL single region driver :mod:`libcloud.dns.drivers.hostvirtual` :class:`HostVirtualDNSDriver`
`Linode DNS`_ LINODE single region driver :mod:`libcloud.dns.drivers.linode` :class:`LinodeDNSDriver`
`Liquidweb DNS`_ :doc:`Click </dns/drivers/liquidweb>` LIQUIDWEB single region driver :mod:`libcloud.dns.drivers.liquidweb` :class:`LiquidWebDNSDriver`
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/drs/drivers/index.rst
----------------------------------------------------------------------
diff --git a/docs/drs/drivers/index.rst b/docs/drs/drivers/index.rst
new file mode 100644
index 0000000..5599158
--- /dev/null
+++ b/docs/drs/drivers/index.rst
@@ -0,0 +1,12 @@
+:orphan:
+
+DNS Drivers Documentation
+=========================
+
+This chapter includes links to driver (provider) specific documentation pages.
+
+.. toctree::
+ :glob:
+ :maxdepth: 1
+
+ *
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/drs/drivers/nttcis.rst
----------------------------------------------------------------------
diff --git a/docs/drs/drivers/nttcis.rst b/docs/drs/drivers/nttcis.rst
new file mode 100644
index 0000000..6987929
--- /dev/null
+++ b/docs/drs/drivers/nttcis.rst
@@ -0,0 +1,18 @@
+NttCis DRS Driver Documentation
+===============================
+
+`NttC-Cis`_ offers disaster recovery services for Compute Services.
+
+
+Instantiating the driver
+------------------------
+
+.. literalinclude:: /examples/drs/nttcis/add_consistency_group.py
+ :language: python
+
+API Docs
+--------
+
+.. autoclass:: libcloud.drs.drivers.nttcis.NttCisDRSDriver
+ :members:
+ :inherited-members:
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/drs/index.rst
----------------------------------------------------------------------
diff --git a/docs/drs/index.rst b/docs/drs/index.rst
new file mode 100644
index 0000000..909b8ae
--- /dev/null
+++ b/docs/drs/index.rst
@@ -0,0 +1,15 @@
+DRS
+===
+
+.. note::
+
+ DRS API is available in Libcloud 2.4.0 and higher.
+
+DRS API allows you to manage disaster recovery as a separate service.
+
+Supported Providers
+-------------------
+
+For a list of supported providers see :doc:`supported providers page
+</drs/supported_providers>`.
+
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/drs/supported_providers.rst
----------------------------------------------------------------------
diff --git a/docs/drs/supported_providers.rst b/docs/drs/supported_providers.rst
new file mode 100644
index 0000000..e34e5eb
--- /dev/null
+++ b/docs/drs/supported_providers.rst
@@ -0,0 +1,14 @@
+:orphan:
+
+Supported Providers
+===================
+
+Provider Matrix
+---------------
+
+.. include:: _supported_providers.rst
+
+Supported Methods
+-----------------
+
+.. include:: _supported_methods.rst
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/examples/drs/__init__.py
----------------------------------------------------------------------
diff --git a/docs/examples/drs/__init__.py b/docs/examples/drs/__init__.py
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/examples/drs/nttcis/__init__.py
----------------------------------------------------------------------
diff --git a/docs/examples/drs/nttcis/__init__.py b/docs/examples/drs/nttcis/__init__.py
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/examples/drs/nttcis/add_consistency_group.py
----------------------------------------------------------------------
diff --git a/docs/examples/drs/nttcis/add_consistency_group.py b/docs/examples/drs/nttcis/add_consistency_group.py
new file mode 100644
index 0000000..68861e8
--- /dev/null
+++ b/docs/examples/drs/nttcis/add_consistency_group.py
@@ -0,0 +1,26 @@
+# This script creates a consistency group
+
+import libcloud
+
+
+def create_drs(compute_driver, drs_driver):
+ nodes = compute_driver.list_nodes(ex_name='src-sdk-test')
+ src_id = nodes[0].id
+ nodes = compute_driver.list_nodes(ex_name="tgt-sdk-test")
+ target_id = nodes[0].id
+ consistency_group_name = "sdk_test_cg"
+ journal_size_gb = "100"
+ result = drs_driver.create_consistency_group(
+ consistency_group_name, journal_size_gb, src_id, target_id, description="A test consistency group")
+ assert result is True
+
+
+def compute_driver():
+ cls = libcloud.get_driver(libcloud.DriverType.COMPUTE,
+ libcloud.DriverType.COMPUTE.NTTCIS)
+ computedriver = cls('my_user', 'my_pass', region='na')
+
+ cls = libcloud.get_driver(libcloud.DriverType.DRS,
+ libcloud.DriverType.DRS.NTTCIS)
+ drsdriver = cls('my_user', 'my_pass', region='na')
+ create_drs(computedriver, drsdriver)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/index.rst
----------------------------------------------------------------------
diff --git a/docs/index.rst b/docs/index.rst
index d44bc36..463abaa 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,6 +13,7 @@ Resource you can manage with Libcloud are divided in the following categories:
Rackspace CloudFiles
* :doc:`Load Balancers as a Service </loadbalancer/index>` - services such as Amazon Elastic Load Balancer and GoGrid LoadBalancers
* :doc:`DNS as a Service </dns/index>` - services such as Amazon Route 53 and Zerigo
+* :doc:`Disaster Recovery as a Service as a Service (DRS) </drs/index>` - services such as Amazon Route 53 and Zerigo
* :doc:`Container Services </container/index>` - container virtualization like Docker and Rkt as well as container based services
* :doc:`Backup as a Service </backup/index>` - services such as Amazon EBS and OpenStack Freezer
@@ -38,6 +39,7 @@ Main
storage/index
loadbalancer/index
dns/index
+ drs/index
container/index
backup/index
troubleshooting
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/loadbalancer/_supported_methods.rst
----------------------------------------------------------------------
diff --git a/docs/loadbalancer/_supported_methods.rst b/docs/loadbalancer/_supported_methods.rst
index 7e34af7..ddc48f4 100644
--- a/docs/loadbalancer/_supported_methods.rst
+++ b/docs/loadbalancer/_supported_methods.rst
@@ -12,6 +12,7 @@ Provider create balancer list balancers list membe
`Google Compute Engine Load Balancer`_ yes yes yes yes yes yes
`GoGrid LB`_ yes yes yes yes yes no
`Ninefold LB`_ yes yes yes yes yes no
+`NTTC-CIS Load Balancer`_ yes yes yes yes yes no
`Rackspace LB`_ yes yes yes yes yes no
`Softlayer Load Balancing`_ no yes yes yes yes no
====================================== =============== ============== ============ ============= ============= ===================
@@ -25,5 +26,6 @@ Provider create balancer list balancers list membe
.. _`Google Compute Engine Load Balancer`: https://cloud.google.com/
.. _`GoGrid LB`: http://www.gogrid.com/
.. _`Ninefold LB`: http://ninefold.com/
+.. _`NTTC-CIS Load Balancer`: https://cloud.nttcis.com/
.. _`Rackspace LB`: http://www.rackspace.com/
.. _`Softlayer Load Balancing`: http://www.softlayer.com/
http://git-wip-us.apache.org/repos/asf/libcloud/blob/614b43d4/docs/loadbalancer/_supported_providers.rst
----------------------------------------------------------------------
diff --git a/docs/loadbalancer/_supported_providers.rst b/docs/loadbalancer/_supported_providers.rst
index aea942c..d0f9c56 100644
--- a/docs/loadbalancer/_supported_providers.rst
+++ b/docs/loadbalancer/_supported_providers.rst
@@ -12,6 +12,7 @@ Provider Documentation
`Google Compute Engine Load Balancer`_ :doc:`Click </loadbalancer/drivers/gce>` GCE single region driver :mod:`libcloud.loadbalancer.drivers.gce` :class:`GCELBDriver`
`GoGrid LB`_ GOGRID single region driver :mod:`libcloud.loadbalancer.drivers.gogrid` :class:`GoGridLBDriver`
`Ninefold LB`_ NINEFOLD single region driver :mod:`libcloud.loadbalancer.drivers.ninefold` :class:`NinefoldLBDriver`
+`NTTC-CIS Load Balancer`_ :doc:`Click </loadbalancer/drivers/nttcis>` NTTCIS single region driver :mod:`libcloud.loadbalancer.drivers.nttcis` :class:`NttCisLBDriver`
`Rackspace LB`_ RACKSPACE dfw, hkg, iad, lon, ord, syd :mod:`libcloud.loadbalancer.drivers.rackspace` :class:`RackspaceLBDriver`
`Softlayer Load Balancing`_ SOFTLAYER single region driver :mod:`libcloud.loadbalancer.drivers.softlayer` :class:`SoftlayerLBDriver`
====================================== ================================================== ================= ============================ ================================================== ==============================
@@ -25,5 +26,6 @@ Provider Documentation
.. _`Google Compute Engine Load Balancer`: https://cloud.google.com/
.. _`GoGrid LB`: http://www.gogrid.com/
.. _`Ninefold LB`: http://ninefold.com/
+.. _`NTTC-CIS Load Balancer`: https://cloud.nttcis.com/
.. _`Rackspace LB`: http://www.rackspace.com/
.. _`Softlayer Load Balancing`: http://www.softlayer.com/