deltacloud-core 1.0.5 → 1.1.0

data/lib/deltacloud/collections/drivers.rb

@@ -39,7 +39,7 @@ module Deltacloud::Collections
           halt 404 unless @driver
           respond_to do |format|
             format.xml { haml :"drivers/show" }
-            format.json { @driver.to_json }
+            format.json { { :driver => @driver.merge(:id => params[:id]) }.to_json }
             format.html { haml :"drivers/show" }
           end
         end

data/lib/deltacloud/collections/firewalls.rb

@@ -66,7 +66,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.xml  { haml :"firewalls/show" }
             format.html { haml :"firewalls/show" }
-            format.json { xml_to_json("firewalls/show") }
+            format.json { JSON::dump(:firewall => @firewall.to_hash(self)) }
           end
         end
       end
@@ -109,7 +109,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.xml  { haml :"firewalls/show" }
             format.html { haml :"firewalls/show" }
-            format.json { xml_to_json("firewalls/show") }
+            format.json { JSON::dump(:firewall => @firewall.to_hash(self) ) }
           end
         end
       end

data/lib/deltacloud/collections/images.rb

@@ -50,7 +50,7 @@ module Deltacloud::Collections
           response['Location'] = image_url(@image.id)
           respond_to do |format|
             format.xml  { haml :"images/show" }
-            format.json { xml_to_json('images/show') }
+            format.json { JSON::dump(:image => @image.to_hash(self)) }
             format.html { haml :"images/show" }
           end
         end

data/lib/deltacloud/collections/instances.rb

@@ -60,7 +60,13 @@ module Deltacloud::Collections
           status 201  # Created
           respond_to do |format|
             format.xml  { haml :"instances/#{action_handler}" }
-            format.json { xml_to_json("instances/#{action_handler}") }
+            format.json do
+              if @elements
+                JSON::dump(:instances => @elements.map { |i| i.to_hash(self) })
+              elsif @instance and @instance.id
+                JSON::dump(:instance => @instance.to_hash(self))
+              end
+            end
             format.html do
               if @elements
                 haml :"instances/index"

data/lib/deltacloud/collections/keys.rb

@@ -42,7 +42,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.xml  { haml :"keys/show", :ugly => true }
             format.html { haml :"keys/show" }
-            format.json { xml_to_json("keys/show")}
+            format.json { JSON::dump(:key => @key.to_hash(self)) }
           end
         end
       end

data/lib/deltacloud/collections/load_balancers.rb

@@ -41,7 +41,7 @@ module Deltacloud::Collections
           @unregistered_instances = all_instances - @registered_instances
           respond_to do |format|
             format.xml { haml :'load_balancers/show' }
-            format.json { xml_to_json('load_balancers/show') }
+            format.json { JSON::dump(:load_balancer => @load_balancer.to_hash(self)) }
             format.html { haml :'load_balancers/show' }
           end
         end
@@ -59,7 +59,7 @@ module Deltacloud::Collections
           response['Location'] = load_balancer_url(@load_balancer.id)
           respond_to do |format|
             format.xml  { haml :"load_balancers/show" }
-            format.json { xml_to_json("load_balancers/show")}
+            format.json { JSON::dump(:load_balancer => @load_balancer.to_hash(self)) }
             format.html { redirect load_balancer_url(@load_balancer.id)}
           end
         end
@@ -73,7 +73,7 @@ module Deltacloud::Collections
           @load_balancer = driver.load_balancer(credentials, :id => params[:id])
           respond_to do |format|
             format.xml { haml :'load_balancers/show' }
-            format.json { xml_to_json('load_balancers/show') }
+            format.json { JSON::dump(:load_balancer => @load_balancer.to_hash(self) ) }
             format.html { redirect load_balancer_url(@load_balancer.id)}
           end
         end
@@ -87,7 +87,7 @@ module Deltacloud::Collections
           @load_balancer = driver.load_balancer(credentials, :id => params[:id])
           respond_to do |format|
             format.xml { haml :'load_balancers/show' }
-            format.json { xml_to_json('load_balancers/show')}
+            format.json { JSON::dump(:load_balancer => @load_balancer.to_hash(self)) }
             format.html { redirect load_balancer_url(@load_balancer.id) }
           end
         end

data/lib/deltacloud/collections/storage_snapshots.rb

