libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject [4/7] git commit: Add a new driver, tests and documentation for CloudSigma API v2.0.
Date Wed, 29 Jan 2014 16:00:58 GMT
Add a new driver, tests and documentation for CloudSigma API v2.0.

Also update existing driver for API v1.0 and other affected code:

- Update existing driver for API version 1.0 and prefix 1.0 classes with "1_0"
- Update existing 1.0 driver to support "region" argument. This way porting
  existing code to API v2.0 will be easier.
- Add new CloudSigmaNodeDriver class which can be instantiated directly. Which
  API version is used is dictated by the "api_version" kwarg which defaults to
  2.0.
- Add new libcloud.common.cloudsigma module which holds common functionality
  for CloudSigma drivers
- Update INSTANCE_TYPES to be a list so output of list_sizes() method is always
  returned in the same order.


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/4d40ecd3
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/4d40ecd3
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/4d40ecd3

Branch: refs/heads/trunk
Commit: 4d40ecd328db72143fab75d940aaa047b68b7a22
Parents: 903e769
Author: Tomaz Muraus <tomaz@tomaz.me>
Authored: Thu Nov 7 12:02:32 2013 +0000
Committer: Tomaz Muraus <tomaz@apache.org>
Committed: Wed Jan 29 16:50:23 2014 +0100

----------------------------------------------------------------------
 .coveragerc                                     |    1 +
 .../generate_provider_feature_matrix_table.py   |    2 +
 docs/compute/drivers/cloudsigma.rst             |  152 +
 .../cloudsigma/attach_firewall_policy.py        |   14 +
 .../compute/cloudsigma/connect_to_api_1_0.py    |    5 +
 .../compute/cloudsigma/connect_to_api_2_0.py    |    7 +
 .../cloudsigma/create_server_custom_size.py     |   15 +
 .../cloudsigma/create_server_with_metadata.py   |   16 +
 .../compute/cloudsigma/open_vnc_tunnel.py       |   16 +
 docs/examples/compute/cloudsigma/tag_server.py  |   24 +
 libcloud/common/cloudsigma.py                   |  146 +
 libcloud/compute/drivers/cloudsigma.py          | 1533 +++++++++-
 libcloud/compute/providers.py                   |    8 +-
 libcloud/compute/types.py                       |    3 +-
 .../fixtures/cloudsigma_2_0/balance.json        |    1 +
 .../fixtures/cloudsigma_2_0/capabilities.json   |   26 +
 .../fixtures/cloudsigma_2_0/currentusage.json   |   88 +
 .../fixtures/cloudsigma_2_0/drives_clone.json   |   29 +
 .../fixtures/cloudsigma_2_0/drives_create.json  |   29 +
 .../fixtures/cloudsigma_2_0/drives_detail.json  |  154 +
 .../fixtures/cloudsigma_2_0/drives_get.json     |   25 +
 .../fixtures/cloudsigma_2_0/drives_resize.json  |   29 +
 .../fwpolicies_create_no_rules.json             |   16 +
 .../fwpolicies_create_with_rules.json           |   27 +
 .../cloudsigma_2_0/fwpolicies_detail.json       |   84 +
 .../fixtures/cloudsigma_2_0/libdrives.json      |  569 ++++
 .../fixtures/cloudsigma_2_0/pricing.json        | 2889 ++++++++++++++++++
 .../cloudsigma_2_0/servers_attach_policy.json   |   43 +
 .../fixtures/cloudsigma_2_0/servers_clone.json  |   61 +
 .../cloudsigma_2_0/servers_close_vnc.json       |    5 +
 .../fixtures/cloudsigma_2_0/servers_create.json |   30 +
 .../servers_detail_all_stopped.json             |  104 +
 .../servers_detail_mixed_state.json             |  162 +
 .../cloudsigma_2_0/servers_open_vnc.json        |    6 +
 .../cloudsigma_2_0/start_already_started.json   |    1 +
 .../fixtures/cloudsigma_2_0/start_success.json  |    1 +
 .../cloudsigma_2_0/stop_already_stopped.json    |    1 +
 .../fixtures/cloudsigma_2_0/stop_success.json   |    1 +
 .../fixtures/cloudsigma_2_0/subscriptions.json  |  105 +
 .../fixtures/cloudsigma_2_0/tags_create.json    |   15 +
 .../tags_create_with_resources.json             |   25 +
 .../fixtures/cloudsigma_2_0/tags_detail.json    |   31 +
 .../fixtures/cloudsigma_2_0/tags_get.json       |   11 +
 .../fixtures/cloudsigma_2_0/tags_update.json    |   30 +
 .../fixtures/cloudsigma_2_0/unknown_error.json  |    1 +
 libcloud/test/compute/test_cloudsigma.py        |  206 --
 libcloud/test/compute/test_cloudsigma_v1_0.py   |  223 ++
 libcloud/test/compute/test_cloudsigma_v2_0.py   |  573 ++++
 48 files changed, 7186 insertions(+), 357 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/.coveragerc
----------------------------------------------------------------------
diff --git a/.coveragerc b/.coveragerc
index 09d7308..61014db 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -11,6 +11,7 @@ exclude_lines =
 
     # Don't complain about missing debug-only code:
     def __repr__
