deltacloud-core 1.1.0 → 1.1.1

data/lib/cimi/models/volume.rb

@@ -71,7 +71,7 @@ class CIMI::Model::Volume < CIMI::Model::Base
 
   def self.delete!(id, context)
     context.driver.destroy_storage_volume(context.credentials, {:id=>id} )
-    delete_attributes_for(StorageVolume.new(:id => id))
+    new(:id => id).destroy
   end
 
   def self.find_to_attach_from_json(json_in, context)
@@ -86,10 +86,6 @@ class CIMI::Model::Volume < CIMI::Model::Base
                            :attachment_point=>v["attachmentPoint"] }}
   end
 
-  def to_entity
-    'volume'
-  end
-
   private
 
   def self.create_volume(params, data, context)
@@ -104,22 +100,23 @@ class CIMI::Model::Volume < CIMI::Model::Base
               :name=>data["name"]}
     end
     storage_volume = context.driver.create_storage_volume(context.credentials, opts)
-    entity = store_attributes_for(storage_volume, data)
-    from_storage_volume(storage_volume, context, entity.to_hash)
+    result = from_storage_volume(storage_volume, context)
+    result.name = data['name'] if data['name']
+    result.description = data['description']
+    result.extract_properties!(data)
+    result.save
+    result
   end
 
-  def self.from_storage_volume(volume, context, stored_attributes=nil)
-    stored_attributes ||= load_attributes_for(volume)
-    self.new( { :name => stored_attributes[:name] || volume.id,
-                :description => stored_attributes[:description] || 'Description of Volume',
-                :property => stored_attributes[:property],
+  def self.from_storage_volume(volume, context)
+    self.new( { :name => volume.id,
                 :created => volume.created.nil? ? nil : Time.parse(volume.created).xmlschema,
                 :id => context.volume_url(volume.id),
                 :capacity => context.to_kibibyte(volume.capacity, 'GB'),
                 :bootable => "false", #fixme ... will vary... ec2 doesn't expose this
                 :snapshots => [], #fixme...
                 :type => 'http://schemas.dmtf.org/cimi/1/mapped',
-                :state => volume.state,
+                :state => volume.state == 'IN-USE' ? 'AVAILABLE' : volume.state,
                 :meters => [],
                 :operations => [{:href=> context.volume_url(volume.id), :rel => "delete"}]
             } )

data/lib/cimi/models/volume_configuration.rb

@@ -32,7 +32,7 @@ class CIMI::Model::VolumeConfiguration < CIMI::Model::Base
       :description => json['description'],
       :format => json['format'],
       :capacity => json['capacity'],
-      :ent_properties => json['properties'].to_json
+      :ent_properties => json['properties'] ? json['properties'].to_json : {}
     )
     from_db(new_config, context)
   end
@@ -45,7 +45,7 @@ class CIMI::Model::VolumeConfiguration < CIMI::Model::Base
       :description => xml['description'].first,
       :format => xml['format'].first,
       :capacity => xml['capacity'].first,
-      :ent_properties => JSON::dump(xml['property'].inject({}) { |r, p| r[p['key']]=p['content']; r })
+      :ent_properties => xml['property'] ? JSON::dump(xml['property'].inject({}) { |r, p| r[p['key']]=p['content']; r }) : {}
     )
     from_db(new_config, context)
   end
@@ -81,7 +81,7 @@ class CIMI::Model::VolumeConfiguration < CIMI::Model::Base
       :description => model.description,
       :format => model.format,
       :capacity => context.to_kibibyte(model.capacity, "GB"),
-      :property => JSON::parse(model.ent_properties),
+      :property => (model.ent_properties ? JSON::parse(model.ent_properties) :  nil),
       :operations => [
         { :href => context.destroy_volume_configuration_url(model.id), :rel => 'http://schemas.dmtf.org/cimi/1/action/delete' }
       ]

data/lib/cimi/models/volume_template.rb

@@ -56,7 +56,7 @@ class CIMI::Model::VolumeTemplate < CIMI::Model::Base
       :description => input['description'],
       :volume_config => input['volumeConfig']['href'],
       :volume_image => vol_image,
-      :ent_properties => JSON::dump(input['property'].inject({}) { |r, p| r[p['key']]=p['content']; r })
+      :ent_properties => input['property'] ? JSON::dump(input['property'].inject({}) { |r, p| r[p['key']]=p['content']; r }) : {}
     )
     from_db(new_template, context)
   end
@@ -74,7 +74,7 @@ private
       :description => model.description,
       :volume_config => {:href => model.volume_config},
       :volume_image => {:href => model.volume_image},
-      :property => JSON::parse(model.ent_properties),
+      :property => (model.ent_properties ? JSON::parse(model.ent_properties) :  nil),
       :operations => [
         { :href => context.destroy_volume_template_url(model.id), :rel => 'http://schemas.dmtf.org/cimi/1/action/delete' }
       ]

