deltacloud-core 0.1.2 → 0.3.0

data/lib/deltacloud/base_driver/features.rb

@@ -1,3 +1,19 @@
+#
+# 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 'deltacloud/validation'
 
 # Add advertising of optional features to the base driver
@@ -39,13 +55,19 @@ module Deltacloud
         @description
       end
 
-      # Add a new operation or modify an existing one through BLOCK
+      # Add/modify an operation or look up an existing one. If +block+ is
+      # provided, create a new operation if none exists with name
+      # +name+. Evaluate the +block+ against this instance. If no +block+
+      # is provided, look up the operation with name +name+
       def operation(name, &block)
-        unless op = @operations.find { |op| op.name == name }
-          op = Operation.new(name, &block)
-          @operations << op
-        else
-          op.instance_eval(&block) if block_given?
+        op = @operations.find { |op| op.name == name }
+        if block_given?
+          if op.nil?
+            op = Operation.new(name, &block)
+            @operations << op
+          else
+            op.instance_eval(&block)
+          end
         end
         op
       end
@@ -94,7 +116,7 @@ module Deltacloud
     end
 
     def self.features
-      @@features ||= {}
+      @features ||= {}
     end
 
     # Declare in a driver that it supports a specific feature
@@ -117,6 +139,12 @@ module Deltacloud
       self.class.features[collection] || []
     end
 
+    def features_for_operation(collection, operation)
+      features(collection).select do |f|
+        f.operations.detect { |o| o.name == operation }
+      end
+    end
+
     #
     # Declaration of optional features
     #
@@ -143,6 +171,18 @@ module Deltacloud
       end
     end
 
+    declare_feature :instances, :user_files do
+      description "Accept up to 5 files to be placed into the instance before launch."
+      operation :create do
+        1.upto(5) do |i|
+          param :"path#{i}", :string, :optional, nil,
+          "Path where to place the #{i.ordinalize} file, up to 255 characters"
+          param :"content#{i}", :string, :optional, nil,
+          "Contents for the #{i.ordinalize} file, up to 10 kB, Base64 encoded"
+        end
+      end
+    end
+
     declare_feature :instances, :security_group do
       description "Put instance in one or more security groups on launch"
       operation :create do
@@ -185,5 +225,19 @@ module Deltacloud
       end
     end
 
+    declare_feature :instances, :instance_count do
+      description "Number of instances to be launch with at once"
+      operation :create do
+        param :instance_count,  :string,  :optional
+      end
+    end
+
+    declare_feature :instances, :sandboxing do
+      description "Allow lanuching sandbox images"
+      operation :create do
+        param :sandbox, :string,  :optional
+      end
+    end
+
   end
 end

data/lib/deltacloud/base_driver/mock_driver.rb

@@ -1,78 +1,77 @@
+# 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 'deltacloud/method_serializer'
 
 # Create 'mock' version of original driver client/gem:
 
-module Mock
-
-  class S3 < RightAws::S3
-    include MethodSerializer::Cache
+# Initialize driver and include Deltacloud
+include Deltacloud
+driver
 
-    def self.cached_methods
-      [
-        :buckets
-      ]
-    end
-
-    MethodSerializer::Cache::wrap_methods(self, :cache_dir => File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'tests', 'ec2', 'support'))
-  end
-
-  class ELB < AWS::ELB::Base
-    include MethodSerializer::Cache
-
-    def self.cached_methods
-      [
-        :describe_load_balancers
-      ]
-    end
-
-    MethodSerializer::Cache::wrap_methods(self, :cache_dir => File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'tests', 'ec2', 'support'))
-
-  end
+module Mock
 
-  class EC2 < AWS::EC2::Base
+  class Ec2 < Aws::Ec2
 
     include MethodSerializer::Cache
 
     def self.cached_methods
       [
         :describe_images,
+        :describe_images_by_owner,
         :describe_availability_zones,
-        :describe_keypairs,
-        :create_keypair,
-        :run_instances,
+        :launch_instances,
         :describe_instances,
         :reboot_instances,
+        :create_tag,
+        :delete_tag,
+        :describe_tags,
         :terminate_instances,
-        :delete_keypair
+        :describe_key_pairs,
+        :create_key_pair,
+        :delete_key_pair,
+        :create_volume,
+        :describe_volumes,
+        :delete_volume,
+        :attach_volume,
+        :detach_volume,
+        :describe_snapshots,
+        :associate_address,
+        :try_create_snapshot,
       ]
     end
 
     MethodSerializer::Cache::wrap_methods(self, :cache_dir => File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'tests', 'ec2', 'support'))
   end