@@ -31,7 +31,11 @@ module Deltacloud::Collections
           @storage_snapshot = driver.create_storage_snapshot(credentials, params)
           status 201  # Created
           response['Location'] = storage_snapshot_url(@storage_snapshot.id)
-          show(:storage_snapshot)
+          respond_to do |format|
+            format.xml { haml :"storage_snapshots/show" }
+            format.html { haml :"storage_snapshots/show" }
+            format.json { xml_to_json "storage_snapshots/show" }
+          end
         end
       end
 

data/lib/deltacloud/collections/storage_volumes.rb

@@ -16,6 +16,8 @@
 module Deltacloud::Collections
   class StorageVolumes < Base
 
+    include Deltacloud::Features
+
     set :capability, lambda { |m| driver.respond_to? m }
     check_features :for => lambda { |c, f| driver.class.has_feature?(c, f) }
 
@@ -37,6 +39,8 @@ module Deltacloud::Collections
         param :snapshot_id, :string,  :optional
         param :capacity,    :string,  :optional
         param :realm_id,    :string,  :optional
+        param :name,        :string,  :optional
+        param :description, :string,  :optional
         control do
           @storage_volume = driver.create_storage_volume(credentials, params)
           status 201
@@ -44,7 +48,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.xml  { haml :"storage_volumes/show" }
             format.html { haml :"storage_volumes/show" }
-            format.json { xml_to_json("storage_volumes/show") }
+            format.json { JSON::dump(:storage_volume => @storage_volume.to_hash(self)) }
           end
         end
       end
@@ -59,7 +63,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.html { redirect(storage_volume_url(params[:id]))}
             format.xml  { haml :"storage_volumes/show" }
-            format.json { xml_to_json("storage_volumes/show")}
+            format.json { JSON::dump(:storage_volume => @storage_volume.to_hash(self)) }
           end
         end
       end
@@ -75,7 +79,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.html { redirect(storage_volume_url(params[:id]))}
             format.xml  { haml :"storage_volumes/show" }
-            format.json {  xml_to_json("storage_volumes/show") }
+            format.json { JSON::dump(:storage_volume => @storage_volume.to_hash(self)) }
           end
         end
       end

data/lib/deltacloud/drivers/base_driver.rb

@@ -19,6 +19,7 @@ module Deltacloud
   require_relative '../core_ext.rb'
   require_relative './exceptions.rb'
   require_relative './features.rb'
+  require_relative './cimi_features.rb'
   require_relative '../models/state_machine.rb'
 
   class BaseDriver
@@ -26,7 +27,7 @@ module Deltacloud
     include Exceptions
 
     STATE_MACHINE_OPTS = {
-      :all_states => [:start, :pending, :running, :stopping, :stopped, :finish],
+      :all_states => [:start, :pending, :running, :stopping, :stopped, :finish, :error],
       :all_actions => [:create, :reboot, :stop, :start, :destroy]
     } unless defined?(STATE_MACHINE_OPTS)
 
@@ -38,7 +39,6 @@ module Deltacloud
       @features ||= {}
     end
 
-
     def self.feature(collection, feature_name)
       return if has_feature?(collection, feature_name)
       constraints[collection] ||= {}
@@ -60,6 +60,10 @@ module Deltacloud
       features.has_key?(collection) and features[collection].include?(feature_name)
     end
 
+    def has_feature?(collection, feature_name)
+      self.class.has_feature?(collection, feature_name)
+    end
+
     def name
       self.class.name.split('::').last.gsub('Driver', '').downcase
     end
@@ -102,18 +106,15 @@ module Deltacloud
 
     def find_hardware_profile(credentials, profile_id, image_id)
       hwp = nil
-      if name
+      if profile_id
         unless hwp = hardware_profile(credentials, profile_id)
-          raise BackendError.new(400, "bad-hardware-profile-name",
-                                 "Hardware profile '#{name}' does not exist", nil)
+          raise Exceptions.exception_from_status(400, "Hardware profile '#{profile_id}' does not exists.")
         end
       else
         unless image = image(credentials, :id=>image_id)
-          raise BackendError.new(400, "bad-image-id",
-                                 "Image with ID '#{image_id}' does not exist", nil)
+          raise Exceptions.exception_from_status(400, "Image #{image_id} does not exists.")
         end
-        hwp = hardware_profiles(credentials,
-                                :architecture=>image.architecture).first
+        hwp = hardware_profiles(credentials, :architecture => image.architecture).first
       end
       return hwp
     end