data/lib/cimi/server.rb

@@ -44,6 +44,7 @@ module CIMI
     enable :method_override
     disable :show_exceptions
     disable :dump_errors
+    set :haml, :format => :xhtml
 
     helpers Sinatra::Rabbit::URLFor(CIMI.collections)
 

data/lib/db.rb

@@ -1,3 +1,18 @@
+# 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 Deltacloud
 
   def self.test_environment?

data/lib/db/address_template.rb

@@ -1,3 +1,18 @@
+# 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 Deltacloud
   module Database
 

data/lib/db/entity.rb

@@ -1,8 +1,25 @@
+# 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 Deltacloud
   module Database
 
     class Entity < Sequel::Model
 
+      attr_accessor :properties
+
       many_to_one :provider
 
       plugin :single_table_inheritance, :model
@@ -16,6 +33,44 @@ module Deltacloud
         retval
       end
 
+      def properties=(v)
+        # Make sure @properties is always a Hash
+        @properties = v || {}
+      end
+
+      def before_save
+        self.ent_properties = properties.to_json
+        super
+      end
+
+      def after_initialize
+        if ent_properties
+          self.properties = JSON::parse(ent_properties)
+        else
+          self.properties = {}
+        end
+      end
+
+      # Load the entity for the CIMI::Model +model+, or create a new one if
+      # none exists yet
+      def self.retrieve(model)
+        unless model.id
+          raise "Can not retrieve entity for #{model.class.name} without an id"
+        end
+        h = model_hash(model)
+        entity = Provider::lookup.entities_dataset.first(h)
+        unless entity
+          h[:provider_id] = Provider::lookup.id
+          entity = Entity.new(h)
+        end
+        entity
+      end
+
+      private
+      def self.model_hash(model)
+        { :be_kind => model.class.name,
+          :be_id => model.id.split("/").last }
+      end
     end
 
   end

data/lib/db/machine_template.rb

@@ -1,3 +1,18 @@
+# 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 Deltacloud
   module Database
 

data/lib/db/provider.rb

@@ -1,12 +1,52 @@
+# 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_relative '../deltacloud/helpers/driver_helper'
+
 module Deltacloud
   module Database
 
     class Provider < Sequel::Model
+      extend Deltacloud::Helpers::Drivers
+
       one_to_many :entities
       one_to_many :machine_templates
       one_to_many :address_templates
       one_to_many :volume_templates
       one_to_many :volume_configurations
+
+      # Find the DB provider set in the environment/request
+      def self.lookup
+        prov = Thread.current[:provider] || ENV['API_PROVIDER'] || 'default'
+        find_or_create(:driver => current_driver_name, :url => prov)
+      end
+
+      private
+
+      # In case this model is used outside the Deltacloud server (CIMI tests, CIMI
+      # client, etc), the 'Deltacloud.default_frontend' is not initialized.
+      # In that case we have to use the 'fallback' way to retrieve current
+      # driver name.
+      #
+      def self.current_driver_name
+        if Deltacloud.respond_to?(:default_frontend)
+          self.driver_symbol.to_s
+        else
+          Thread.current[:driver] || ENV['API_DRIVER'] || 'mock'
+        end
+      end
     end
 
   end

data/lib/db/volume_configuration.rb

@@ -1,3 +1,18 @@
+# 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 Deltacloud
   module Database
 

data/lib/db/volume_template.rb

@@ -1,3 +1,18 @@
+# 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 Deltacloud
   module Database
 

data/lib/deltacloud/collections/base.rb

@@ -38,6 +38,7 @@ module Deltacloud::Collections
     set :public_folder, root + '/public'
     # A class where the Rabbit will look up for 'collections'
     set :documentation_class, Deltacloud
+    set :haml, :format => :xhtml
 
     error do
       report_error

data/lib/deltacloud/collections/instances.rb

@@ -23,7 +23,7 @@ module Deltacloud::Collections
 
     new_route_for(:instances) do
       @instance = Instance.new( { :id=>params[:id], :image_id=>params[:image_id] } )
-      @image   = Image.new( :id => params[:image_id] )
+      @image   = driver.image(credentials, :id => params[:image_id])
       @hardware_profiles = driver.hardware_profiles(credentials, :architecture => @image.architecture )
       @realms = [Realm.new(:id => params[:realm_id])] if params[:realm_id]
       @realms ||= driver.realms(credentials)
@@ -115,6 +115,7 @@ module Deltacloud::Collections
           respond_to do |format|
             format.xml { haml :"instances/run" }
             format.html { haml :"instances/run" }
+            format.json { JSON::dump({:instance => { :id => params[:id], :public_address => @output.ssh.network.ip, :command => @output.ssh.command, :output => @output.body}})}
           end
         end
       end