+    def __str__
     if self\.debug
 
     # Don't complain if tests don't hit defensive assertion code:

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/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 14b20db..728ee9c 100755
--- a/contrib/generate_provider_feature_matrix_table.py
+++ b/contrib/generate_provider_feature_matrix_table.py
@@ -141,6 +141,8 @@ IGNORED_PROVIDERS = [
     'local',
 
     # Deprecated constants
+    'cloudsigma_us',
+
     'cloudfiles_swift'
 ]
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/docs/compute/drivers/cloudsigma.rst
----------------------------------------------------------------------
diff --git a/docs/compute/drivers/cloudsigma.rst b/docs/compute/drivers/cloudsigma.rst
new file mode 100644
index 0000000..8823355
--- /dev/null
+++ b/docs/compute/drivers/cloudsigma.rst
@@ -0,0 +1,152 @@
+CloudSigma Compute Driver Documentation
+=======================================
+
+`CloudSigma`_ is a pure IaaS provided based in Zurich, Switzerland with
+data centers in Zurich, Switzerland, Las Vegas, United States and Washington DC,
+United States.
+
+CloudSigma driver supports working with legacy `API v1.0`_ and a new and
+actively supported `API v2.0`_. API v1.0 has been deprecated and as such,
+you are strongly encouraged to migrate any existing code which uses API v1.0 to
+API v2.0.
+
+Instantiating a driver
+----------------------
+
+CloudSigma driver constructor takes different arguments with which you tell
+it which region to connect to, which api version to use and so on.
+
+Available arguments:
+
+* ``region`` - Which region to connect to. Defaults to ``zrh``. All the
+  supported values: ``zrh``, ``lvs``, ``wdc``
+* ``api_version`` - Which API version to use. Defaults to ``2.0``. All the
+  supported values: ``1.0`` (deprecated), ``2.0``
+
+Examples
+--------
+
+1. Connect to zrh region using new API v2.0
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. literalinclude:: /examples/compute/cloudsigma/connect_to_api_2_0.py
+   :language: python
+
+2. Connect to zrh region using deprecated API v1.0
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+As noted above, API 1.0 has been deprecated and you are strongly encouraged to
+migrate any code which uses API 1.0 to API 2.0. This example is only included
+here for completeness.
+
+.. literalinclude:: /examples/compute/cloudsigma/connect_to_api_1_0.py
+   :language: python
+
+3. Create a server using a custom node size
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Unlike most of the other cloud providers out there, CloudSigma is not limited
+to pre-defined instance sizes and allows you to specify your own custom size
+when creating a node.
+
+This means you can totally customize server for your work-load and specify
+exactly how much CPU, memory and disk space you want.
+
+To follow Libcloud standard API, CloudSigma driver also exposes some
+pre-defined instance sizes through the
+:meth:`libcloud.compute.drivers.cloudsigma.CloudSigma_2_0_NodeDriver.list_sizes`
+method.
+
+This example shows how to create a node using a custom size.
+
+.. literalinclude:: /examples/compute/cloudsigma/create_server_custom_size.py
+   :language: python
+
+Keep in mind that there are some limits in place:
+
+* CPU - 1 GHz to 80GHz
+* Memory - 1 GB to 128 GB
+* Disk - 1 GB to 8249 GB
+
+You can find exact limits and free capacity for your account's location using
+:meth:`libcloud.compute.drivers.cloudsigma.CloudSigma_2_0_NodeDriver.ex_list_capabilities`
+method.
+
+4. Associate metadata with a server upon creation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+CloudSigma allows you to associate arbitrary key / value pairs with each
+server. This examples shows how to do that upon server creation.
+
+.. literalinclude:: /examples/compute/cloudsigma/create_server_with_metadata.py
+   :language: python
+
+4. Add a tag to the server
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+CloudSigma allows you to ogranize resources such as servers and drivers by
+tagging them. This example shows how to do that.
+
+.. literalinclude:: /examples/compute/cloudsigma/tag_server.py
+   :language: python
+
+5. Open a VNC tunnel to the server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+CloudSigma allows you to connect and manage your server using `VNC`_. To
+connect to the server using VNC, you can use clients such as ``vinagre`` or
+``vncviewer`` on Ubuntu and other Linux distributions.
+
+This example shows how to open a VNC connection to your server and retrieve
+a connection URL.
+
+After you have retrieved the URL, you will also need a password which you
+specified (or it was auto-generated if you haven't specified it) when creating a
+server.
+
+If you can't remember the password, you can use
+:meth:`libcloud.compute.drivers.CloudSigma_2_0_NodeDriver.list_nodes` method
+and access ``node.extra['vnc_password']`` attribute.
+
+After you are done using VNC, it's recommended to close a tunnel using
+:meth:`libcloud.compute.drivers.cloudsigma.CloudSigma_2_0_NodeDriver.ex_close_vnc_tunnel`
+method.
+
+.. literalinclude:: /examples/compute/cloudsigma/open_vnc_tunnel.py
+   :language: python
+
+6. Attach firewall policy to the server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+CloudSigma allows you to restrict access to your servers by using firewall
+policies. This example shows how to attach an existing policy to all your
+servers tagged with ``database-server``.
+
+.. literalinclude:: /examples/compute/cloudsigma/attach_firewall_policy.py
+   :language: python
+
+API Docs
+--------
+
+.. autoclass:: libcloud.compute.drivers.cloudsigma.CloudSigma_2_0_NodeDriver
+    :members:
+
+.. autoclass:: libcloud.compute.drivers.cloudsigma.CloudSigmaDrive
+    :members:
+
+.. autoclass:: libcloud.compute.drivers.cloudsigma.CloudSigmaTag
+    :members:
+
+.. autoclass:: libcloud.compute.drivers.cloudsigma.CloudSigmaSubscription
+    :members:
+
+.. autoclass:: libcloud.compute.drivers.cloudsigma.CloudSigmaFirewallPolicy
+    :members:
+
+.. autoclass:: libcloud.compute.drivers.cloudsigma.CloudSigmaFirewallPolicyRule
+    :members:
+
+.. _`CloudSigma`: http://www.cloudsigma.com/
+.. _`API v1.0`: https://www.cloudsigma.com/legacy/cloudsigma-api-1-0/
+.. _`API v2.0`: https://zrh.cloudsigma.com/docs/
+.. _`VNC`: http://en.wikipedia.org/wiki/Virtual_Network_Computing

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/docs/examples/compute/cloudsigma/attach_firewall_policy.py
----------------------------------------------------------------------
diff --git a/docs/examples/compute/cloudsigma/attach_firewall_policy.py b/docs/examples/compute/cloudsigma/attach_firewall_policy.py
new file mode 100644
index 0000000..a2c93c2
--- /dev/null
+++ b/docs/examples/compute/cloudsigma/attach_firewall_policy.py
@@ -0,0 +1,14 @@
+from libcloud.compute.types import Provider
+from libcloud.compute.providers import get_driver
+
+cls = get_driver(Provider.CLOUDSIGMA)
+driver = cls('username', 'password', region='zrh', api_version='2.0')
+
+tags = driver.ex_list_tags()
+tag = [tag for tag in tags if tag.name == 'database-server'][0]
+
+nodes = driver.list_nodes(ex_tag=tag)
+policy = driver.ex_list_firewall_policies()[0]
+
+for node in nodes:
+    driver.ex_attach_firewall_policy(policy=policy, node=node)

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/docs/examples/compute/cloudsigma/connect_to_api_1_0.py
----------------------------------------------------------------------
diff --git a/docs/examples/compute/cloudsigma/connect_to_api_1_0.py b/docs/examples/compute/cloudsigma/connect_to_api_1_0.py
new file mode 100644
index 0000000..dac1d4e
--- /dev/null
+++ b/docs/examples/compute/cloudsigma/connect_to_api_1_0.py
@@ -0,0 +1,5 @@
+from libcloud.compute.types import Provider
+from libcloud.compute.providers import get_driver
+
+cls = get_driver(Provider.CLOUDSIGMA)
+driver = cls('username', 'password', region='zrh', api_version='1.0')

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/docs/examples/compute/cloudsigma/connect_to_api_2_0.py
----------------------------------------------------------------------
diff --git a/docs/examples/compute/cloudsigma/connect_to_api_2_0.py b/docs/examples/compute/cloudsigma/connect_to_api_2_0.py
new file mode 100644
index 0000000..608c46f
--- /dev/null
+++ b/docs/examples/compute/cloudsigma/connect_to_api_2_0.py
@@ -0,0 +1,7 @@
+from libcloud.compute.types import Provider
+from libcloud.compute.providers import get_driver
+
+cls = get_driver(Provider.CLOUDSIGMA)
+
+# "api_version" argument can be left out since it defaults to 2.0
+driver = cls('username', 'password', region='zrh', api_version='2.0')

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/docs/examples/compute/cloudsigma/create_server_custom_size.py
----------------------------------------------------------------------
diff --git a/docs/examples/compute/cloudsigma/create_server_custom_size.py b/docs/examples/compute/cloudsigma/create_server_custom_size.py
new file mode 100644
index 0000000..231bc2b
--- /dev/null
+++ b/docs/examples/compute/cloudsigma/create_server_custom_size.py
@@ -0,0 +1,15 @@
+from libcloud.compute.types import Provider
+from libcloud.compute.providers import get_driver
+from libcloud.compute.drivers.cloudsigma import CloudSigmaNodeSize
+
+cls = get_driver(Provider.CLOUDSIGMA)
+driver = cls('username', 'password', region='zrh', api_version='2.0')
+
+name = 'test node custom size'
+image = driver.list_images()[0]
+
+# Custom node size with 56 GB of ram, 5000 MHz CPU and 200 GB SSD drive
+size = CloudSigmaNodeSize(id=1, name='my size', cpu=5000, ram=5600, disk=200,
+                          bandwidth=None, price=0, driver=driver)
+node = driver.create_node(name=name, size=size, image=image)
+print(node)

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/docs/examples/compute/cloudsigma/create_server_with_metadata.py
----------------------------------------------------------------------
diff --git a/docs/examples/compute/cloudsigma/create_server_with_metadata.py b/docs/examples/compute/cloudsigma/create_server_with_metadata.py
new file mode 100644
index 0000000..0087a8c
--- /dev/null
+++ b/docs/examples/compute/cloudsigma/create_server_with_metadata.py
@@ -0,0 +1,16 @@
+from libcloud.compute.types import Provider
+from libcloud.compute.providers import get_driver
+
+cls = get_driver(Provider.CLOUDSIGMA)
+driver = cls('username', 'password', region='zrh', api_version='2.0')
+
+name = 'test node sizeth metadata'
+size = driver.list_sizes()[0]
+image = driver.list_images()[0]
+
+metadata = {'ssh_public_key': 'my public key', 'role': 'database server',
+            'region': 'zrh'}
+
+node = driver.create_node(name=name, size=size, image=image,
+                          ex_metadata=metadata)
+print(node)

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/docs/examples/compute/cloudsigma/open_vnc_tunnel.py
----------------------------------------------------------------------
diff --git a/docs/examples/compute/cloudsigma/open_vnc_tunnel.py b/docs/examples/compute/cloudsigma/open_vnc_tunnel.py
new file mode 100644
index 0000000..428490a
--- /dev/null
+++ b/docs/examples/compute/cloudsigma/open_vnc_tunnel.py
@@ -0,0 +1,16 @@
+from libcloud.compute.types import Provider
+from libcloud.compute.providers import get_driver
+
+cls = get_driver(Provider.CLOUDSIGMA)
+driver = cls('username', 'password', region='zrh', api_version='2.0')
+
+node = driver.list_nodes()[0]
+
+vnc_url = driver.ex_open_vnc_tunnel(node=node)
+vnc_password = node.extra['vnc_password']
+
+values = {'url': vnc_url, 'password': vnc_password}
+print('URL: %(url)s, Password: %(password)s' % values)
+
+# When you are done
+driver.ex_close_vnc_tunnel(node=node)

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/docs/examples/compute/cloudsigma/tag_server.py
----------------------------------------------------------------------
diff --git a/docs/examples/compute/cloudsigma/tag_server.py b/docs/examples/compute/cloudsigma/tag_server.py
new file mode 100644
index 0000000..b9030fd
--- /dev/null
+++ b/docs/examples/compute/cloudsigma/tag_server.py
@@ -0,0 +1,24 @@
+from libcloud.compute.types import Provider
+from libcloud.compute.providers import get_driver
+
+cls = get_driver(Provider.CLOUDSIGMA)
+driver = cls('username', 'password', region='zrh', api_version='2.0')
+
+node = driver.list_nodes()[0]
+
+tag_names = [
+    'zrh',
+    'database-server',
+    'monited'
+]
+
+tags = []
+
+# 1. Create necessary tags
+for tag_name in tag_names:
+    tag = driver.ex_create_tag(name='database-servers')
+    tags.append(tag)
+
+# 2. Tag node with the created tags
+for tag in tags:
+    driver.ex_tag_resource(resource=node, tag=tag)

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/libcloud/common/cloudsigma.py
----------------------------------------------------------------------
diff --git a/libcloud/common/cloudsigma.py b/libcloud/common/cloudsigma.py
new file mode 100644
index 0000000..e0e6336
--- /dev/null
+++ b/libcloud/common/cloudsigma.py
@@ -0,0 +1,146 @@
+# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+__all__ = [
+    'API_ENDPOINTS_1_0',
+    'API_ENDPOINTS_2_0',
+    'API_VERSIONS',
+    'INSTANCE_TYPES'
+]
+
+# API end-points
+API_ENDPOINTS_1_0 = {
+    'zrh': {
+        'name': 'Zurich',
+        'country': 'Switzerland',
+        'host': 'api.zrh.cloudsigma.com'
+    },
+    'lvs': {
+        'name': 'Las Vegas',
+        'country': 'United States',
+        'host': 'api.lvs.cloudsigma.com'
+    }
+}
+
+API_ENDPOINTS_2_0 = {
+    'zrh': {
+        'name': 'Zurich',
+        'country': 'Switzerland',
+        'host': 'zrh.cloudsigma.com'
+    },
+    'lvs': {
+        'name': 'Las Vegas',
+        'country': 'United States',
+        'host': 'lvs.cloudsigma.com'
+    },
+    'wdc': {
+        'name': 'Las Vegas',
+        'country': 'United States',
+        'host': 'wdc.cloudsigma.com'
+    }
+
+}
+
+DEFAULT_REGION = 'zrh'
+
+# Supported API versions.
+API_VERSIONS = [
+    '1.0'  # old and deprecated
+    '2.0'
+]
+
+DEFAULT_API_VERSION = '2.0'
+
+# CloudSigma doesn't specify special instance types.
+# Basically for CPU any value between 0.5 GHz and 20.0 GHz should work,
+# 500 MB to 32000 MB for ram
+# and 1 GB to 1024 GB for hard drive size.
+# Plans in this file are based on examples listed on http://www.cloudsigma
+# .com/en/pricing/price-schedules
+INSTANCE_TYPES = [
+    {
+        'id': 'micro-regular',
+        'name': 'Micro/Regular instance',
+        'cpu': 1100,
+        'memory': 640,
+        'disk': 10 + 3,
+        'bandwidth': None,
+    },
+    {
+        'id': 'micro-high-cpu',
+        'name': 'Micro/High CPU instance',
+        'cpu': 2200,
+        'memory': 640,
+        'disk': 80,
+        'bandwidth': None,
+    },
+    {
+        'id': 'standard-small',
+        'name': 'Standard/Small instance',
+        'cpu': 1100,
+        'memory': 1741,
+        'disk': 50,
+        'bandwidth': None,
+    },
+    {
+        'id': 'standard-large',
+        'name': 'Standard/Large instance',
+        'cpu': 4400,
+        'memory': 7680,
+        'disk': 250,
+        'bandwidth': None,
+    },
+    {
+        'id': 'standard-extra-large',
+        'name': 'Standard/Extra Large instance',
+        'cpu': 8800,
+        'memory': 15360,
+        'disk': 500,
+        'bandwidth': None,
+    },
+    {
+        'id': 'high-memory-extra-large',
+        'name': 'High Memory/Extra Large instance',
+        'cpu': 7150,
+        'memory': 17510,
+        'disk': 250,
+        'bandwidth': None,
+    },
+    {
+        'id': 'high-memory-double-extra-large',
+        'name': 'High Memory/Double Extra Large instance',
+        'cpu': 14300,
+        'memory': 32768,
+        'disk': 500,
+        'bandwidth': None,
+    },
+    {
+        'id': 'high-cpu-medium',
+        'name': 'High CPU/Medium instance',
+        'cpu': 5500,
+        'memory': 1741,
+        'disk': 150,
+        'bandwidth': None,
+    },
+    {
+        'id': 'high-cpu-extra-large',
+        'name': 'High CPU/Extra Large instance',
+        'cpu': 20000,
+        'memory': 7168,
+        'disk': 500,
+        'bandwidth': None,
+    }
+]

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/libcloud/compute/drivers/cloudsigma.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/cloudsigma.py b/libcloud/compute/drivers/cloudsigma.py
index 4a05831..0b23a85 100644
--- a/libcloud/compute/drivers/cloudsigma.py
+++ b/libcloud/compute/drivers/cloudsigma.py
@@ -13,130 +13,68 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 """
-CloudSigma Driver
+Drivers for CloudSigma API v1.0 and v2.0.
 """
