steamcannon-deltacloud-core 0.1.1.3 → 0.1.2.1

data/lib/deltacloud/drivers/ec2/ec2_mock_driver.rb

@@ -1,3 +1,21 @@
+#
+# Copyright (C) 2009,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
+# 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 RightAws
   class MockEc2
     

data/lib/deltacloud/drivers/gogrid/gogrid_client.rb

@@ -1,7 +1,6 @@
 require 'digest/md5'
 require 'cgi'
 require 'open-uri'
-require 'json'
 
 class GoGridClient
 

data/lib/deltacloud/drivers/gogrid/gogrid_driver.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -37,10 +37,24 @@ class GogridDriver < Deltacloud::BaseDriver
 
   feature :instances, :authentication_password
 
-  define_hardware_profile 'server' do
-    cpu            2
-    memory         [512, 1024, 2048, 4096, 8192]
-    storage        10
+  def hardware_profiles(credentials, opts={})
+    client = new_client(credentials)
+    safely do
+      server_types = client.request('common/lookup/list', { 'lookup' => 'server.type' })
+      server_rams = client.request('common/lookup/list', { 'lookup' => 'server.ram' })
+      @hardware_profiles = []
+      server_types['list'].each do |type|
+        memory_values = server_rams['list'].collect do |r| 
+            r['name'] =~ /MB$/ ? r['name'].gsub(/MB$/, '').to_i : (r['name'].gsub(/(\w{2})$/, '')).to_i*1024
+        end
+        @hardware_profiles << ::Deltacloud::HardwareProfile.new(type['name'].tr(' ', '-').downcase) do
+          cpu 2
+          memory memory_values
+          storage 25
+        end
+      end
+    end
+    @hardware_profiles
   end
 
   def supported_collections
@@ -361,6 +375,7 @@ class GogridDriver < Deltacloud::BaseDriver
       :description=> convert_description(gg_image),
       :owner_id=>gg_image['owner']['name'],
       :architecture=>convert_arch(gg_image['description']),
+      :state => gg_image['state']['name'].upcase
     } )
   end
 

data/lib/deltacloud/drivers/mock/mock_driver.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

data/lib/deltacloud/drivers/rackspace/rackspace_client.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

data/lib/deltacloud/drivers/rackspace/rackspace_driver.rb

@@ -228,6 +228,33 @@ class RackspaceDriver < Deltacloud::BaseDriver
     end
   end
 
+#--
+# Create Blob
+#--
+  def create_blob(credentials, bucket_id, blob_id, blob_data, opts=nil)
+    cf = cloudfiles_client(credentials)
+    #must first create the object using cloudfiles_client.create_object
+    #then can write using object.write(data)
+    object = cf.container(bucket_id).create_object(blob_id)
+    #blob_data is a construct with data in .tempfile and content-type in {:type}
+    res = object.write(blob_data[:tempfile], {'Content-Type' => blob_data[:type]})
+    Blob.new( { :id => object.name,
+                :bucket => object.container.name,
+                :content_length => blob_data[:tempfile].length,
+                :content_type => blob_data[:type],
+                :last_modified => ''
+              }
+            )
+  end
+
+#--
+# Delete Blob
+#--
+  def delete_blob(credentials, bucket_id, blob_id, opts=nil)
+    cf = cloudfiles_client(credentials)
+    cf.container(bucket_id).delete_object(blob_id)
+  end
+
 private
 
   def convert_srv_to_instance(srv)
@@ -271,7 +298,7 @@ private
 
   def cloudfiles_client(credentials)
     safely do
-      CloudFiles::Connection.new(credentials.user, credentials.password)
+      CloudFiles::Connection.new(:username => credentials.user, :api_key => credentials.password)
     end
   end
 

data/lib/deltacloud/hardware_profile.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2009,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
+# 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
   class HardwareProfile

data/lib/deltacloud/helpers.rb

@@ -1,3 +1,21 @@
+#
+# Copyright (C) 2009,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
+# 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/helpers/application_helper'
 require 'deltacloud/helpers/conversion_helper'
 require 'deltacloud/helpers/hardware_profiles_helper'

data/lib/deltacloud/helpers/application_helper.rb

@@ -1,5 +1,4 @@
-#
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -17,6 +16,7 @@
 # under the License.
 
 # Methods added to this helper will be available to all templates in the application.
+
 module ApplicationHelper
 
   def bread_crumb

data/lib/deltacloud/helpers/blob_stream.rb

@@ -28,7 +28,11 @@ begin
       #the client guess and if they can't they SHOULD default to
       #'application/octet-stream' anyway as per:
       #http://www.w3.org/Protocols/rfc2616/rfc2616-sec7.html#sec7.2.1
-      EM.next_tick { env['async.callback'].call [200, {'Content-Type' => "#{params['content_type']}", 'Content-Length' => "#{params['content_length']}"}, body] }
+      EM.next_tick { env['async.callback'].call [200, {
+        'Content-Type' => "#{params['content_type']}",
+        'Content-Disposition' => params["content_disposition"],
+        'Content-Length' => "#{params['content_length']}"}, body] 
+      }
       #call the driver from here. the driver method yields for every chunk of blob it receives. We then
       #use body.call to write that chunk as received.
       driver.blob_data(credentials, params[:bucket], params[:blob], params) {|chunk| body.call ["#{chunk}"]} #close blob_data block

data/lib/deltacloud/helpers/conversion_helper.rb

@@ -1,5 +1,4 @@
-#
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

data/lib/deltacloud/helpers/hardware_profiles_helper.rb

@@ -1,3 +1,20 @@
+# Copyright (C) 2009, 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
+# 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 HardwareProfilesHelper
 
   def format_hardware_property(prop)