+  
 end
 
 
 # Replace original client with mock client
 Deltacloud::Drivers::EC2::EC2Driver.class_eval do
   alias_method :original_new_client, :new_client
-  alias_method :original_s3_client, :s3_client
 
   def new_client(credentials, provider = :ec2)
+    auth_credentials = { :access_key_id => credentials.user, :secret_access_key => credentials.password}
     if provider == :elb
-      Mock::ELB.new(
-        :access_key_id => credentials.user,
-        :secret_access_key => credentials.password
-      )
+      Mock::ELB.new(auth_credentials)
+    elsif provider == :s3
+      Mock::S3.new(auth_credentials)
     else
-      Mock::EC2.new(
-        :access_key_id => credentials.user,
-        :secret_access_key => credentials.password
-      )
+      Mock::Ec2.new(auth_credentials[:access_key_id], auth_credentials[:secret_access_key])
     end
   end
 
-  def s3_client(credentials)
-    Mock::S3.new(credentials.user, credentials.password)
-  end
-
 end

data/lib/deltacloud/core_ext.rb

@@ -0,0 +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.
+
+require 'deltacloud/core_ext/string'
+require 'deltacloud/core_ext/integer'

data/lib/deltacloud/core_ext/integer.rb

@@ -0,0 +1,31 @@
+#
+# 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.
+
+class Integer
+  # Turn integers into strings +1st+, +2nd+, +3rd+ etc.
+  def ordinalize
+    if (11..13).include?(self % 100)
+      "#{self}th"
+    else
+      case self % 10
+      when 1; "#{self}st"
+      when 2; "#{self}nd"
+      when 3; "#{self}rd"
+      else    "#{self}th"
+      end
+    end
+  end
+end

data/lib/deltacloud/core_ext/string.rb