data/lib/deltacloud/drivers/cimi_features.rb

@@ -0,0 +1,42 @@
+# 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.
+
+module CIMI
+  module Features
+
+    def self.included(k)
+      current_features = features
+      k.instance_eval do
+        features(&current_features)
+      end
+    end
+
+    def self.features(&block)
+      block_given? ? @features = block : @features || Proc.new{}
+    end
+
+
+    features do
+      feature :default_initial_state, :for => :machines do
+        description "Indicates what the default initial state of a new Machine "
+      end
+
+      feature :initial_states, :for => :machines do
+        description "Indicates the list of allowable initial states"
+      end
+
+    end
+  end
+end

data/lib/deltacloud/drivers/digitalocean/digitalocean_driver.rb

@@ -0,0 +1,307 @@
+# 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.
+
+require 'restclient'
+
+module Deltacloud
+  module Drivers
+    module Digitalocean
+      class DigitaloceanDriver < Deltacloud::BaseDriver
+
+        feature :instances, :user_name
+        feature :images, :owner_id
+
+        define_hardware_profile '66' do
+          cpu           1
+          memory        512
+          storage       20 * 1024
+          architecture  ['i386', 'x86_64']
+        end
+
+        define_hardware_profile '63' do
+          cpu           1
+          memory        1024
+          storage       30 * 1024
+          architecture  ['i386', 'x86_64']
+        end
+
+        define_hardware_profile '62' do
+          cpu           2
+          memory        2 * 1024
+          storage       40 * 1024
+          architecture  ['i386', 'x86_64']
+        end
+
+        define_hardware_profile '64' do
+          cpu           2
+          memory        4 * 1024
+          storage       60 * 1024
+          architecture  ['i386', 'x86_64']
+        end
+
+        define_hardware_profile '65' do
+          cpu           4
+          memory        8 * 1024
+          storage       80 * 1024
+          architecture  ['i386', 'x86_64']
+        end
+
+        define_hardware_profile '61' do
+          cpu           8
+          memory        16 * 1024
+          storage       160 * 1024
+          architecture  ['i386', 'x86_64']
+        end
+
+        define_hardware_profile '60' do
+          cpu           12
+          memory        32 * 1024
+          storage       320 * 1024
+          architecture  ['i386', 'x86_64']
+        end
+
+        define_hardware_profile '70' do
+          cpu           16
+          memory        48 * 1024
+          storage       480 * 1024
+          architecture  ['i386', 'x86_64']
+        end
+
+        define_hardware_profile '69' do
+          cpu           16
+          memory        64 * 1024
+          storage       640 * 1024
+          architecture  ['i386', 'x86_64']
+        end
+
+        define_hardware_profile '68' do
+          cpu           24
+          memory        96 * 1024
+          storage       960 * 1024
+          architecture  ['i386', 'x86_64']
+        end
+
+        define_instance_states do
+          start.to( :pending )          .on( :create )
+          pending.to( :running )        .automatically
+          running.to( :running )        .on( :reboot )
+          running.to( :stopping )       .on( :stop )
+          running.to( :finish )         .on( :destroy )
+          stopped.to( :running )        .on( :start )
+          stopping.to( :stopped )       .automatically
+          stopped.to( :finish )         .automatically
+          error.from(:running, :pending, :stopping)
+        end
+
+        def realms(credentials, opts={})
+          safely do
+            new_client(credentials).get('regions')['regions'].map do |r|
+              Realm.new(
+                :id => r['id'],
+                :name => r['name'],
+                :state => 'AVAILABLE',
+                :limit => :unlimited
+              )
+            end
+          end
+        end
+
+        # By default images will return list of 'all' images available
+        # to launch.
+        # With 'owner_id' you can filter them using 'global' and 'my_images'
+        # values to get less images.
+        #
+        def images(credentials, opts={})
+          unless opts[:id]
+            filter = opts[:owner_id] ? { :filter => opts[:owner_id] } : {}
+            img_arr = safely do
+              new_client(credentials).get('images', filter)['images'].map do |i|
+                convert_image(credentials, i)
+              end
+            end
+            filter_on( img_arr, :architecture, opts )
+          else
+            safely do
+              [convert_image(
+                credentials,
+                new_client(credentials).get('images/%s' % opts[:id])['image']
+              )]
+            end
+          end
+        end
+
+        # You can only destroy images you own.
+        #
+        def destroy_image(credentials, image_id)
+          safely do
+            new_client(credentials).get('images/%s/destroy', image_id)
+          end
+        end
+
+        def instances(credentials, opts={})
+          inst_arr = safely do
+            new_client(credentials).get('droplets')['droplets'].map do |i|
+              convert_instance(credentials.user, i)
+            end
+          end
+          filter_on inst_arr, :state, opts
+        end
+
+        def instance(credentials, opts={})
+          safely do
+            convert_instance(
+              credentials.user,
+              new_client(credentials).get("droplets/#{opts[:id]}")["droplet"]
+            )
+          end
+        end
+
+        def create_instance(credentials, image_id, opts={})
+          safely do
+            client = new_client(credentials)
+            args = { :image_id => image_id }
+            args.merge!(:region_id => opts[:realm_id]) if opts[:realm_id]
+            args.merge!(:size_id => opts[:hwp_id]) if opts[:hwp_id]
+            args.merge!(:name => opts[:name] || "inst#{Time.now.to_i}")
+            convert_instance(
+              credentials.user,
+              client.get("droplets/new", args)['droplet']
+            )
+          end
+        end
+
+        def destroy_instance(credentials, instance_id)
+          safely do
+            new_client(credentials).get("droplets/#{instance_id}/destroy/")
+          end
+        end
+
+        def stop_instance(credentials, instance_id)
+          safely do
+            new_client(credentials).get("droplets/#{instance_id}/shutdown")
+          end
+        end
+
+        def start_instance(credentials, instance_id)
+          safely do
+            new_client(credentials).get("droplets/#{instance_id}/power_on/")
+          end
+        end
+
+        def reboot_instance(credentials, instance_id)
+          safely do
+            new_client(credentials).get("droplets/#{instance_id}/reboot/")
+          end
+        end
+
+        exceptions do
+
+          on(/InternalServerError/) do
+            status 502
+          end
+
+          on(/No .*Found/) do
+            status 404
+          end
+
+          on(/An invalid/) do
+            status 400
+          end
+
+        end
+
+        private
+
+        class Client
+
+          API_URL = "https://api.digitalocean.com/"
+          attr_reader :credentials
+
+          def initialize(credentials)
+            @credentials = credentials
+            @resource = RestClient::Resource.new(API_URL)
+          end
+
+          def get(uri, opts={})
+            opts.merge!(
+              :client_id => credentials.user,
+              :api_key => credentials.password
+            )
+            result = @resource[uri].get(:params => opts)
+            json_result = JSON::parse(result)
+            if json_result['status'] != 'OK'
+              p result
+              error_message = json_result['error_message'] || json_result['status']
+              raise error_message
+            end
+            json_result
+          end
+
+        end
+
+        def new_client(credentials)
+          Client.new(credentials)
+        end
+
+        def extract_arch_from_name(name)
+          return 'x86_64' if name.include? 'x64'
+          return 'i386' if name.include? 'x32'
+        end
+
+        def convert_state(status)
+          case status
+            when 'active' then 'RUNNING'
+            when 'archive', 'new', 'pending' then 'PENDING'
+            when 'off'  then 'STOPPED'
+            else status.upcase
+          end
+        end
+
+        def convert_instance(user, i)
+          state = convert_state(i['status'] || 'pending')
+          address = i['ip_address'].nil? ?
+            [] : [InstanceAddress.new(i['ip_address'])]
+
+          Instance.new(
+            :id => i['id'].to_s,
+            :name => i['name'],
+            :image_id => i['image_id'],
+            :realm_id => i['region_id'],
+            :instance_profile => InstanceProfile.new(i['size_id']),
+            :state => state,
+            :public_addresses => address,
+            :private_addresses => [],
+            :owner_id => user,
+            :create_image => false,
+            :actions => instance_actions_for(state)
+          )
+        end
+
+        def convert_image(credentials, i)
+          Image.new(
+            :id => i['id'].to_s,
+            :name => i['name'],
+            :description => i['distribution'],
+            :owner_id => 'global',
+            :state => 'AVAILABLE',
+            :architecture => extract_arch_from_name(i['name']),
+            :hardware_profiles => hardware_profiles(credentials)
+          )
+        end
+
+      end
+    end
+  end
+end