svn commit: r895134 - in /incubator/libcloud/trunk/libcloud: base.py drivers/linode.py

[pq...@apache.org]

Author: pquerna
Date: Sat Jan  2 06:39:25 2010
New Revision: 895134

URL: http://svn.apache.org/viewvc?rev=895134&view=rev
Log:
Use Ian's suggestion for a simpler feature detection.

Modified:
    incubator/libcloud/trunk/libcloud/base.py
    incubator/libcloud/trunk/libcloud/drivers/linode.py

Modified: incubator/libcloud/trunk/libcloud/base.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/base.py?rev=895134&r1=895133&r2=895134&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/base.py (original)
+++ incubator/libcloud/trunk/libcloud/base.py Sat Jan  2 06:39:25 2010
@@ -371,7 +371,7 @@
     connectionCls = ConnectionKey
     name = None
     type = None
-    
+    features = {"create_node": []}
     NODE_STATE_MAP = {}
 
     def __init__(self, key, secret=None, secure=True):
@@ -406,6 +406,3 @@
 
     def list_locations(self):
         raise NotImplementedError, 'list_locations not implemented for this driver'
-
-    def has_feature(self, feature):
-        return False

Modified: incubator/libcloud/trunk/libcloud/drivers/linode.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/linode.py?rev=895134&r1=895133&r2=895134&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/linode.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/linode.py Sat Jan  2 06:39:25 2010
@@ -420,12 +420,4 @@
         n.extra = copy(obj)
         return n
 
-    _features = {
-        Features.AUTH_SSH_KEY: True,
-        Features.AUTH_PASSWORD: True,
-        }
-    def has_feature(self, feature):
-        try:
-            return self._features[feature]
-        except:
-            return False
+    features = {"create_node": ["ssh_key", "password"]}