libcloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r908767 - /incubator/libcloud/trunk/libcloud/drivers/voxel.py
Date Thu, 11 Feb 2010 00:01:12 GMT
Author: pquerna
Date: Thu Feb 11 00:01:11 2010
New Revision: 908767

URL: http://svn.apache.org/viewvc?rev=908767&view=rev
Log:
Reindent to 4 space tabbing. No functional changes.

Modified:
    incubator/libcloud/trunk/libcloud/drivers/voxel.py

Modified: incubator/libcloud/trunk/libcloud/drivers/voxel.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/voxel.py?rev=908767&r1=908766&r2=908767&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/voxel.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/voxel.py Thu Feb 11 00:01:11 2010
@@ -29,8 +29,8 @@
 class VoxelResponse(Response):
 
     def __init__(self, response):
-      self.parsed = None
-      super(VoxelResponse, self).__init__(response)
+        self.parsed = None
+        super(VoxelResponse, self).__init__(response)
 
     def parse_body(self):
         if not self.body:
@@ -67,30 +67,30 @@
 
 class VoxelConnection(ConnectionUserAndKey):
 
-   host = VOXEL_API_HOST
-   responseCls = VoxelResponse
+    host = VOXEL_API_HOST
+    responseCls = VoxelResponse
 
-   def add_default_params(self, params):
-       params["key"] = self.user_id
-       params["timestamp"] = datetime.datetime.utcnow().isoformat()+"+0000"
-
-       for param in params.keys():
-         if params[param] is None:
-           del params[param]
-
-       keys = params.keys()
-       keys.sort()
-
-       md5 = hashlib.md5()
-       md5.update(self.key)
-       for key in keys:
-         if params[key]:
-           if not params[key] is None:
-             md5.update("%s%s"% (key, params[key]))
-           else:
-             md5.update(key)
-       params['api_sig'] = md5.hexdigest()
-       return params
+    def add_default_params(self, params):
+        params["key"] = self.user_id
+        params["timestamp"] = datetime.datetime.utcnow().isoformat()+"+0000"
+
+        for param in params.keys():
+            if params[param] is None:
+                del params[param]
+
+        keys = params.keys()
+        keys.sort()
+
+        md5 = hashlib.md5()
+        md5.update(self.key)
+        for key in keys:
+            if params[key]:
+                if not params[key] is None:
+                    md5.update("%s%s"% (key, params[key]))
+                else:
+                    md5.update(key)
+        params['api_sig'] = md5.hexdigest()
+        return params
 
 VOXEL_INSTANCE_TYPES = {}
 RAM_PER_CPU = 2048
@@ -102,142 +102,141 @@
 
 class VoxelNodeDriver(NodeDriver):
 