+
 import re
 import time
+import copy
 import base64
 
+try:
+    import simplejson as json
+except:
+    import json
+
 from libcloud.utils.py3 import b
+from libcloud.utils.py3 import httplib
 
 from libcloud.utils.misc import str2dicts, str2list, dict2str
-from libcloud.common.base import ConnectionUserAndKey, Response
-from libcloud.common.types import InvalidCredsError
+from libcloud.common.base import ConnectionUserAndKey, JsonResponse, Response
+from libcloud.common.types import InvalidCredsError, ProviderError
+from libcloud.common.cloudsigma import INSTANCE_TYPES
+from libcloud.common.cloudsigma import API_ENDPOINTS_1_0
+from libcloud.common.cloudsigma import API_ENDPOINTS_2_0
+from libcloud.common.cloudsigma import DEFAULT_API_VERSION, DEFAULT_REGION
 from libcloud.compute.types import NodeState, Provider
 from libcloud.compute.base import NodeDriver, NodeSize, Node
 from libcloud.compute.base import NodeImage
+from libcloud.compute.base import is_private_subnet
+from libcloud.utils.iso8601 import parse_date
+from libcloud.utils.misc import get_secure_random_string
+
+__all__ = [
+    'CloudSigmaNodeDriver',
+    'CloudSigma_1_0_NodeDriver',
+    'CloudSigma_2_0_NodeDriver',
+    'CloudSigmaError',
+
+    'CloudSigmaNodeSize',
+    'CloudSigmaDrive',
+    'CloudSigmaTag',
+    'CloudSigmaSubscription',
+    'CloudSigmaFirewallPolicy',
+    'CloudSigmaFirewallPolicyRule'
+]
+
+
+class CloudSigmaNodeDriver(NodeDriver):
+    name = 'CloudSigma'
+    website = 'http://www.cloudsigma.com/'
 
-# API end-points
-API_ENDPOINTS = {
-    'zrh': {
-        'name': 'Zurich',
-        'country': 'Switzerland',
-        'host': 'api.zrh.cloudsigma.com'
-    },
-
-    'lvs': {
-        'name': 'Las Vegas',
-        'country': 'United States',
-        'host': 'api.lvs.cloudsigma.com'
-    }
-}
-
-# Default API end-point for the base connection clase.
-DEFAULT_ENDPOINT = 'zrh'
-
-# CloudSigma doesn't specify special instance types.
-# Basically for CPU any value between 0.5 GHz and 20.0 GHz should work,
-# 500 MB to 32000 MB for ram
-# and 1 GB to 1024 GB for hard drive size.
-# Plans in this file are based on examples listed on http://www.cloudsigma
-# .com/en/pricing/price-schedules
-INSTANCE_TYPES = {
-    'micro-regular': {
-        'id': 'micro-regular',
-        'name': 'Micro/Regular instance',
-        'cpu': 1100,
-        'memory': 640,
-        'disk': 10,
-        'bandwidth': None,
-    },
-    'micro-high-cpu': {
-        'id': 'micro-high-cpu',
-        'name': 'Micro/High CPU instance',
-        'cpu': 2200,
-        'memory': 640,
-        'disk': 80,
-        'bandwidth': None,
-    },
-    'standard-small': {
-        'id': 'standard-small',
-        'name': 'Standard/Small instance',
-        'cpu': 1100,
-        'memory': 1741,
-        'disk': 50,
-        'bandwidth': None,
-    },
-    'standard-large': {
-        'id': 'standard-large',
-        'name': 'Standard/Large instance',
-        'cpu': 4400,
-        'memory': 7680,
-        'disk': 250,
-        'bandwidth': None,
-    },
-    'standard-extra-large': {
-        'id': 'standard-extra-large',
-        'name': 'Standard/Extra Large instance',
-        'cpu': 8800,
-        'memory': 15360,
-        'disk': 500,
-        'bandwidth': None,
-    },
-    'high-memory-extra-large': {
-        'id': 'high-memory-extra-large',
-        'name': 'High Memory/Extra Large instance',
-        'cpu': 7150,
-        'memory': 17510,
-        'disk': 250,
-        'bandwidth': None,
-    },
-    'high-memory-double-extra-large': {
-        'id': 'high-memory-double-extra-large',
-        'name': 'High Memory/Double Extra Large instance',
-        'cpu': 14300,
-        'memory': 32768,
-        'disk': 500,
-        'bandwidth': None,
-    },
-    'high-cpu-medium': {
-        'id': 'high-cpu-medium',
-        'name': 'High CPU/Medium instance',
-        'cpu': 5500,
-        'memory': 1741,
-        'disk': 150,
-        'bandwidth': None,
-    },
-    'high-cpu-extra-large': {
-        'id': 'high-cpu-extra-large',
-        'name': 'High CPU/Extra Large instance',
-        'cpu': 20000,
-        'memory': 7168,
-        'disk': 500,
-        'bandwidth': None,
-    }
-}
-
-NODE_STATE_MAP = {
-    'active': NodeState.RUNNING,
-    'stopped': NodeState.TERMINATED,
-    'dead': NodeState.TERMINATED,
-    'dumped': NodeState.TERMINATED,
-}
-
-# Default timeout (in seconds) for the drive imaging process
-IMAGING_TIMEOUT = 20 * 60
+    def __new__(cls, key, secret=None, secure=True, host=None, port=None,
+                api_version=DEFAULT_API_VERSION, **kwargs):
+        if cls is CloudSigmaNodeDriver:
+            if api_version == '1.0':
+                cls = CloudSigma_1_0_NodeDriver
+            elif api_version == '2.0':
+                cls = CloudSigma_2_0_NodeDriver
+            else:
+                raise NotImplementedError('Unsupported API version: %s' %
+                                          (api_version))
+        return super(CloudSigmaNodeDriver, cls).__new__(cls)
 
 
 class CloudSigmaException(Exception):
@@ -152,23 +90,6 @@ class CloudSigmaInsufficientFundsException(Exception):
         return "<CloudSigmaInsufficientFundsException '%s'>" % (self.args[0])
 
 
-class CloudSigmaResponse(Response):
-    def success(self):
-        if self.status == 401:
-            raise InvalidCredsError()
-
-        return self.status >= 200 and self.status <= 299
-
-    def parse_body(self):
-        if not self.body:
-            return self.body
-
-        return str2dicts(self.body)
-
-    def parse_error(self):
-        return 'Error: %s' % (self.body.replace('errors:', '').strip())
-
-
 class CloudSigmaNodeSize(NodeSize):
     def __init__(self, id, name, cpu, ram, disk, bandwidth, price, driver):
         self.id = id
@@ -187,9 +108,26 @@ class CloudSigmaNodeSize(NodeSize):
                    self.bandwidth, self.price, self.driver.name))
 
 
-class CloudSigmaBaseConnection(ConnectionUserAndKey):
-    host = API_ENDPOINTS[DEFAULT_ENDPOINT]['host']
-    responseCls = CloudSigmaResponse
+class CloudSigma_1_0_Response(Response):
+    def success(self):
+        if self.status == httplib.UNAUTHORIZED:
+            raise InvalidCredsError()
+
+        return self.status >= 200 and self.status <= 299
+
+    def parse_body(self):
+        if not self.body:
+            return self.body
+
+        return str2dicts(self.body)
+
+    def parse_error(self):
+        return 'Error: %s' % (self.body.replace('errors:', '').strip())
+
+
+class CloudSigma_1_0_Connection(ConnectionUserAndKey):
+    host = API_ENDPOINTS_1_0[DEFAULT_REGION]['host']
+    responseCls = CloudSigma_1_0_Response
 
     def add_default_headers(self, headers):
         headers['Accept'] = 'application/json'
@@ -200,11 +138,35 @@ class CloudSigmaBaseConnection(ConnectionUserAndKey):
         return headers
 
 
-class CloudSigmaBaseNodeDriver(NodeDriver):
+class CloudSigma_1_0_NodeDriver(CloudSigmaNodeDriver):
     type = Provider.CLOUDSIGMA
