Author: tomaz
Date: Mon Apr 9 03:38:31 2012
New Revision: 1311127
URL: http://svn.apache.org/viewvc?rev=1311127&view=rev
Log:
Start working on Joyent driver.
Added:
libcloud/trunk/libcloud/compute/drivers/joyent.py
Modified:
libcloud/trunk/libcloud/compute/providers.py
libcloud/trunk/libcloud/compute/types.py
Added: libcloud/trunk/libcloud/compute/drivers/joyent.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/joyent.py?rev=1311127&view=auto
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/joyent.py (added)
+++ libcloud/trunk/libcloud/compute/drivers/joyent.py Mon Apr 9 03:38:31 2012
@@ -0,0 +1,155 @@
+# 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.
+
+import base64
+
+try:
+ import simplejson as json
+except:
+ import json
+
+from libcloud.utils.py3 import httplib
+from libcloud.utils.py3 import b
+
+from libcloud.compute.providers import Provider
+from libcloud.common.base import JsonResponse, ConnectionUserAndKey
+from libcloud.compute.base import is_private_subnet
+from libcloud.compute.types import NodeState, InvalidCredsError
+from libcloud.compute.base import Node, NodeDriver, NodeImage, NodeSize
+
+API_HOST_SUFFIX = 'api.joyentcloud.com'
+API_VERSION = '~6.5'
+
+
+NODE_STATE_MAP = {
+ 'provisioning': NodeState.PENDING,
+ 'running': NodeState.RUNNING,
+ 'stopping': NodeState.TERMINATED,
+ 'stopped': NodeState.TERMINATED,
+ 'deleted': NodeState.TERMINATED
+}
+
+
+class JoyentResponse(JsonResponse):
+ def parse_error(self):
+ if self.status == 401:
+ data = self.parse_body()
+ raise InvalidCredsError(data['code'] + ': ' + data['message'])
+ return self.body
+
+ def success(self):
+ return self.status in [httplib.OK, httplib.ACCEPTED, httplib.CREATED,
+ httplib.NO_CONTENT]
+
+
+class JoyentConnection(ConnectionUserAndKey):
+ host = 'us-east-1.' + API_HOST_SUFFIX
+ responseCls = JoyentResponse
+
+ def add_default_headers(self, headers):
+ headers['Accept'] = 'application/json'
+ headers['Content-Type'] = 'application/json; charset=UTF-8'
+ headers['X-Api-Version'] = API_VERSION
+
+ user_b64 = base64.b64encode(b('%s:%s' % (self.user_id, self.key)))
+ headers['Authorization'] = 'Basic %s' % (user_b64)
+ return headers
+
+
+class JoyentNodeDriver(NodeDriver):
+ type = Provider.JOYENT
+ name = 'Joyent'
+ connectionCls = JoyentConnection
+
+ def list_images(self):
+ result = self.connection.request('/my/datasets').object
+
+ images = []
+ for value in result:
+ extra = {'type': value['type'], 'urn': value['urn'],
+ 'os': value['os'], 'default': value['default']}
+ image = NodeImage(id=value['id'], name=value['name'],
+ driver=self.connection.driver, extra=extra)
+ images.append(image)
+
+ return images
+
+ def list_sizes(self):
+ result = self.connection.request('/my/packages').object
+
+ sizes = []
+ for value in result:
+ size = NodeSize(id=value['name'], name=value['name'],
+ ram=value['memory'], disk=value['disk'],
+ bandwidth=None, price=0.0,
+ driver=self.connection.driver)
+ sizes.append(size)
+
+ return sizes
+
+ def list_nodes(self):
+ result = self.connection.request('/my/machines').object
+
+ nodes = []
+ for value in result:
+ node = self._to_node(value)
+ nodes.append(node)
+
+ return nodes
+
+ def reboot_node(self, node):
+ data = json.dumps({'action': 'reboot'})
+ result = self.connection.request('/my/machines/%s' % (node.id),
+ data=data, method='POST')
+ return result.status == httplib.ACCEPTED
+
+ def destroy_node(self, node):
+ data = json.dumps({'action': 'reboot'})
+ result = self.connection.request('/my/machines/%s' % (node.id),
+ method='DELETE')
+ return result.status == httplib.NO_CONTENT
+
+ def create_node(self, **kwargs):
+ name = kwargs['name']
+ size = kwargs['size']
+ image = kwargs['image']
+
+ data = json.dumps({'name': name, 'package': size.id,
+ 'dataset': image.id})
+ result = self.connection.request('/my/machines', data=data,
+ method='POST')
+ return self._to_node(result.object)
+
+ def ex_stop_node(self, node):
+ data = json.dumps({'action': 'stop'})
+ result = self.connection.request('/my/machines/%s' % (node.id),
+ data=data, method='POST')
+ return result.status == httplib.ACCEPTED
+
+ def _to_node(self, data):
+ state = NODE_STATE_MAP[data['state']]
+ public_ips = []
+ private_ips = []
+
+ for ip in data['ips']:
+ if is_private_subnet(ip):
+ private_ips.append(ip)
+ else:
+ public_ips.append(ip)
+
+ node = Node(id=data['id'], name=data['name'], state=state,
+ public_ips=public_ips, private_ips=private_ips,
+ driver=self.connection.driver)
+ return node
Modified: libcloud/trunk/libcloud/compute/providers.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/providers.py?rev=1311127&r1=1311126&r2=1311127&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/providers.py (original)
+++ libcloud/trunk/libcloud/compute/providers.py Mon Apr 9 03:38:31 2012
@@ -110,7 +110,9 @@ DRIVERS = {
Provider.RACKSPACE_NOVA_DFW:
('libcloud.compute.drivers.rackspacenova',
'RackspaceNovaDfwNodeDriver'),
Provider.LIBVIRT:
- ('libcloud.compute.drivers.libvirt_driver', 'LibvirtNodeDriver')
+ ('libcloud.compute.drivers.libvirt_driver', 'LibvirtNodeDriver'),
+ Provider.JOYENT:
+ ('libcloud.compute.drivers.joyent', 'JoyentNodeDriver')
}
Modified: libcloud/trunk/libcloud/compute/types.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/types.py?rev=1311127&r1=1311126&r2=1311127&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/types.py (original)
+++ libcloud/trunk/libcloud/compute/types.py Mon Apr 9 03:38:31 2012
@@ -63,6 +63,7 @@ class Provider(object):
@cvar CLOUDSIGMA_US: CloudSigma US Las Vegas
@cvar RACKSPACE_NOVA_BETA: Rackspace Nova Private Beta (ORD)
@cvar LIBVIRT: Libvirt driver
+ @cvar JOYENT: Joyent driver
"""
DUMMY = 0
EC2 = 1 # deprecated name
@@ -111,6 +112,7 @@ class Provider(object):
LIBVIRT = 42
ELASTICHOSTS_US2 = 43
ELASTICHOSTS_CA1 = 44
+ JOYENT = 45
class NodeState(object):