-   connectionCls = VoxelConnection
-   type = Provider.VOXEL
-   name = 'Voxel VoxCLOUD'
-
-   def initialize_instance_types():
-       for cpus in range(1,14):
-           if cpus == 1:
-               name = "Single CPU"
-           else:
-               name = "%d CPUs" % cpus
-           id = "%dcpu" % cpus
-           ram = cpus * RAM_PER_CPU
-
-           VOXEL_INSTANCE_TYPES[id]= {
-                        'id': id,
-                        'name': name,
-                        'ram': ram,
-                        'disk': None,
-                        'bandwidth': None,
-                        'price': None}
-
-   features = {"create_node": [],
-               "list_sizes":  ["variable_disk"]}
-
-   initialize_instance_types()
-
-   def list_nodes(self):
-       params = {"method": "voxel.devices.list"}
-       result = self.connection.request('/', params=params).object
-       return self._to_nodes(result)
-
-   def list_sizes(self, location=None):
-       return [ NodeSize(driver=self.connection.driver, **i) 
-                   for i in VOXEL_INSTANCE_TYPES.values() ]
-
-   def list_images(self, location=None):
-       params = {"method": "voxel.images.list"}
-       result = self.connection.request('/', params=params).object
-       return self._to_images(result)
-
-   def create_node(self, **kwargs):
-       size = kwargs["size"]
-       cores = size.ram / RAM_PER_CPU
-       params = {'method':           'voxel.voxcloud.create',
-                 'hostname':         kwargs["name"],
-                 'disk_size':        int(kwargs["disk"])/1024,
-                 'processing_cores': cores,
-                 'facility':         kwargs["location"].id,
-                 'image_id':         kwargs["image"],
-                 'backend_ip':       kwargs.get("privateip", None),
-                 'frontend_ip':      kwargs.get("publicip", None),
-                 'admin_password':   kwargs.get("rootpass", None),
-                 'console_password': kwargs.get("consolepass", None),
-                 'ssh_username':     kwargs.get("sshuser", None),
-                 'ssh_password':     kwargs.get("sshpass", None),
-                 'voxel_access':     kwargs.get("voxel_access", None)}
-
-       object = self.connection.request('/', params=params).object
-
-       if self._getstatus(object):
-           return Node(
-               id = object.findtext("device/id"),
-               name = kwargs["name"],
-               state = NODE_STATE_MAP[object.findtext("devices/status")],
-               public_ip = public_ip,
-               private_ip = private_ip,
-               driver = self.connection.driver
-           )
-       else:
-         return None
-
-   def reboot_node(self, node):
-       """
-       Reboot the node by passing in the node object
-       """
-       params = {'method': 'voxel.devices.power',
-                 'device_id': node.id,
-                 'power_action': 'reboot'}
-       return self._getstatus(self.connection.request('/', params=params).object)
-
-   def destroy_node(self, node):
-       """
-       Destroy node by passing in the node object
-       """
-       params = {'method': 'voxel.voxcloud.delete',
-                 'device_id': node.id}
-       return self._getstatus(self.connection.request('/', params=params).object)
-
-   def list_locations(self):
-       params = {"method": "voxel.voxcloud.facilities.list"}
-       result = self.connection.request('/', params=params).object
-       nodes = self._to_locations(result)
-       return nodes
-
-   def _getstatus(self, element):
-     status = element.attrib["stat"]
-     return status == "ok"
-
-
-   def _to_locations(self, object):
-       return [NodeLocation(element.attrib["label"],
-                            element.findtext("description"),
-                            element.findtext("description"),
-                            self)
-               for element in object.findall('facilities/facility')]
-
-   def _to_nodes(self, object):
-       nodes = []
-       for element in object.findall('devices/device'):
-           if element.findtext("type") == "Virtual Server":
-               try:
-                   state = self.NODE_STATE_MAP[element.attrib['status']]
-               except KeyError:
-                   state = NodeState.UNKNOWN
-
-               public_ip = private_ip = None
-               ipassignments = element.findall("ipassignments/ipassignment")
-               for ip in ipassignments:
-                   if ip.attrib["type"] =="frontend":
-                       public_ip = ip.text
-                   elif ip.attrib["type"] == "backend":
-                       private_ip = ip.text
-
-               nodes.append(Node(id= element.attrib['id'],
-                                name=element.attrib['label'],
-                                state=state,
-                                public_ip= public_ip,
-                                private_ip= private_ip,
-                                driver=self.connection.driver))
-       return nodes
-
-   def _to_images(self, object):
-       images = []
-       for element in object.findall("images/image"):
-           images.append(NodeImage(id = element.attrib["id"],
-                                   name = element.attrib["summary"],
-                                   driver = self.connection.driver))
-       return images
+    connectionCls = VoxelConnection
+    type = Provider.VOXEL
+    name = 'Voxel VoxCLOUD'
+
+    def initialize_instance_types():
+        for cpus in range(1,14):
+            if cpus == 1:
+                name = "Single CPU"
+            else:
+                name = "%d CPUs" % cpus
+            id = "%dcpu" % cpus
+            ram = cpus * RAM_PER_CPU
+
+            VOXEL_INSTANCE_TYPES[id]= {
+                         'id': id,
+                         'name': name,
+                         'ram': ram,
+                         'disk': None,
+                         'bandwidth': None,
+                         'price': None}
+
+    features = {"create_node": [],
+                "list_sizes":  ["variable_disk"]}
+
+    initialize_instance_types()
+
+    def list_nodes(self):
+        params = {"method": "voxel.devices.list"}
+        result = self.connection.request('/', params=params).object
+        return self._to_nodes(result)
+
+    def list_sizes(self, location=None):
+        return [ NodeSize(driver=self.connection.driver, **i)
+                    for i in VOXEL_INSTANCE_TYPES.values() ]
+
+    def list_images(self, location=None):
+        params = {"method": "voxel.images.list"}
+        result = self.connection.request('/', params=params).object
+        return self._to_images(result)
+
+    def create_node(self, **kwargs):
+        size = kwargs["size"]
+        cores = size.ram / RAM_PER_CPU
+        params = {'method':           'voxel.voxcloud.create',
+                  'hostname':         kwargs["name"],
+                  'disk_size':        int(kwargs["disk"])/1024,
+                  'processing_cores': cores,
+                  'facility':         kwargs["location"].id,
+                  'image_id':         kwargs["image"],
+                  'backend_ip':       kwargs.get("privateip", None),
+                  'frontend_ip':      kwargs.get("publicip", None),
+                  'admin_password':   kwargs.get("rootpass", None),
+                  'console_password': kwargs.get("consolepass", None),
+                  'ssh_username':     kwargs.get("sshuser", None),
+                  'ssh_password':     kwargs.get("sshpass", None),
+                  'voxel_access':     kwargs.get("voxel_access", None)}
+
+        object = self.connection.request('/', params=params).object
+
+        if self._getstatus(object):
+            return Node(
+                id = object.findtext("device/id"),
+                name = kwargs["name"],
+                state = NODE_STATE_MAP[object.findtext("devices/status")],
+                public_ip = public_ip,
+                private_ip = private_ip,
+                driver = self.connection.driver
+            )
+        else:
+            return None
 
