You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/08/01 19:52:13 UTC
[2/3] git commit: Move features to the top, use single quotes.
Move features to the top, use single quotes.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b68e6fdc
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b68e6fdc
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b68e6fdc
Branch: refs/heads/trunk
Commit: b68e6fdc321461abb405803b36fd119d4d6c3f8d
Parents: 7771ae7
Author: Tomaz Muraus <to...@apache.org>
Authored: Thu Aug 1 19:50:18 2013 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Thu Aug 1 19:50:18 2013 +0200
----------------------------------------------------------------------
libcloud/compute/drivers/linode.py | 3 +--
libcloud/compute/drivers/openstack.py | 2 +-
libcloud/compute/drivers/opsource.py | 2 +-
libcloud/compute/drivers/vcloud.py | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b68e6fdc/libcloud/compute/drivers/linode.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/linode.py b/libcloud/compute/drivers/linode.py
index c5cae83..e92ca23 100644
--- a/libcloud/compute/drivers/linode.py
+++ b/libcloud/compute/drivers/linode.py
@@ -74,6 +74,7 @@ class LinodeNodeDriver(NodeDriver):
website = 'http://www.linode.com/'
connectionCls = LinodeConnection
_linode_plan_ids = LINODE_PLAN_IDS
+ features = {'create_node': ['ssh_key', 'password']}
def __init__(self, key):
"""Instantiate the driver with the given API key
@@ -521,8 +522,6 @@ class LinodeNodeDriver(NodeDriver):
which.append(ip["IPADDRESS"])
return list(nodes.values())
- features = {"create_node": ["ssh_key", "password"]}
-
def _izip_longest(*args, **kwds):
"""Taken from Python docs
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b68e6fdc/libcloud/compute/drivers/openstack.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/openstack.py b/libcloud/compute/drivers/openstack.py
index f9b8fa3..963a280 100644
--- a/libcloud/compute/drivers/openstack.py
+++ b/libcloud/compute/drivers/openstack.py
@@ -387,7 +387,7 @@ class OpenStack_1_0_NodeDriver(OpenStackNodeDriver):
connectionCls = OpenStack_1_0_Connection
type = Provider.OPENSTACK
- features = {"create_node": ["generates_password"]}
+ features = {'create_node': ['generates_password']}
def __init__(self, *args, **kwargs):
self._ex_force_api_version = str(kwargs.pop('ex_force_api_version',
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b68e6fdc/libcloud/compute/drivers/opsource.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/opsource.py b/libcloud/compute/drivers/opsource.py
index 5796a44..6ee1432 100644
--- a/libcloud/compute/drivers/opsource.py
+++ b/libcloud/compute/drivers/opsource.py
@@ -241,7 +241,7 @@ class OpsourceNodeDriver(NodeDriver):
name = 'Opsource'
website = 'http://www.opsource.net/'
type = Provider.OPSOURCE
- features = {"create_node": ["password"]}
+ features = {'create_node': ['password']}
def create_node(self, **kwargs):
"""
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b68e6fdc/libcloud/compute/drivers/vcloud.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/vcloud.py b/libcloud/compute/drivers/vcloud.py
index 4b4ac63..fac74de 100644
--- a/libcloud/compute/drivers/vcloud.py
+++ b/libcloud/compute/drivers/vcloud.py
@@ -372,6 +372,8 @@ class VCloudNodeDriver(NodeDriver):
'3': NodeState.PENDING,
'4': NodeState.RUNNING}
+ features = {'create_node': ['password']}
+
def __new__(cls, key, secret=None, secure=True, host=None, port=None,
api_version=DEFAULT_API_VERSION, **kwargs):
if cls is VCloudNodeDriver:
@@ -761,8 +763,6 @@ class VCloudNodeDriver(NodeDriver):
return node
- features = {"create_node": ["password"]}
-
class HostingComConnection(VCloudConnection):
"""