data/lib/deltacloud/method_serializer.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009,2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

data/lib/deltacloud/models/base_model.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

data/lib/deltacloud/models/blob.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -17,10 +17,12 @@
 # under the License.
 
 class Blob < BaseModel
+  
   #already has an id from basemodel (for the key)
   attr_accessor :bucket
   attr_accessor :content_length
   attr_accessor :content_type
   attr_accessor :last_modified
   attr_accessor :content
+
 end

data/lib/deltacloud/models/bucket.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -21,4 +21,5 @@ class Bucket < BaseModel
   attr_accessor :name
   attr_accessor :size
   attr_accessor :blob_list
+
 end

data/lib/deltacloud/models/image.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

data/lib/deltacloud/models/instance.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-
 class Instance < BaseModel
 
   attr_accessor :owner_id

data/lib/deltacloud/models/instance_profile.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +18,7 @@
 
 # Model to store the hardware profile applied to an instance together with
 # any instance-specific overrides
+
 class InstanceProfile < BaseModel
   attr_accessor :memory
   attr_accessor :storage

data/lib/deltacloud/models/key.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010 Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

data/lib/deltacloud/models/load_balancer.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

data/lib/deltacloud/models/realm.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

data/lib/deltacloud/models/storage_snapshot.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

data/lib/deltacloud/models/storage_volume.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Red Hat, Inc.
+# Copyright (C) 2009, 2010  Red Hat, Inc.
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

data/lib/deltacloud/state_machine.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2009,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
+# 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
   class StateMachine

data/lib/deltacloud/validation.rb

@@ -1,3 +1,21 @@
+#
+# Copyright (C) 2009,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
+# 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::Validation
 
   class Failure < StandardError

data/lib/drivers.rb

@@ -1,51 +1,77 @@
-DRIVERS = {
-  :ec2 => { :name => "EC2" },
-  :rackspace => { :name => "Rackspace" },
-  :gogrid => { :name => "Gogrid" },
-  :rhevm => { :name => "RHEVM" },
-  :rimuhosting => { :name => "RimuHosting"},
-  :opennebula => { :name => "Opennebula", :class => "OpennebulaDriver" },
-  :terremark => { :name => "Terremark"},
-  :azure => { :name => "Azure" },
-  :mock => { :name => "Mock" }
-}
-
-DEFAULT_COLLECTIONS = [
-  :hardware_profiles,
-  :images,
-  :instances,
-  :instance_states,
-  :realms,
-  :storage_volumes,
-  :storage_snapshots
-]
-
-DRIVER=ENV['API_DRIVER'] ? ENV['API_DRIVER'].to_sym : :mock
-
-def driver_name
-  DRIVERS[DRIVER][:name]
-end
+# Copyright (C) 2009, 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
+# 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.
 
-def driver_class_name
-  basename = DRIVERS[DRIVER][:class] || "#{driver_name}Driver"
-  "Deltacloud::Drivers::#{driver_name}::#{basename}"
-end
+module Deltacloud
+  DRIVERS = {
+    :ec2 => { :name => "EC2" },
+    :rackspace => { :name => "Rackspace" },
+    :gogrid => { :name => "Gogrid" },
+    :rhevm => { :name => "RHEVM" },
+    :rimuhosting => { :name => "RimuHosting"},
+    :opennebula => { :name => "Opennebula", :class => "OpennebulaDriver" },
+    :terremark => { :name => "Terremark"},
+    :azure => { :name => "Azure" },
+    :mock => { :name => "Mock" }
+  }
 
-def driver_source_name
-  File.join("deltacloud", "drivers", "#{DRIVER}", "#{DRIVER}_driver.rb")
-end
+  DEFAULT_COLLECTIONS = [
+    :hardware_profiles,
+    :images,
+    :instances,
+    :instance_states,
+    :realms,
+    :storage_volumes,
+    :storage_snapshots
+  ]
 
-def driver_mock_source_name
-  return File.join('deltacloud', 'drivers', DRIVER.to_s, "#{DRIVER}_driver.rb") if driver_name.eql? 'Mock'
-end
+  DRIVER=ENV['API_DRIVER'] ? ENV['API_DRIVER'].to_sym : :mock
 
-def driver
-  require driver_source_name
-  #require 'deltacloud/base_driver/mock_driver.rb'
+  def driver_symbol
+    (Thread.current[:driver] || DRIVER).to_sym
+  end
+
+  def driver_name
+    DRIVERS[:"#{driver_symbol}"][:name]
+  end
 
-  if Sinatra::Application.environment.eql? :test
-    require driver_mock_source_name if driver_mock_source_name
+  def driver_class_name
+    basename = DRIVERS[:"#{driver_symbol}"][:class] || "#{driver_name}Driver"
+    "Deltacloud::Drivers::#{driver_name}::#{basename}"
   end
 
-  @driver ||= eval( driver_class_name ).new
+  def driver_source_name
+    File.join("deltacloud", "drivers", "#{driver_symbol}", "#{driver_symbol}_driver.rb")
+  end
+
+  def driver_mock_source_name
+    return File.join('deltacloud', 'drivers', "#{driver_symbol}", 
+                     "#{driver_symbol}_driver.rb") if driver_name.eql? 'Mock'
+  end
+
+  def driver
+    require driver_source_name
+    #require 'deltacloud/base_driver/mock_driver.rb'
+
+    if Sinatra::Application.environment.eql? :test
+      require driver_mock_source_name if driver_mock_source_name
+    end
+
+    @driver ||= eval( driver_class_name ).new
+  end
 end
+
+include Deltacloud