-    name = 'CloudSigma'
+    name = 'CloudSigma (API v1.0)'
     website = 'http://www.cloudsigma.com/'
-    connectionCls = CloudSigmaBaseConnection
+    connectionCls = CloudSigma_1_0_Connection
+
+    IMAGING_TIMEOUT = 20 * 60  # Default timeout (in seconds) for the drive
+                               # imaging process
+
+    NODE_STATE_MAP = {
+        'active': NodeState.RUNNING,
+        'stopped': NodeState.TERMINATED,
+        'dead': NodeState.TERMINATED,
+        'dumped': NodeState.TERMINATED,
+    }
+
+    def __init__(self, key, secret=None, secure=True, host=None, port=None,
+                 region=DEFAULT_REGION, **kwargs):
+        if region not in API_ENDPOINTS_1_0:
+            raise ValueError('Invalid region: %s' % (region))
+
+        self._host_argument_set = host is not None
+        self.api_name = 'cloudsigma_%s' % (region)
+        super(CloudSigma_1_0_NodeDriver, self).__init__(key=key, secret=secret,
+                                                        secure=secure,
+                                                        host=host,
+                                                        port=port,
+                                                        region=region,
+                                                        **kwargs)
 
     def reboot_node(self, node):
         """
@@ -280,7 +242,8 @@ class CloudSigmaBaseNodeDriver(NodeDriver):
 
     def list_sizes(self, location=None):
         sizes = []
-        for key, value in INSTANCE_TYPES.items():
+        for value in INSTANCE_TYPES:
+            key = value['id']
             size = CloudSigmaNodeSize(id=value['id'], name=value['name'],
                                       cpu=value['cpu'], ram=value['memory'],
                                       disk=value['disk'],
@@ -360,7 +323,8 @@ class CloudSigmaBaseNodeDriver(NodeDriver):
             response = self.connection.request(
                 action='/drives/%s/info' % (drive_uuid)).object
             elapsed_time = time.time() - imaging_start
-            if 'imaging' in response[0] and elapsed_time >= IMAGING_TIMEOUT:
+            timed_out = elapsed_time >= self.IMAGING_TIMEOUT
+            if 'imaging' in response[0] and timed_out:
                 raise CloudSigmaException('Drive imaging timed out')
             time.sleep(1)
 
@@ -400,7 +364,7 @@ class CloudSigmaBaseNodeDriver(NodeDriver):
         Destroy a node and all the drives associated with it.
 
         :param      node: Node which should be used
-        :type       node: :class:`Node`
+        :type       node: :class:`libcloud.compute.base.Node`
 
         :rtype: ``bool``
         """
@@ -497,7 +461,7 @@ class CloudSigmaBaseNodeDriver(NodeDriver):
         Changing most of the parameters requires node to be stopped.
 
         :param      node: Node which should be used
-        :type       node: :class:`Node`
+        :type       node: :class:`libcloud.compute.base.Node`
 
         :param      kwargs: keyword arguments
         :type       kwargs: ``dict``
@@ -539,7 +503,7 @@ class CloudSigmaBaseNodeDriver(NodeDriver):
         Start a node.
 
         :param      node: Node which should be used
-        :type       node: :class:`Node`
+        :type       node: :class:`libcloud.compute.base.Node`
 
         :rtype: ``bool``
         """
@@ -554,7 +518,7 @@ class CloudSigmaBaseNodeDriver(NodeDriver):
         Stop (shutdown) a node.
 
         :param      node: Node which should be used
-        :type       node: :class:`Node`
+        :type       node: :class:`libcloud.compute.base.Node`
 
         :rtype: ``bool``
         """
@@ -585,10 +549,20 @@ class CloudSigmaBaseNodeDriver(NodeDriver):
             method='POST')
         return response.status == 204
 
+    def _ex_connection_class_kwargs(self):
+        """
+        Return the host value based on the user supplied region.
+        """
+        kwargs = {}
+        if not self._host_argument_set:
+            kwargs['host'] = API_ENDPOINTS_1_0[self.region]['host']
+
+        return kwargs
+
     def _to_node(self, data):
         if data:
             try:
-                state = NODE_STATE_MAP[data['status']]
+                state = self.NODE_STATE_MAP[data['status']]
             except KeyError:
                 state = NodeState.UNKNOWN
 
@@ -651,14 +625,14 @@ class CloudSigmaBaseNodeDriver(NodeDriver):
         return result[0]
 
 
-class CloudSigmaZrhConnection(CloudSigmaBaseConnection):
+class CloudSigmaZrhConnection(CloudSigma_1_0_Connection):
     """
     Connection class for the CloudSigma driver for the Zurich end-point
     """
-    host = API_ENDPOINTS[DEFAULT_ENDPOINT]['host']
+    host = API_ENDPOINTS_1_0['zrh']['host']
 
 
-class CloudSigmaZrhNodeDriver(CloudSigmaBaseNodeDriver):
+class CloudSigmaZrhNodeDriver(CloudSigma_1_0_NodeDriver):
     """
     CloudSigma node driver for the Zurich end-point
     """
@@ -666,16 +640,1281 @@ class CloudSigmaZrhNodeDriver(CloudSigmaBaseNodeDriver):
     api_name = 'cloudsigma_zrh'
 
 
-class CloudSigmaLvsConnection(CloudSigmaBaseConnection):
+class CloudSigmaLvsConnection(CloudSigma_1_0_Connection):
     """
     Connection class for the CloudSigma driver for the Las Vegas end-point
     """
-    host = API_ENDPOINTS['lvs']['host']
+    host = API_ENDPOINTS_1_0['lvs']['host']
 
 
-class CloudSigmaLvsNodeDriver(CloudSigmaBaseNodeDriver):
+class CloudSigmaLvsNodeDriver(CloudSigma_1_0_NodeDriver):
     """
     CloudSigma node driver for the Las Vegas end-point
     """
     connectionCls = CloudSigmaLvsConnection
     api_name = 'cloudsigma_lvs'