@@ -0,0 +1,50 @@
+#
+# 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.
+
+class String
+  # Rails defines this for a number of other classes, including Object
+  # see activesupport/lib/active_support/core_ext/object/blank.rb
+  def blank?
+      self !~ /\S/
+  end
+
+  # Title case.
+  #
+  #   "this is a string".titlecase
+  #   => "This Is A String"
+  #
+  # CREDIT: Eliazar Parra
+  # Copied from facets
+  def titlecase
+    gsub(/\b\w/){ $`[-1,1] == "'" ? $& : $&.upcase }
+  end
+
+  def pluralize
+    self + "s"
+  end
+
+  def singularize
+    self.gsub(/s$/, '')
+  end
+
+  def underscore
+      gsub(/::/, '/').
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          tr("-", "_").
+          downcase
+  end
+end

data/lib/deltacloud/drivers/azure/azure_driver.rb

@@ -1,6 +1,4 @@
 #
-# Copyright (C) 2010  Red Hat, Inc.
-#
 # 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
@@ -32,21 +30,26 @@ class AzureDriver < Deltacloud::BaseDriver
 #--
 # Buckets
 #--
-  def buckets(credentials, opts)
+  def buckets(credentials, opts={})
     buckets = []
     azure_connect(credentials)
     safely do
-      WAZ::Blobs::Container.list.each do |waz_container|
-        buckets << convert_container(waz_container)
-      end
-    end
+      unless (opts[:id].nil?)
+        waz_bucket =  WAZ::Blobs::Container.find(opts[:id])
+        buckets << convert_container(waz_bucket)
+      else
+        WAZ::Blobs::Container.list.each do |waz_container|
+          buckets << Bucket.new({:id =>waz_container.name, :name => waz_container.name})
+        end #container.list.each
+      end #unless
+    end #safely
     buckets = filter_on(buckets, :id, opts)
   end
 
 #--
 # Create bucket
 #--
-  def create_bucket(credentials, name, opts)
+  def create_bucket(credentials, name, opts={})
     #for whatever reason, bucket names MUST be lowercase...
     #http://msdn.microsoft.com/en-us/library/dd135715.aspx
     name.downcase!
@@ -62,7 +65,7 @@ class AzureDriver < Deltacloud::BaseDriver
 #--
 # Delete bucket
 #--
-  def delete_bucket(credentials, name, opts)
+  def delete_bucket(credentials, name, opts={})
     azure_connect(credentials)
     safely do
       WAZ::Blobs::Container.find(name).destroy!
@@ -72,20 +75,25 @@ class AzureDriver < Deltacloud::BaseDriver
 #--
 # Blobs
 #--
-  def blobs(credentials, opts)
+  def blobs(credentials, opts={})
     blob_list = []
     azure_connect(credentials)
     safely do
       the_bucket = WAZ::Blobs::Container.find(opts['bucket'])
-      the_bucket.blobs.each do |waz_blob|
-        blob_list << convert_blob(waz_blob)
-      end
-    end
+      if(opts[:id])
+        the_blob = the_bucket[opts[:id]]
+        blob_list << convert_blob(the_blob) unless the_blob.nil?
+      else
+        the_bucket.blobs.each do |waz_blob|
+          blob_list << convert_blob(waz_blob)
+        end #each.do
+      end #if
+    end #safely do
     blob_list = filter_on(blob_list, :id, opts)
     blob_list
   end
 
-  def blob_data(credentials, bucket_id, blob_id, opts)
+  def blob_data(credentials, bucket_id, blob_id, opts={})
     azure_connect(credentials)
     # WAZ get blob data methods cant accept blocks for 'streaming'... FIXME
       yield WAZ::Blobs::Container.find(bucket_id)[blob_id].value
@@ -94,23 +102,28 @@ class AzureDriver < Deltacloud::BaseDriver
 #--
 # Create Blob
 #--
-  def create_blob(credentials, bucket_id, blob_id, blob_data, opts=nil)
+  def create_blob(credentials, bucket_id, blob_id, blob_data, opts={})
     azure_connect(credentials)
-    #get a handle to the bucket in order to put there
-    the_bucket = WAZ::Blobs::Container.find(bucket_id)
-    the_bucket.store(blob_id, blob_data[:tempfile], blob_data[:type])
+    #insert azure-specific header for user metadata ... x-ms-meta-kEY = VALUE
+    opts.gsub_keys("HTTP_X_Deltacloud_Blobmeta_", "x-ms-meta-")
+    safely do
+      #get a handle to the bucket in order to put there
+      the_bucket = WAZ::Blobs::Container.find(bucket_id)
+      the_bucket.store(blob_id, blob_data[:tempfile], blob_data[:type], opts)
+    end
     Blob.new( { :id => blob_id,
                 :bucket => bucket_id,
                 :content_lengh => blob_data[:tempfile].length,
                 :content_type => blob_data[:type],
-                :last_modified => ''
+                :last_modified => '',
+                :user_metadata => opts.gsub_keys('x-ms-meta-','')
             } )
   end
 
 #--
 # Delete Blob
 #--
-  def delete_blob(credentials, bucket_id, blob_id, opts=nil)
+  def delete_blob(credentials, bucket_id, blob_id, opts={})
     azure_connect(credentials)
     #get a handle to bucket and blob, and destroy!
     the_bucket = WAZ::Blobs::Container.find(bucket_id)
@@ -118,6 +131,36 @@ class AzureDriver < Deltacloud::BaseDriver
     the_blob.destroy!
   end
 
+#-
+# Blob Metadada
+#-
+  def blob_metadata(credentials, opts = {})
+    azure_connect(credentials)
+    all_meta = nil
+    safely do
+      blob = WAZ::Blobs::Container.find(opts['bucket'])[opts[:id]]
+      return nil unless blob
+      all_meta = blob.metadata
+    end
+    user_meta = {}
+    all_meta.inject({}){|result_hash, (k,v)| user_meta[k]=v if k.to_s.match(/x_ms_meta/i)}
+    user_meta.gsub_keys('x_ms_meta_','')
+  end
+
+#-
+# Update Blob Metadata
+#-
+  def update_blob_metadata(credentials, opts={})
+    azure_connect(credentials)
+    meta_hash = opts['meta_hash']
+    meta_hash.gsub_keys("HTTP_X_Deltacloud_Blobmeta_", "x-ms-meta-")
+    safely do
+      the_blob = WAZ::Blobs::Container.find(opts['bucket'])[opts[:id]]
+      the_blob.put_metadata!(meta_hash)
+    end
+  end
+
+
   private
 
   def azure_connect(credentials)
@@ -142,11 +185,17 @@ class AzureDriver < Deltacloud::BaseDriver
   def convert_blob(waz_blob)
     url = waz_blob.url.split('/')
     bucket = url[url.length-2] #FIXME
+    #get only user defined metadata
+    blob_metadata = {}
+    waz_blob.metadata.inject({}) { |result_hash, (k,v)| blob_metadata[k]=v if k.to_s.match(/x_ms_meta/i)}
+    #strip off the x_ms_meta_ from each key
+    blob_metadata.gsub_keys('x_ms_meta_', '')
     Blob.new({   :id => waz_blob.name,
                  :bucket => bucket,
                  :content_length => waz_blob.metadata[:content_length],
                  :content_type => waz_blob.metadata[:content_type],
-                 :last_modified => waz_blob.metadata[:last_modified]
+                 :last_modified => waz_blob.metadata[:last_modified],
+                 :user_metadata => blob_metadata
               })
   end