data/lib/deltacloud/collections/storage_snapshots.rb

@@ -26,7 +26,9 @@ module Deltacloud::Collections
       standard_show_operation
 
       operation :create, :with_capability => :create_storage_snapshot do
-        param :volume_id, :string,  :required
+        param :volume_id,   :string,  :required
+        param :name,        :string,  :optional
+        param :description, :string,  :optional
         control do
           @storage_snapshot = driver.create_storage_snapshot(credentials, params)
           status 201  # Created

data/lib/deltacloud/core_ext/array.rb

@@ -22,4 +22,9 @@ class Array
   def extract_opts!
     last.is_a?(Hash) ? pop : {}
   end
+
+  unless [].respond_to? :sample
+    alias :sample :choice
+  end
+
 end

data/lib/deltacloud/drivers/{aruba/aruba_driver.rb → arubacloud/arubacloud_driver.rb}

@@ -17,17 +17,14 @@
 
 require "savon"
 
-Savon.configure do |config|
-  config.log = false
-end
 HTTPI.log = false
 
 
 module Deltacloud
   module Drivers
-    module Aruba
+    module Arubacloud
 
-class ArubaDriver < Deltacloud::BaseDriver
+class ArubacloudDriver < Deltacloud::BaseDriver
 
   DEFAULT_DC = 'dc1'
   feature :instances, :authentication_password
@@ -307,7 +304,7 @@ class ArubaDriver < Deltacloud::BaseDriver
   def new_client(credentials, realm_id=nil)
     safely do
       wsdl = realm_id ? Deltacloud::Drivers::driver_config[:aruba][:entrypoints]["compute"]["dc#{realm_id}"] : endpoint
-      client = Savon.client(wsdl)
+      client = Savon.client({wsdl: wsdl, log: false})
       client.wsse.credentials credentials.user, credentials.password
       client.request :get_user_authentication_token
       client

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

@@ -23,76 +23,6 @@ module Deltacloud
         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
@@ -105,6 +35,36 @@ module Deltacloud
           error.from(:running, :pending, :stopping)
         end
 
+        define_hardware_profile('default')
+
+        def hardware_profiles(credentials, opts={})
+          do_client = new_client(credentials)
+          results = []
+          safely do
+            if opts[:id]
+              size = do_client.get("sizes/#{opts[:id]}")["size"]
+              results << hardware_profile_from(size)
+            else
+              sizes = do_client.get("sizes")["sizes"].each do |s|
+                size = do_client.get("sizes/#{s['id']}")["size"]
+                results << hardware_profile_from(size)
+              end
+            end
+            filter_hardware_profiles(results, opts)
+          end
+        end
+
+        def hardware_profile_ids(credentials)
+          do_client = new_client(credentials)
+          hwps = []
+          safely do
+            do_client.get("sizes")["sizes"].each do |s|
+              hwps << HardwareProfile.new(s["id"].to_s)
+            end
+          end
+          hwps
+        end
+
         def realms(credentials, opts={})
           safely do
             new_client(credentials).get('regions')['regions'].map do |r|
@@ -124,18 +84,19 @@ module Deltacloud
         # values to get less images.
         #
         def images(credentials, opts={})
+          hwps = hardware_profile_ids(credentials)
           unless opts[:id]
-            filter = opts[:owner_id] ? { :filter => opts[:owner_id] } : {}
+            filter = opts[:owner_id] ? { :filter => "my_images" } : {}
             img_arr = safely do
               new_client(credentials).get('images', filter)['images'].map do |i|
-                convert_image(credentials, i)
+                convert_image(hwps, i)
               end
             end
             filter_on( img_arr, :architecture, opts )
           else
             safely do
               [convert_image(
-                credentials,
+                hwps,
                 new_client(credentials).get('images/%s' % opts[:id])['image']
               )]
             end
@@ -289,7 +250,7 @@ module Deltacloud
           )
         end
 
-        def convert_image(credentials, i)
+        def convert_image(hwps, i)
           Image.new(
             :id => i['id'].to_s,
             :name => i['name'],
@@ -297,10 +258,22 @@ module Deltacloud
             :owner_id => 'global',
             :state => 'AVAILABLE',
             :architecture => extract_arch_from_name(i['name']),
-            :hardware_profiles => hardware_profiles(credentials)
+            :hardware_profiles => hwps
           )
         end
 
+        #{"cost_per_hour"=>0.00744, "cpu"=>1, "disk"=>20, "id"=>66, "memory"=>512, "name"=>"512MB"}
+        def hardware_profile_from(size)
+          hwp = HardwareProfile.new(size["id"].to_s) do
+            architecture 'x86_64'
+            memory size["memory"]
+            storage size["disk"]
+            cpu size["cpu"]
+          end
+          hwp.name=size["name"]
+          return hwp
+        end
+
       end
     end
   end