+
+
+class CloudSigmaError(ProviderError):
+    """
+    Represents CloudSigma API error.
+    """
+
+    def __init__(self, http_code, error_type, error_msg, error_point, driver):
+        """
+        :param http_code: HTTP status code.
+        :type http_code: ``int``
+
+        :param error_type: Type of error (validation / notexist / backend /
+                           permissions  database / concurrency / billing /
+                           payment)
+        :type error_type: ``str``
+
+        :param error_msg: A description of the error that occurred.
+        :type error_msg: ``str``
+
+        :param error_point: Point at which the error occured. Can be None.
+        :type error_point: ``str`` or ``None``
+        """
+        super(CloudSigmaError, self).__init__(http_code=http_code,
+                                              value=error_msg, driver=driver)
+        self.error_type = error_type
+        self.error_msg = error_msg
+        self.error_point = error_point
+
+
+class CloudSigmaSubscription(object):
+    """
+    Represents CloudSigma subscription.
+    """
+
+    def __init__(self, id, resource, amount, period, status, price, start_time,
+                 end_time):
+        """
+        :param id: Subscription ID.
+        :type id: ``str``
+
+        :param resource: Resource (e.g vlan, ip, etc.).
+        :type resource: ``str``
+
+        :param period: Subscription period.
+        :type period: ``str``
+
+        :param status: Subscription status (active / inactive).
+        :type status: ``str``
+
+        :param price: Subscription price.
+        :type price: ``str``
+
+        :param start_time: Start time for this subscription.
+        :type start_time: ``datetime.datetime``
+
+        :param end_time: End time for this subscription.
+        :type end_time: ``datetime.datetime``
+        """
+        self.id = id
+        self.resource = resource
+        self.amount = amount
+        self.period = period
+        self.status = status
+        self.price = price
+        self.start_time = start_time
+        self.end_time = end_time
+
+    def __str__(self):
+        return self.__repr__()
+
+    def __repr__(self):
+        return ('<CloudSigmaSubscription id=%s, resource=%s, amount=%s>' %
+                (self.id, self.resource, self.amount))
+
+
+class CloudSigmaTag(object):
+    """
+    Represents a CloudSigma tag object.
+    """
+
+    def __init__(self, id, name, resources=None):
+        """
+        :param id: Tag ID.
+        :type id: ``str``
+
+        :param name: Tag name.
+        :type name: ``str``
+
+        :param resource: IDs of resources which are associated with this tag.
+        :type resources: ``list`` of ``str``
+        """
+        self.id = id
+        self.name = name
+        self.resources = resources if resources else []
+
+    def __str__(self):
+        return self.__repr__()
+
+    def __repr__(self):
+        return ('<CloudSigmaTag id=%s, name=%s, resources=%s>' %
+                (self.id, self.name, repr(self.resources)))
+
+
+class CloudSigmaDrive(NodeImage):
+    """
+    Represents a CloudSigma drive.
+    """
+
+    def __init__(self, id, name, size, media, status, driver, extra=None):
+        """
+        :param id: Drive ID.
+        :type id: ``str``
+
+        :param name: Drive name.
+        :type name: ``str``
+
+        :param size: Drive size (in bytes).
+        :type size: ``int``
+
+        :param media: Drive media (cdrom / disk).
+        :type media: ``str``
+
+        :param status: Drive status (unmounted / mounted).
+        :type status: ``str``
+        """
+        super(CloudSigmaDrive, self).__init__(id=id, name=name, driver=driver,
+                                              extra=extra)
+        self.size = size
+        self.media = media
+        self.status = status
+
+    def __str__(self):
+        return self.__repr__()
+
+    def __repr__(self):
+        return (('<CloudSigmaSize id=%s, name=%s size=%s, media=%s, '
+                'status=%s>') %
+                (self.id, self.name, self.size, self.media, self.status))
+
+
+class CloudSigmaFirewallPolicy(object):
+    """
+    Represents a CloudSigma firewall policy.
+    """
+
+    def __init__(self, id, name, rules):
+        """
+        :param id: Policy ID.
+        :type id: ``str``
+
+        :param name: Policy name.
+        :type name: ``str``
+
+        :param rules: Rules associated with this policy.
+        :type rules: ``list`` of :class:`.CloudSigmaFirewallPolicyRule` objects
+        """
+        self.id = id
+        self.name = name
+        self.rules = rules if rules else []
+
+    def __str__(self):
+        return self.__repr__()
+
+    def __repr__(self):
+        return (('<CloudSigmaFirewallPolicy id=%s, name=%s rules=%s>') %
+                (self.id, self.name, repr(self.rules)))
+
+
+class CloudSigmaFirewallPolicyRule(object):
+    """
+    Represents a CloudSigma firewall policy rule.
+    """
+
+    def __init__(self, action, direction, ip_proto=None, src_ip=None,
+                 src_port=None, dst_ip=None, dst_port=None, comment=None):
+        """
+        :param action: Action (drop / accept).
+        :type action: ``str``
+
+        :param direction: Rule direction (in / out / both)>
+        :type direction: ``str``
+
+        :param ip_proto: IP protocol (tcp / udp).
+        :type ip_proto: ``str``.
+
+        :param src_ip: Source IP in CIDR notation.
+        :type src_ip: ``str``
+
+        :param src_port: Source port or a port range.
+        :type src_port: ``str``
+
+        :param dst_ip: Destination IP in CIDR notation.
+        :type dst_ip: ``str``
+
+        :param src_port: Destination port or a port range.
+        :type src_port: ``str``
+
+        :param comment: Comment associated with the policy.
+        :type comment: ``str``
+        """
+        self.action = action
+        self.direction = direction
+        self.ip_proto = ip_proto
+        self.src_ip = src_ip
+        self.src_port = src_port
+        self.dst_ip = dst_ip
+        self.dst_port = dst_port
+        self.comment = comment
+
+    def __str__(self):
+        return self.__repr__()
+
+    def __repr__(self):
+        return (('<CloudSigmaFirewallPolicyRule action=%s, direction=%s>') %
+                (self.action, self.direction))
+
+
+class CloudSigma_2_0_Response(JsonResponse):
+    success_status_codes = [
+        httplib.OK,
+        httplib.ACCEPTED,
+        httplib.NO_CONTENT,
+        httplib.CREATED
+    ]
+
+    def success(self):
+        return self.status in self.success_status_codes
+
+    def parse_error(self):
+        if int(self.status) == httplib.UNAUTHORIZED:
+            raise InvalidCredsError('Invalid credentials')
+
+        body = self.parse_body()
+        errors = self._parse_errors_from_body(body=body)
+
+        if errors:
+            # Throw first error
+            raise errors[0]
+
+        return body
+
+    def _parse_errors_from_body(self, body):
+        """
+        Parse errors from the response body.
+
+        :return: List of error objects.
+        :rtype: ``list`` of :class:`.CloudSigmaError` objects
+        """
+        errors = []
+
+        if not isinstance(body, list):
+            return None
+
+        for item in body:
+            if not 'error_type' in item:
+                # Unrecognized error
+                continue
+
+            error = CloudSigmaError(http_code=self.status,
+                                    error_type=item['error_type'],
+                                    error_msg=item['error_message'],
+                                    error_point=item['error_point'],
+                                    driver=self.connection.driver)
+            errors.append(error)
+
+        return errors
+
+
+class CloudSigma_2_0_Connection(ConnectionUserAndKey):
+    host = API_ENDPOINTS_2_0[DEFAULT_REGION]['host']
+    responseCls = CloudSigma_2_0_Response
+    api_prefix = '/api/2.0'
+
+    def add_default_headers(self, headers):
+        headers['Accept'] = 'application/json'
+        headers['Content-Type'] = 'application/json'
+
+        headers['Authorization'] = 'Basic %s' % (base64.b64encode(
+            b('%s:%s' % (self.user_id, self.key))).decode('utf-8'))
+        return headers
+
+    def encode_data(self, data):
+        data = json.dumps(data)
+        return data
+
+    def request(self, action, params=None, data=None, headers=None,
+                method='GET', raw=False):
+        params = params or {}
+        action = self.api_prefix + action
+
+        if method == 'GET':
+            params['limit'] = 0  # we want all the items back
+
+        return super(CloudSigma_2_0_Connection, self).request(action=action,
+                                                              params=params,
+                                                              data=data,
+                                                              headers=headers,
+                                                              method=method,
+                                                              raw=raw)
+
+
+class CloudSigma_2_0_NodeDriver(CloudSigmaNodeDriver):
+    """
+    Driver for CloudSigma API v2.0.
+    """
+    name = 'CloudSigma (API v2.0)'
+    api_name = 'cloudsigma_zrh'
+    website = 'http://www.cloudsigma.com/'
+    connectionCls = CloudSigma_2_0_Connection
+
+    DRIVE_TRANSITION_TIMEOUT = 500  # Default drive transition timeout in
+                                    # seconds
+    DRIVE_TRANSITION_SLEEP_INTERVAL = 5  # How long to sleep between different
+                                         # polling periods while waiting for
+                                         # drive transition
+
+    NODE_STATE_MAP = {
+        'starting': NodeState.PENDING,
+        'stopping': NodeState.PENDING,
+        'unavailable': NodeState.PENDING,
+        'running': NodeState.RUNNING,
+        'stopped': NodeState.STOPPED,
+        'paused': NodeState.STOPPED
+    }
+
+    def __init__(self, key, secret, secure=True, host=None, port=None,
+                 region=DEFAULT_REGION, **kwargs):
+        if not region in API_ENDPOINTS_2_0:
+            raise ValueError('Invalid region: %s' % (region))
+
+        if not secure:
+            # CloudSigma drive uses Basic Auth authentication and we don't want
+            # to allow user to accidentally send credentials over the wire in
+            # plain-text
+            raise ValueError('CloudSigma driver only supports a '
+                             'secure connection')
+
+        self._host_argument_set = host is not None
+        super(CloudSigma_2_0_NodeDriver, self).__init__(key=key, secret=secret,
+                                                        secure=secure,
+                                                        host=host, port=port,
+                                                        region=region,
+                                                        **kwargs)
+
+    def list_nodes(self, ex_tag=None):
+        """
+        List available nodes.
+
+        :param ex_tag: If specified, only return servers tagged with the
+                       provided tag.
+        :type ex_tag: :class:`CloudSigmaTag`
+        """
+        if ex_tag:
+            action = '/tags/%s/servers/detail/' % (ex_tag.id)
+        else:
+            action = '/servers/detail/'
+
+        response = self.connection.request(action=action, method='GET').object
+        nodes = [self._to_node(data=item) for item in response['objects']]
+        return nodes
+
+    def list_sizes(self):
+        """
+        List available sizes.
+        """
+        sizes = []
+        for value in INSTANCE_TYPES:
+            key = value['id']
+            size = CloudSigmaNodeSize(id=value['id'], name=value['name'],
+                                      cpu=value['cpu'], ram=value['memory'],
+                                      disk=value['disk'],
+                                      bandwidth=value['bandwidth'],
+                                      price=self._get_size_price(size_id=key),
+                                      driver=self.connection.driver)
+            sizes.append(size)
+
+        return sizes
+
+    def list_images(self):
+        """
+        Return a list of available pre-installed library drives.
+
+        Note: If you want to list all the available images and drives, use
+        :meth:`ex_list_drives` method.
+        """
+        response = self.connection.request(action='/libdrives/').object
+        images = [self._to_image(data=item) for item in response['objects']]
+
+        # We filter out non pre-installed library drives by defafault because
+        # they can't be used directly following a default Libcloud server
+        # creation flow.
+        images = [image for image in images if
+                  image.extra['image_type'] == 'preinst']
+        return images
+
+    def create_node(self, name, size, image, ex_metadata=None,
+                    ex_vnc_password=None, ex_avoid=None):
+        """
+        Create a new server.
+
+        Server creation consists of 4 separate steps:
+
+        1. Clone provided library drive so we can use it
+        2. Resize cloned drive to the desired size
+        3. Create a server and attach cloned drive
+        4. Start a server.
+
+        :param ex_metadata: Key / value pairs to associate with the
+                            created node. (optional)
+        :type ex_metadata: ``dict``
+
+        :param ex_vnc_password: Password to use for VNC access. If not
+                                provided, random password is generated.
+        :type ex_vnc_password: ``str``
+
+        :param ex_avoid: A list of server UUIDs to avoid when starting this
+                         node. (optional)
+        :type ex_avoid: ``list``
+        """
+        # Only pre-installed images can be used with create_node
+
+        if ex_vnc_password:
+            vnc_password = ex_vnc_password
+        else:
+            # VNC password is not provided, generate a random one.
+            vnc_password = get_secure_random_string(size=12)
+
+        drive_name = '%s-drive' % (name)
+        drive_size = (size.disk * 1024 * 1024 * 1024)  # size is specified in
+                                                       # GB
+
+        # 1. Clone library drive so we can use it
+        drive = self.ex_clone_drive(drive=image, name=drive_name)
+
+        # Wait for drive clone to finish
+        drive = self._wait_for_drive_state_transition(drive=drive,
+                                                      state='unmounted')
+
+        # 2. Resize drive to the desired disk size if the desired disk size is
+        # larger than the cloned drive size.
+        if drive_size > drive.size:
+            drive = self.ex_resize_drive(drive=drive, size=drive_size)
+
+        # Wait for drive resize to finish
+        drive = self._wait_for_drive_state_transition(drive=drive,
+                                                      state='unmounted')
+
+        # 3. Create server and attach cloned drive
+        # ide 0:0
+        data = {}
+        data['name'] = name
+        data['cpu'] = size.cpu
+        data['mem'] = (size.ram * 1024 * 1024)
+        data['vnc_password'] = vnc_password
+
+        if ex_metadata:
+            data['meta'] = ex_metadata
+
+        data['drives'] = [
+            {
+                'boot_order': 1,
+                'dev_channel': '0:0',
+                'device': 'ide',
+                'drive': drive.id
+            }
+        ]
+
+        action = '/servers/'
+        response = self.connection.request(action=action, method='POST',
+                                           data=data)
+        node = self._to_node(response.object['objects'][0])
+
+        # 4. Start server
+        self.ex_start_node(node=node, ex_avoid=ex_avoid)
+
+        return node
+
+    def destroy_node(self, node):
+        """
+        Destroy the node and all the associated drives.
+
+        :return: ``True`` on success, ``False`` otherwise.
+        :rtype: ``bool``
+        """
+        action = '/servers/%s/' % (node.id)
+        params = {'recurse': 'all_drives'}
+        response = self.connection.request(action=action, method='DELETE',
+                                           params=params)
+        return response.status == httplib.NO_CONTENT
+
+    # Server extension methods
+
+    def ex_edit_node(self, node, params):
+        """
+        Edit a node.
+
+        :param node: Node to edit.
+        :type node: :class:`libcloud.compute.base.Node`
+
+        :param params: Node parameters to update.
+        :type params: ``dict``
+
+        :return Edited node.
+        :rtype: :class:`libcloud.compute.base.Node`
+        """
+        data = {}
+
+        # name, cpu, mem and vnc_password attributes must always be present so
+        # we just copy them from the to-be-edited node
+        data['name'] = node.name
+        data['cpu'] = node.extra['cpu']
+        data['mem'] = node.extra['mem']
+        data['vnc_password'] = node.extra['vnc_password']
+
+        nics = copy.deepcopy(node.extra.get('nics', []))
+
+        data['nics'] = nics
+
+        data.update(params)
+
+        action = '/servers/%s/' % (node.id)
+        response = self.connection.request(action=action, method='PUT',
+                                           data=data).object
+        node = self._to_node(data=response)
+        return node
+
+    def ex_start_node(self, node, ex_avoid=None):
+        """
+        Start a node.
+
+        :param node: Node to start.
+        :type node: :class:`libcloud.compute.base.Node`
+
+        :param ex_avoid: A list of other server uuids to avoid when
+                         starting this node. If provided, node will
+                         attempt to be started on a different
+                         physical infrastructure from other servers
+                         specified using this argument. (optional)
+        :type ex_avoid: ``list``
+        """
+        params = {}
+
+        if ex_avoid:
+            params['avoid'] = ','.join(ex_avoid)
+
+        path = '/servers/%s/action/' % (node.id)
+        response = self._perform_action(path=path, action='start',
+                                        params=params,
+                                        method='POST')
+        return response.status == httplib.ACCEPTED
+
+    def ex_stop_node(self, node):
+        """
+        Stop a node.
+        """
+        path = '/servers/%s/action/' % (node.id)
+        response = self._perform_action(path=path, action='stop',
+                                        method='POST')
+        return response.status == httplib.ACCEPTED
+
+    def ex_clone_node(self, node, name=None, random_vnc_password=None):
+        """
+        Clone the provided node.
+
+        :param name: Optional name for the cloned node.
+        :type name: ``str``
+        :param random_vnc_password: If True, a new random VNC password will be
+                                    generated for the cloned node. Otherwise
+                                    password from the cloned node will be
+                                    reused.
+        :type random_vnc_password: ``bool``
+
+        :return: Cloned node.
+        :rtype: :class:`libcloud.compute.base.Node`
+        """
+        data = {}
+
+        data['name'] = name
+        data['random_vnc_password'] = random_vnc_password
+
+        path = '/servers/%s/action/' % (node.id)
+        response = self._perform_action(path=path, action='clone',
+                                        method='POST', data=data).object
+        node = self._to_node(data=response)
+        return node
+
+    def ex_open_vnc_tunnel(self, node):
+        """
+        Open a VNC tunnel to the provided node and return the VNC url.
+
+        :param node: Node to open the VNC tunnel to.
+        :type node: :class:`libcloud.compute.base.Node`
+
+        :return: URL of the opened VNC tunnel.
+        :rtype: ``str``
+        """
+        path = '/servers/%s/action/' % (node.id)
+        response = self._perform_action(path=path, action='open_vnc',
+                                        method='POST').object
+        vnc_url = response['vnc_url']
+        return vnc_url
+
+    def ex_close_vnc_tunnel(self, node):
+        """
+        Close a VNC server to the provided node.
+
+        :param node: Node to close the VNC tunnel to.
+        :type node: :class:`libcloud.compute.base.Node`
+
+        :return: ``True`` on success, ``False`` otherwise.
+        :rtype: ``bool``
+        """
+        path = '/servers/%s/action/' % (node.id)
+        response = self._perform_action(path=path, action='close_vnc',
+                                        method='POST')
+        return response.status == httplib.ACCEPTED
+
+    # Drive extension methods
+
+    def ex_list_drives(self):
+        """
+        Return a list of all the available user's drives.
+
+        :rtype: ``list`` of :class:`.CloudSigmaDrive` objects
+        """
+        response = self.connection.request(action='/drives/detail/').object
+        drives = [self._to_drive(data=item) for item in response['objects']]
+        return drives
+
+    def ex_create_drive(self, name, size, media='disk'):
+        """
+        Create a new drive.
+
+        :param name: Drive name.
+        :type name: ``str``
+
+        :param size: Drive size in bytes.
+        :type size: ``int``
+
+        :param media: Drive media type (cdrom, disk).
+        :type media: ``str``
+        """
+        data = {
+            'name': name,
+            'size': size,
+            'media': media
+        }
+
+        action = '/drives/'
+        response = self.connection.request(action=action, method='POST',
+                                           data=data).object
+        drive = self._to_drive(data=response['objects'][0])
+        return drive
+
+    def ex_clone_drive(self, drive, name=None):
+        """
+        Clone a library or a standard drive.
+
+        :param drive: Drive to clone.
+        :type drive: :class:`libcloud.compute.base.NodeImage` or
+                     :class:`.CloudSigmaDrive`
+
+        :param name: Optional name for the cloned drive.
+        :type name: ``str``
+
+        :return: New cloned drive.
+        :rtype: :class:`.CloudSigmaDrive`
+        """
+        data = {}
+
+        if name:
+            data['name'] = name
+
+        path = '/drives/%s/action/' % (drive.id)
+        response = self._perform_action(path=path, action='clone',
+                                        method='POST', data=data)
+        drive = self._to_drive(data=response.object['objects'][0])
+        return drive
+
+    def ex_resize_drive(self, drive, size):
+        """
+        Resize a drive.
+
+        :param drive: Drive to resize.
+
+        :param size: New drive size in bytes.
+        :type size: ``int``
+
+        :return: Drive object which is being resized.
+        :rtype: :class:`.CloudSigmaDrive`
+        """
+        path = '/drives/%s/action/' % (drive.id)
+        data = {'name': drive.name, 'size': size, 'media': 'disk'}
+        response = self._perform_action(path=path, action='resize',
+                                        method='POST', data=data)
+
+        drive = self._to_drive(data=response.object['objects'][0])
+        return drive
+
+    def ex_attach_drive(self, node):
+        """
+        Attach a drive to the provided node.
+        """
+        # TODO
+        pass
+
+    def ex_get_drive(self, drive_id):
+        """
+        Retrieve information about a single drive.
+
+        :param drive_id: ID of the drive to retrieve.
+        :type drive_id: ``str``
+
+        :return: Drive object.
+        :rtype: :class:`.CloudSigmaDrive`
+        """
+        action = '/drives/%s/' % (drive_id)
+        response = self.connection.request(action=action).object
+        drive = self._to_drive(data=response)
+        return drive
+
+    # Firewall policies extension methods
+
+    def ex_list_firewall_policies(self):
+        """
+        List firewall policies.
+
+        :rtype: ``list`` of :class:`.CloudSigmaFirewallPolicy`
+        """
+        action = '/fwpolicies/detail/'
+        response = self.connection.request(action=action, method='GET').object
+        policies = [self._to_firewall_policy(data=item) for item
+                    in response['objects']]
+        return policies
+
+    def ex_create_firewall_policy(self, name, rules=None):
+        """
+        Create a firewall policy.
+
+        :param name: Policy name.
+        :type name: ``str``
+
+        :param rules: List of firewall policy rules to associate with this
+                      policy. (optional)
+        :type rules: ``list`` of ``dict``
+
+        :return: Created firewall policy object.
+        :rtype: :class:`.CloudSigmaFirewallPolicy`
+        """
+        data = {}
+        obj = {}
+        obj['name'] = name
+
+        if rules:
+            obj['rules'] = rules
+
+        data['objects'] = [obj]
+
+        action = '/fwpolicies/'
+        response = self.connection.request(action=action, method='POST',
+                                           data=data).object
+        policy = self._to_firewall_policy(data=response['objects'][0])
+        return policy
+
+    def ex_attach_firewall_policy(self, policy, node, nic_mac=None):
+        """
+        Attach firewall policy to a public NIC interface on the server.
+
+        :param policy: Firewall policy to attach.
+        :type policy: :class:`.CloudSigmaFirewallPolicy`
+
+        :param node: Node to attach policy to.
+        :type node: :class:`libcloud.compute.base.Node`
+
+        :param nic_mac: Optional MAC address of the NIC to add the policy to.
+                        If not specified, first public interface is used
+                        instead.
+        :type nic_mac: ``str``
+
+        :return: Node object to which the policy was attached to.
+        :rtype: :class:`libcloud.compute.base.Node`
+        """
+        nics = copy.deepcopy(node.extra.get('nics', []))
+
+        if nic_mac:
+            nic = [n for n in nics if n['mac'] == nic_mac]
+        else:
+            nic = nics
+
+        if len(nic) == 0:
+            raise ValueError('Cannot find the NIC interface to attach '
+                             'a policy to')
+
+        nic = nic[0]
+        nic['firewall_policy'] = policy.id
+
+        params = {'nics': nics}
+        node = self.ex_edit_node(node=node, params=params)
+        return node
+
+    def ex_delete_firewall_policy(self, policy):
+        """
+        Delete a firewall policy.
+
+        :param policy: Policy to delete to.
+        :type policy: :class:`.CloudSigmaFirewallPolicy`
+
+        :return: ``True`` on success, ``False`` otherwise.
+        :rtype: ``bool``
+        """
+        action = '/fwpolicies/%s/' % (policy.id)
+        response = self.connection.request(action=action, method='DELETE')
+        return response.status == httplib.NO_CONTENT
+
+    # Tag extension methods
+
+    def ex_list_tags(self):
+        """
+        List all the available tags.
+
+        :rtype: ``list`` of :class:`.CloudSigmaTag` objects
+        """
+        action = '/tags/detail/'
+        response = self.connection.request(action=action, method='GET').object
+        tags = [self._to_tag(data=item) for item in response['objects']]
+
+        return tags
+
+    def ex_get_tag(self, tag_id):
+        """
+        Retrieve a single tag.
+
+        :param id: ID of the tag to retrieve.
+        :type id: ``str``
+
+        :rtype: ``list`` of :class:`.CloudSigmaTag` objects
+        """
+        action = '/tags/%s/' % (tag_id)
+        response = self.connection.request(action=action, method='GET').object
+        tag = self._to_tag(data=response)
+        return tag
+
+    def ex_create_tag(self, name, resource_uuids=None):
+        """
+        Create a tag.
+
+        :param name: Tag name.
+        :type name: ``str``
+
+        :param resource_uuids: Optional list of resource UUIDs to assign this
+                               tag go.
+        :type resource_uuids: ``list`` of ``str``
+
+        :return: Created tag object.
+        :rtype: :class:`.CloudSigmaTag`
+        """
+        data = {}
+        data['objects'] = [
+            {
+                'name': name
+            }
+        ]
+
+        if resource_uuids:
+            data['resources'] = resource_uuids
+
+        action = '/tags/'
+        response = self.connection.request(action=action, method='POST',
+                                           data=data).object
+        tag = self._to_tag(data=response['objects'][0])
+        return tag
+
+    def ex_tag_resource(self, resource, tag):
+        """
+        Associate tag with the provided resource.
+
+        :param resource: Resource to associate a tag with.
+        :type resource: :class:`libcloud.compute.base.Node` or
+                        :class:`.CloudSigmaDrive`
+
+        :param tag: Tag to associate with the resources.
+        :type tag: :class:`.CloudSigmaTag`
+
+        :return: Updated tag object.
+        :rtype: :class:`.CloudSigmaTag`
+        """
+        if not hasattr(resource, 'id'):
+            raise ValueError('Resource doesn\'t have id attribute')
+
+        return self.ex_tag_resources(resources=[resource], tag=tag)
+
+    def ex_tag_resources(self, resources, tag):
+        """
+        Associate tag with the provided resources.
+
+        :param resource: Resources to associate a tag with.
+        :type resource: ``list`` of :class:`libcloud.compute.base.Node` or
+                        :class:`.CloudSigmaDrive`
+
+        :param tag: Tag to associate with the resources.
+        :type tag: :class:`.CloudSigmaTag`
+
+        :return: Updated tag object.
+        :rtype: :class:`.CloudSigmaTag`
+        """
+
+        resources = tag.resources[:]
+
+        for resource in resources:
+            if not hasattr(resource, 'id'):
+                raise ValueError('Resource doesn\'t have id attribute')
+
+            resources.append(resource.id)
+
+        resources = list(set(resources))
+
+        data = {
+            'name': tag.name,
+            'resources': resources
+        }
+
+        action = '/tags/%s/' % (tag.id)
+        response = self.connection.request(action=action, method='PUT',
+                                           data=data).object
+        tag = self._to_tag(data=response)
+        return tag
+
+    def ex_delete_tag(self, tag):
+        """
+        Delete a tag.
+
+        :param tag: Tag to delete.
+        :type tag: :class:`.CloudSigmaTag`
+
+        :return: ``True`` on success, ``False`` otherwise.
+        :rtype: ``bool``
+        """
+        action = '/tags/%s/' % (tag.id)
+        response = self.connection.request(action=action, method='DELETE')
+        return response.status == httplib.NO_CONTENT
+
+    # Account extension methods
+
+    def ex_get_balance(self):
+        """
+        Retrueve account balance information.
+
+        :return: Dictionary with two items ("balance" and "currency").
+        :rtype: ``dict``
+        """
+        action = '/balance/'
+        response = self.connection.request(action=action, method='GET')
+        return response.object
+
+    def ex_get_pricing(self):
+        """
+        Retrive pricing information that are applicable to the cloud.
+
+        :return: Dictionary with pricing information.
+        :rtype: ``dict``
+        """
+        action = '/pricing/'
+        response = self.connection.request(action=action, method='GET')
+        return response.object
+
+    def ex_get_usage(self):
+        """
+        Retrieve account current usage information.
+
+        :return: Dictionary with two items ("balance" and "usage").
+        :rtype: ``dict``
+        """
+        action = '/currentusage/'
+        response = self.connection.request(action=action, method='GET')
+        return response.object
+
+    def ex_list_subscriptions(self, status='all', resources=None):
+        """
+        List subscriptions for this account.
+
+        :param status: Only return subscriptions with the provided status
+                       (optional).
+        :type status: ``str``
+        :param resources: Only return subscriptions for the provided resources
+                          (optional).
+        :type resources: ``list``
+
+        :rtype: ``list``
+        """
+        params = {}
+
+        if status:
+            params['status'] = status
+
+        if resources:
+            params['resource'] = ','.join(resources)
+
+        response = self.connection.request(action='/subscriptions/',
+                                           params=params).object
+        subscriptions = self._to_subscriptions(data=response)
+        return subscriptions
+
+    def ex_toggle_subscription_auto_renew(self, subscription):
+        """
+        Toggle subscription auto renew status.
+
+        :param subscription: Subscription to toggle the auto renew flag for.
+        :type subscription: :class:`.CloudSigmaSubscription`
+
+        :return: ``True`` on success, ``False`` otherwise.
+        :rtype: ``bool``
+        """
+        path = '/subscriptions/%s/action/' % (subscription.id)
+        response = self._perform_action(path=path, action='auto_renew',
+                                        method='POST')
+        return response.status == httplib.OK
+
+    # Misc extension methods
+
+    def ex_list_capabilities(self):
+        """
+        Retrieve all the basic and sensible limits of the API.
+
+        :rtype: ``dict``
+        """
+        action = '/capabilities/'
+        response = self.connection.request(action=action,
+                                           method='GET')
+        capabilities = response.object
+        return capabilities
+
+    def _parse_ips_from_nic(self, nic):
+        """
+        Parse private and public IP addresses from the provided network
+        interface object.
+
+        :param nic: NIC object.
+        :type nic: ``dict``
+
+        :return: (public_ips, private_ips) tuple.
+        :rtype: ``tuple``
+        """
+        public_ips, private_ips = [], []
+
+        ipv4_conf = nic['ip_v4_conf']
+        ipv6_conf = nic['ip_v6_conf']
+
+        ipv4 = ipv4_conf['ip'] if ipv4_conf else None
+        ipv6 = ipv6_conf['ip'] if ipv6_conf else None
+
+        ips = []
+
+        if ipv4:
+            ips.append(ipv4)
+
+        if ipv6:
+            ips.append(ipv6)
+
+        runtime = nic['runtime']
+
+        ip_v4 = runtime['ip_v4'] if nic['runtime'] else None
+        ip_v6 = runtime['ip_v6'] if nic['runtime'] else None
+
+        ipv4 = ip_v4['uuid'] if ip_v4 else None
+        ipv6 = ip_v4['uuid'] if ip_v6 else None
+
+        if ipv4:
+            ips.append(ipv4)
+
+        if ipv6:
+            ips.append(ipv6)
+
+        ips = set(ips)
+
+        for ip in ips:
+            if is_private_subnet(ip):
+                private_ips.append(ip)
+            else:
+                public_ips.append(ip)
+
+        return public_ips, private_ips
+
+    def _to_node(self, data):
+        extra_keys = ['cpu', 'mem', 'nics', 'vnc_password', 'meta']
+
+        id = data['uuid']
+        name = data['name']
+        state = self.NODE_STATE_MAP.get(data['status'], NodeState.UNKNOWN)
+
+        public_ips = []
+        private_ips = []
+        extra = self._extract_values(obj=data, keys=extra_keys)
+
+        for nic in data['nics']:
+            _public_ips, _private_ips = self._parse_ips_from_nic(nic=nic)
+
+            public_ips.extend(_public_ips)
+            private_ips.extend(_private_ips)
+
+        node = Node(id=id, name=name, state=state, public_ips=public_ips,
+                    private_ips=private_ips, driver=self, extra=extra)
+        return node
+
+    def _to_image(self, data):
+        extra_keys = ['description', 'arch', 'image_type', 'os', 'licenses',
+                      'media', 'meta']
+
+        id = data['uuid']
+        name = data['name']
+        extra = self._extract_values(obj=data, keys=extra_keys)
+
+        image = NodeImage(id=id, name=name, driver=self, extra=extra)
+        return image
+
+    def _to_drive(self, data):
+        id = data['uuid']
+        name = data['name']
+        size = data['size']
+        media = data['media']
+        status = data['status']
+        extra = {}
+
+        drive = CloudSigmaDrive(id=id, name=name, size=size, media=media,
+                                status=status, driver=self, extra=extra)
+
+        return drive
+
+    def _to_tag(self, data):
+        resources = data['resources']
+        resources = [resource['uuid'] for resource in resources]
+
+        tag = CloudSigmaTag(id=data['uuid'], name=data['name'],
+                            resources=resources)
+        return tag
+
+    def _to_subscriptions(self, data):
+        subscriptions = []
+
+        for item in data['objects']:
+            subscription = self._to_subscription(data=item)
+            subscriptions.append(subscription)
+
+        return subscriptions
+
+    def _to_subscription(self, data):
+        start_time = parse_date(data['start_time'])
+        end_time = parse_date(data['end_time'])
+
+        subscription = CloudSigmaSubscription(id=data['id'],
+                                              resource=data['resource'],
+                                              amount=data['amount'],
+                                              period=data['period'],
+                                              status=data['status'],
+                                              price=data['price'],
+                                              start_time=start_time,
+                                              end_time=end_time)
+        return subscription
+
+    def _to_firewall_policy(self, data):
+        rules = []
+
+        for item in data.get('rules', []):
+            rule = CloudSigmaFirewallPolicyRule(action=item['action'],
+                                                direction=item['direction'],
+                                                ip_proto=item['ip_proto'],
+                                                src_ip=item['src_ip'],
+                                                src_port=item['src_port'],
+                                                dst_ip=item['dst_ip'],
+                                                dst_port=item['dst_port'],
+                                                comment=item['comment'])
+            rules.append(rule)
+
+        policy = CloudSigmaFirewallPolicy(id=data['uuid'], name=data['name'],
+                                          rules=rules)
+        return policy
+
+    def _perform_action(self, path, action, method='POST', params=None,
+                        data=None):
+        """
+        Perform API action and return response object.
+        """
+        if params:
+            params = params.copy()
+        else:
+            params = {}
+
+        params['do'] = action
+        response = self.connection.request(action=path, method=method,
+                                           params=params, data=data)
+        return response
+
+    def _extract_values(self, obj, keys):
+        """
+        Extract values from a dictionary and return a new dictionary with
+        extracted values.
+
+        :param obj: Dictionary to extract values from.
+        :type obj: ``dict``
+
+        :param keys: Keys to extract.
+        :type keys: ``list``
+
+        :return: Dictionary with extracted values.
+        :rtype: ``dict``
+        """
+        result = {}
+
+        for key in keys:
+            result[key] = obj[key]
+
+        return result
+
+    def _wait_for_drive_state_transition(self, drive, state,
+                                         timeout=DRIVE_TRANSITION_TIMEOUT):
+        """
+        Wait for a drive to transition to the provided state.
+
+        Note: This function blocks and periodically calls "GET drive" endpoint
+        to check if the drive has already transitioned to the desired state.
+
+        :param drive: Drive to wait for.
+        :type drive: :class:`.CloudSigmaDrive`
+
+        :param state: Desired drive state.
+        :type state: ``str``
+
+        :param timeout: How long to wait for the transition (in seconds) before
+                        timing out.
+        :type timeout: ``int``
+
+        :return: Drive object.
+        :rtype: :class:`.CloudSigmaDrive`
+        """
+
+        start_time = time.time()
+
+        while drive.status != state:
+            drive = self.ex_get_drive(drive_id=drive.id)
+
+            if drive.status == state:
+                break
+
+            current_time = time.time()
+            delta = (current_time - start_time)
+
+            if delta >= timeout:
+                msg = ('Timed out while waiting for drive transition '
+                       '(timeout=%s seconds)' % (timeout))
+                raise Exception(msg)
+
+            time.sleep(self.DRIVE_TRANSITION_SLEEP_INTERVAL)
+
+        return drive
+
+    def _ex_connection_class_kwargs(self):
+        """
+        Return the host value based on the user supplied region.
+        """
+        kwargs = {}
+
+        if not self._host_argument_set:
+            kwargs['host'] = API_ENDPOINTS_2_0[self.region]['host']
+
+        return kwargs

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/libcloud/compute/providers.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/providers.py b/libcloud/compute/providers.py
index 343a7f2..8cc5a3c 100644
--- a/libcloud/compute/providers.py
+++ b/libcloud/compute/providers.py
@@ -70,9 +70,7 @@ DRIVERS = {
     Provider.SERVERLOVE:
     ('libcloud.compute.drivers.serverlove', 'ServerLoveNodeDriver'),
     Provider.CLOUDSIGMA:
-    ('libcloud.compute.drivers.cloudsigma', 'CloudSigmaZrhNodeDriver'),
-    Provider.CLOUDSIGMA_US:
-    ('libcloud.compute.drivers.cloudsigma', 'CloudSigmaLvsNodeDriver'),
+    ('libcloud.compute.drivers.cloudsigma', 'CloudSigmaNodeDriver'),
     Provider.GCE:
     ('libcloud.compute.drivers.gce', 'GCENodeDriver'),
     Provider.GOGRID:
@@ -141,6 +139,10 @@ DRIVERS = {
     ('libcloud.compute.drivers.exoscale', 'ExoscaleNodeDriver'),
     Provider.IKOULA:
     ('libcloud.compute.drivers.ikoula', 'IkoulaNodeDriver'),
+
+    # Deprecated
+    Provider.CLOUDSIGMA_US:
+    ('libcloud.compute.drivers.cloudsigma', 'CloudSigmaLvsNodeDriver'),
 }
 
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/libcloud/compute/types.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/types.py b/libcloud/compute/types.py
index dc83a03..b736b2f 100644
--- a/libcloud/compute/types.py
+++ b/libcloud/compute/types.py
@@ -104,7 +104,6 @@ class Provider(object):
     NINEFOLD = 'ninefold'
     TERREMARK = 'terremark'
     CLOUDSTACK = 'cloudstack'
-    CLOUDSIGMA_US = 'cloudsigma_us'
     LIBVIRT = 'libvirt'
     JOYENT = 'joyent'
     VCL = 'vcl'
@@ -139,6 +138,8 @@ class Provider(object):
     ELASTICHOSTS_AU1 = 'elastichosts_au1'
     ELASTICHOSTS_CN1 = 'elastichosts_cn1'
 
+    CLOUDSIGMA_US = 'cloudsigma_us'
+
     # Deprecated constants which aren't supported anymore
     RACKSPACE_UK = 'rackspace_uk'
     RACKSPACE_NOVA_BETA = 'rackspace_nova_beta'

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/libcloud/test/compute/fixtures/cloudsigma_2_0/balance.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/cloudsigma_2_0/balance.json b/libcloud/test/compute/fixtures/cloudsigma_2_0/balance.json
new file mode 100644
index 0000000..8f86b06
--- /dev/null
+++ b/libcloud/test/compute/fixtures/cloudsigma_2_0/balance.json
@@ -0,0 +1 @@
+{"balance": "10.00", "currency": "USD"}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/libcloud/test/compute/fixtures/cloudsigma_2_0/capabilities.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/cloudsigma_2_0/capabilities.json b/libcloud/test/compute/fixtures/cloudsigma_2_0/capabilities.json
new file mode 100644
index 0000000..62ee576
--- /dev/null
+++ b/libcloud/test/compute/fixtures/cloudsigma_2_0/capabilities.json
@@ -0,0 +1,26 @@
+{
+    "drives": {
+        "dssd": {
+            "max_size": 8858013190752,
+            "min_size": 536870912
+        }
+    },
+    "servers": {
+        "cpu": {
+            "max": 80000,
+            "min": 250
+        },
+        "cpu_per_smp": {
+            "max": 2200,
+            "min": 1000
+        },
+        "mem": {
+            "max": 137438953472,
+            "min": 268435456
+        },
+        "smp": {
+            "max": 40,
+            "min": 1
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/libcloud/test/compute/fixtures/cloudsigma_2_0/currentusage.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/cloudsigma_2_0/currentusage.json b/libcloud/test/compute/fixtures/cloudsigma_2_0/currentusage.json
new file mode 100644
index 0000000..8d5af60
--- /dev/null
+++ b/libcloud/test/compute/fixtures/cloudsigma_2_0/currentusage.json
@@ -0,0 +1,88 @@
+{
+    "balance": {
+        "balance": "378.74599035374868510600",
+        "currency": "USD"
+    },
+    "usage": {
+        "cpu": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "dssd": {
+            "burst": 13958643712,
+            "subscribed": 0,
+            "using": 13958643712
+        },
+        "ip": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "mem": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "msft_7jq_00341": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "msft_7nq_00302": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "msft_lwa_00135": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "msft_p71_01031": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "msft_p73_04837": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "msft_p73_04837_core": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "msft_tfa_00009": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "msft_tfa_00523": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "sms": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "ssd": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        },
+        "tx": {
+            "burst": 0,
+            "subscribed": 5368709120,
+            "using": 0
+        },
+        "vlan": {
+            "burst": 0,
+            "subscribed": 0,
+            "using": 0
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/libcloud/test/compute/fixtures/cloudsigma_2_0/drives_clone.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/cloudsigma_2_0/drives_clone.json b/libcloud/test/compute/fixtures/cloudsigma_2_0/drives_clone.json
new file mode 100644
index 0000000..5e2b6e2
--- /dev/null
+++ b/libcloud/test/compute/fixtures/cloudsigma_2_0/drives_clone.json
@@ -0,0 +1,29 @@
+{
+    "objects": [
+        {
+            "affinities": [],
+            "allow_multimount": false,
+            "jobs": [],
+            "licenses": [],
+            "media": "disk",
+            "meta": {},
+            "mounted_on": [],
+            "name": "cloned drive",
+            "owner": {
+                "resource_uri": "/api/2.0/user/69fcfc03-d635-4f99-a8b3-e1b73637cb5d/",
+                "uuid": "69fcfc03-d635-4f99-a8b3-e1b73637cb5d"
+            },
+            "resource_uri": "/api/2.0/drives/b02311e2-a83c-4c12-af10-b30d51c86913/",
+            "runtime": {
+                "snapshots_allocated_size": 0,
+                "storage_type": null
+            },
+            "size": 2097152000,
+            "snapshots": [],
+            "status": "creating",
+            "storage_type": null,
+            "tags": [],
+            "uuid": "b02311e2-a83c-4c12-af10-b30d51c86913"
+        }
+    ]
+}

http://git-wip-us.apache.org/repos/asf/libcloud/blob/4d40ecd3/libcloud/test/compute/fixtures/cloudsigma_2_0/drives_create.json
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/cloudsigma_2_0/drives_create.json b/libcloud/test/compute/fixtures/cloudsigma_2_0/drives_create.json
new file mode 100644
index 0000000..02c4b35
--- /dev/null
+++ b/libcloud/test/compute/fixtures/cloudsigma_2_0/drives_create.json
@@ -0,0 +1,29 @@
+{
+    "objects": [
+        {
+            "affinities": [],
+            "allow_multimount": false,
+            "jobs": [],
+            "licenses": [],
+            "media": "disk",
+            "meta": {},
+            "mounted_on": [],
+            "name": "test drive 5",
+            "owner": {
+                "resource_uri": "/api/2.0/user/69fcfc03-d635-4f99-a8b3-e1b73637cb5d/",
+                "uuid": "69fcfc03-d635-4f99-a8b3-e1b73637cb5d"
+            },
+            "resource_uri": "/api/2.0/drives/b02311e2-a83c-4c12-af10-b30d51c86913/",
+            "runtime": {
+                "snapshots_allocated_size": 0,
+                "storage_type": null
+            },
+            "size": 2097152000,
+            "snapshots": [],
+            "status": "creating",
+            "storage_type": null,
+            "tags": [],
+            "uuid": "b02311e2-a83c-4c12-af10-b30d51c86913"
+        }
+    ]
+}


Mime
View raw message