+    def reboot_node(self, node):
+        """
+        Reboot the node by passing in the node object
+        """
+        params = {'method': 'voxel.devices.power',
+                  'device_id': node.id,
+                  'power_action': 'reboot'}
+        return self._getstatus(self.connection.request('/', params=params).object)
+
+    def destroy_node(self, node):
+        """
+        Destroy node by passing in the node object
+        """
+        params = {'method': 'voxel.voxcloud.delete',
+                  'device_id': node.id}
+        return self._getstatus(self.connection.request('/', params=params).object)
+
+    def list_locations(self):
+        params = {"method": "voxel.voxcloud.facilities.list"}
+        result = self.connection.request('/', params=params).object
+        nodes = self._to_locations(result)
+        return nodes
+
+    def _getstatus(self, element):
+        status = element.attrib["stat"]
+        return status == "ok"
+
+
+    def _to_locations(self, object):
+        return [NodeLocation(element.attrib["label"],
+                             element.findtext("description"),
+                             element.findtext("description"),
+                             self)
+                for element in object.findall('facilities/facility')]
+
+    def _to_nodes(self, object):
+        nodes = []
+        for element in object.findall('devices/device'):
+            if element.findtext("type") == "Virtual Server":
+                try:
+                    state = self.NODE_STATE_MAP[element.attrib['status']]
+                except KeyError:
+                    state = NodeState.UNKNOWN
+
+                public_ip = private_ip = None
+                ipassignments = element.findall("ipassignments/ipassignment")
+                for ip in ipassignments:
+                    if ip.attrib["type"] =="frontend":
+                        public_ip = ip.text
+                    elif ip.attrib["type"] == "backend":
+                        private_ip = ip.text
+
+                nodes.append(Node(id= element.attrib['id'],
+                                 name=element.attrib['label'],
+                                 state=state,
+                                 public_ip= public_ip,
+                                 private_ip= private_ip,
+                                 driver=self.connection.driver))
+        return nodes
+
+    def _to_images(self, object):
+        images = []
+        for element in object.findall("images/image"):
+            images.append(NodeImage(id = element.attrib["id"],
+                                    name = element.attrib["summary"],
+                                    driver = self.connection.driver))
+        return images



Mime
View raw message