deltacloud-client 0.0.3 → 0.0.4

data/Rakefile

@@ -15,9 +15,14 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-
+require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 
+load 'deltacloud-client.gemspec'
+
+Rake::GemPackageTask.new(@spec) do |pkg|
+  pkg.need_tar = true
+end
 
 desc "Run all examples"
 Spec::Rake::SpecTask.new('spec') do |t|

data/bin/deltacloudc

@@ -1,4 +1,4 @@
-#!/bin/env ruby
+#!/usr/bin/env ruby
 #
 # Copyright (C) 2009  Red Hat, Inc.
 #
@@ -39,7 +39,7 @@ BANNER
   opts.on( '-i', '--id ID', 'ID for operation') { |id| options[:id] = id }
   opts.on( '-d', '--image-id ID', 'Image ID') { |id| options[:image_id] = id }
   opts.on( '-a', '--arch ARCH', 'Architecture (x86, x86_64)') { |id| options[:architecture] = id }
-  opts.on( '-f', '--flavor_id FLAVOR', 'Flavor') { |id| options[:flavor_id] = id }
+  opts.on( '-p', '--hardware-profile HARDWARE_PROFILE', 'Hardware Profile') { |id| options[:hwp_id] = id }
   opts.on( '-n', '--name NAME', 'Name (for instance eg.)') { |name| options[:name] = name }
   opts.on( '-s', '--state STATE', 'Instance state (RUNNING, STOPPED)') { |state| options[:state] = state }
   opts.on( '-u', '--url URL', 'API url ($API_URL variable)') { |url| options[:api_url] = url }
@@ -66,11 +66,10 @@ options[:collection] = ARGV[0]
 options[:operation] = ARGV[1]
 
 # Connect to Deltacloud API and fetch all entry points
-client = DeltaCloud.new(url.user, url.password, api_url, { :verbose => options[:verbose] })
+client = DeltaCloud.new(url.user || ENV['API_USER'], url.password || ENV['API_PASSWORD'], api_url, { :verbose => options[:verbose] })
 collections = client.entry_points.keys
 
 # Exclude collection which don't have methods in client library yet
-collections.delete(:hardware_profiles)
 collections.delete(:instance_states)
 
 # If list parameter passed print out available collection
@@ -98,7 +97,7 @@ if options[:version]
   exit(0)
 end
 
-# List items from collection (typically /flavors)
+# List items from collection (typically /instances)
 # Do same if 'index' operation is set
 if options[:collection] and ( options[:operation].nil? or options[:operation].eql?('index') )
   invalid_usage("Unknown collection: #{options[:collection]}") unless collections.include?(options[:collection].to_sym)
@@ -127,12 +126,16 @@ if options[:collection] and options[:operation]
   end
 
   # If collection is set and requested operation is create new instance,
-  # --image-id, --flavor-id and --name parameters are used
+  # --image-id, --hardware-profile and --name parameters are used
   # Returns created instance in plain form
   if options[:collection].eql?('instances') and options[:operation].eql?('create')
+    invalid_usage("Missing image-id") unless options[:image_id]
+    if options[:name] and ! client.feature?(:instances, :user_name)
+      invalid_usage("Driver does not support user-supplied name")
+    end
     params.merge!(:name => options[:name]) if options[:name]
     params.merge!(:image_id => options[:image_id]) if options[:image_id]
-    params.merge!(:flavor_id => options[:flavor_id]) if options[:flavor_id]
+    params.merge!(:hwp_id => options[:hwp_id]) if options[:hwp_id]
     instance = client.create_instance(options[:image_id], params)
     puts instance.to_plain
     exit(0)

data/lib/dcloud/hardware_profile.rb

@@ -0,0 +1,124 @@
+#
+# Copyright (C) 2009  Red Hat, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+require 'dcloud/base_model'
+
+module DCloud
+    class HardwareProfile < BaseModel
+
+      class Property
+        class Range
+          attr_reader :first, :last
+          def initialize(element)
+            if element
+              @first = element.attributes['first']
+              @last = element.attributes['last']
+            end
+          end
+          def present?
+            ! @first.nil?
+          end
+        end
+        class Enum
+          attr_reader :entries
+          def initialize(element)
+            @entries = []
+            if element
+              element.get_elements( 'entry' ).each do |entry|
+                @entries << entry.attributes['value']
+              end
+            end
+          end
+          def present?
+            ! @entries.empty?
+          end
+        end
+        attr_reader :name, :kind, :unit, :value, :range, :enum
+
+        def initialize(xml, name)
+          @name = name
+          p = REXML::XPath.first(xml, "property[@name = '#{name}']")
+          if p
+            @value = p.attributes['value']
+            @unit = p.attributes['unit']
+            @kind = p.attributes['kind']
+            @range = Range.new(p.get_elements('range')[0]) if @kind=='range'
+            @enum = Enum.new(p.get_elements('enum')[0]) if @kind=='enum'
+          end
+        end
+
+        def present?
+          ! @value.nil?
+        end
+
+        # FIXME: how to  range/enum/kind bits fit into this?
+        def to_s
+          v = @value || "---"
+          u = @unit || ""
+          u = "" if ["label", "count"].include?(u)
+          "#{v} #{u}"
+        end
+      end
+
+      class FloatProperty < Property
+        def initialize(xml, name)
+          super(xml, name)
+          @value = @value.to_f if @value
+        end
+      end
+
+      class IntegerProperty < Property
+        def initialize(xml, name)
+          super(xml, name)
+          @value = @value.to_i if @value
+        end
+      end
+
+      xml_tag_name :hardware_profile
+
+      attribute :memory
+      attribute :storage
+      attribute :cpu
+      attribute :architecture
+
+      def initialize(client, uri, xml=nil)
+        super( client, uri, xml )
+      end
+
+      def load_payload(xml=nil)
+        super(xml)
+        unless xml.nil?
+          @memory = FloatProperty.new(xml, 'memory')
+          @storage = FloatProperty.new(xml, 'storage')
+          @cpu = IntegerProperty.new(xml, 'cpu')
+          @architecture = Property.new(xml, 'architecture')
+        end
+      end
+
+      def to_plain
+        sprintf("%-15s | %-6s | %10s | %10s ", id[0, 15],
+                architecture.to_s[0,6], memory.to_s[0,10], storage.to_s[0,10])
+      end
+
+      private
+      def property_value(xml, name)
+        p = REXML::XPath.first(xml, "property[@name = '#{name}']")
+        p ? p.attributes['value'] : ""
+      end
+    end
+end

data/lib/dcloud/instance.rb

@@ -19,6 +19,33 @@
 require 'dcloud/base_model'
 
 module DCloud
+
+    class InstanceProfile
+      attr_reader :hardware_profile, :id
+
+      def initialize(client, xml)
+        @hardware_profile = HardwareProfile.new(client, xml.attributes['href'])
+        @properties = {}
+        @id = xml.text("id")
+        xml.get_elements('property').each do |prop|
+          @properties[prop.attributes['name'].to_sym] = {
+            :value => prop.attributes['value'],
+            :unit => prop.attributes['unit'],
+            :kind => prop.attributes['kind'].to_sym
+          }
+        end
+      end
+
+      def [](prop)
+        p = @properties[prop]
+        p ? p[:value] : nil
+      end
+
+      def property(prop)
+        @properties[prop]
+      end
+    end
+
     class Instance < BaseModel
 
       xml_tag_name :instance
@@ -30,9 +57,9 @@ module DCloud
       attribute :state
       attribute :actions
       attribute :image
-      attribute :flavor
       attribute :realm
       attribute :action_urls
+      attribute :instance_profile
 
       def initialize(client, uri, xml=nil)
         @action_urls = {}
@@ -71,6 +98,13 @@ module DCloud
         unload
       end
 
+      def destroy!()
+        url = action_urls['destroy']
+        throw Exception.new( "Unable to destroy" ) unless url
+        client.post_instance( url )
+        unload
+      end
+
       def load_payload(xml=nil)
         super(xml)
         unless xml.nil?
@@ -86,13 +120,13 @@ module DCloud
           end
           image_uri = xml.get_elements( 'image' )[0].attributes['href']
           @image = Image.new( @client, image_uri )
-          flavor_uri = xml.get_elements( 'flavor' )[0].attributes['href']
-          @flavor = Flavor.new( @client, flavor_uri )
           # Only use realms if they are there
           if (!xml.get_elements( 'realm' ).empty?)
               realm_uri = xml.get_elements( 'realm' )[0].attributes['href']
               @realm = Realm.new( @client, realm_uri )
           end
+          instance_profile = xml.get_elements( 'hardware-profile' ).first
+          @instance_profile = InstanceProfile.new( @client, instance_profile )
           @state = xml.text( 'state' )
           @actions = []
           xml.get_elements( 'actions/link' ).each do |link|

data/lib/deltacloud.rb

@@ -18,7 +18,7 @@
 require 'rest_client'
 require 'rexml/document'
 require 'logger'
-require 'dcloud/flavor'
+require 'dcloud/hardware_profile'
 require 'dcloud/realm'
 require 'dcloud/image'
 require 'dcloud/instance'
@@ -35,6 +35,7 @@ class DeltaCloud
   attr_reader   :entry_points
   attr_reader   :driver_name
   attr_reader   :last_request_xml
+  attr_reader   :features
 
   def self.driver_name(url)
     DeltaCloud.new( nil, nil, url) do |client|
@@ -49,6 +50,7 @@ class DeltaCloud
     @api_uri      = URI.parse( api_uri )
     @entry_points = {}
     @verbose      = opts[:verbose]
+    @features = {}
     discover_entry_points
     connect( &block )
     self
@@ -74,31 +76,35 @@ class DeltaCloud
     @api_uri.path
   end
 
-  def flavors(opts={})
-    flavors = []
-    request(entry_points[:flavors], :get, opts) do |response|
+  def feature?(collection, name)
+    @features.has_key?(collection) && @features[collection].include?(name)
+  end
+
+  def hardware_profiles(opts={})
+    hardware_profiles = []
+    request(entry_points[:hardware_profiles], :get, opts) do |response|
       doc = REXML::Document.new( response )
-      doc.get_elements( 'flavors/flavor' ).each do |flavor|
-        uri = flavor.attributes['href']
-        flavors << DCloud::Flavor.new( self, uri, flavor )
+      doc.get_elements( 'hardware-profiles/hardware-profile' ).each do |hwp|
+        uri = hwp.attributes['href']
+        hardware_profiles << DCloud::HardwareProfile.new( self, uri, hwp )
       end
     end
-    flavors
+    hardware_profiles
   end
 
-  def flavor(id)
-    request( entry_points[:flavors], :get, {:id=>id } ) do |response|
+  def hardware_profile(id)
+    request( entry_points[:hardware_profiles], :get, {:id=>id } ) do |response|
       doc = REXML::Document.new( response )
-      doc.get_elements( '/flavor' ).each do |flavor|
-        uri = flavor.attributes['href']
-        return DCloud::Flavor.new( self, uri, flavor )
+      doc.get_elements( '/hardware-profile' ).each do |hwp|
+        uri = hwp.attributes['href']
+        return DCloud::HardwareProfile.new( self, uri, hwp )
       end
     end
   end
 
-  def fetch_flavor(uri)
-    xml = fetch_resource( :flavor, uri )
-    return DCloud::Flavor.new( self, uri, xml ) if xml
+  def fetch_hardware_profile(uri)
+    xml = fetch_resource( :hardware_profile, uri )
+    return DCloud::HardwareProfile.new( self, uri, xml ) if xml
     nil
   end
 
@@ -256,16 +262,32 @@ class DeltaCloud
     nil
   end
 
+  # Create a new instance, using image +image_id+. Possible optiosn are
+  #
+  #   name  - a user-defined name for the instance
+  #   realm - a specific realm for placement of the instance
+  #   hardware_profile - either a string giving the name of the
+  #                      hardware profile or a hash. The hash must have an
+  #                      entry +id+, giving the id of the hardware profile,
+  #                      and may contain additional names of properties,
+  #                      e.g. 'storage', to override entries in the
+  #                      hardware profile
   def create_instance(image_id, opts={})
     name = opts[:name]
     realm_id = opts[:realm]
-    flavor_id = opts[:flavor]
 
     params = {}
     ( params[:realm_id] = realm_id ) if realm_id
-    ( params[:flavor_id] = flavor_id ) if flavor_id
     ( params[:name] = name ) if name
 
+    if opts[:hardware_profile].is_a?(String)
+      params[:hwp_id] = opts[:hardware_profile]
+    elsif opts[:hardware_profile].is_a?(Hash)
+      opts[:hardware_profile].each do |k,v|
+        params[:"hwp_#{k}"] = v
+      end
+    end
+
     params[:image_id] = image_id
     request( entry_points[:instances], :post, {}, params ) do |response|
       doc = REXML::Document.new( response )
@@ -344,15 +366,21 @@ class DeltaCloud
   attr_reader :http
 
   def discover_entry_points
+    return if @discovered
     request(api_uri.to_s) do |response|
       doc = REXML::Document.new( response )
       @driver_name = doc.root.attributes['driver']
       doc.get_elements( 'api/link' ).each do |link|
-        rel = link.attributes['rel']
+        rel = link.attributes['rel'].to_sym
         uri = link.attributes['href']
-        @entry_points[rel.to_sym] = uri
+        @entry_points[rel] = uri
+        @features[rel] ||= []
+        link.get_elements('feature').each do |feature|
+          @features[rel] << feature.attributes['name'].to_sym
+        end
       end
     end
+    @discovered = true
   end
 
   def request(path='', method=:get, query_args={}, form_data={}, &block)

data/specs/data/images/img1.yml

@@ -1,3 +1,4 @@
 :description: Fedora 10
 :owner_id: fedoraproject
 :architecture: x86_64
+:id: img1

data/specs/data/images/img2.yml

@@ -1,3 +1,4 @@
 :description: Fedora 10
 :owner_id: fedoraproject
 :architecture: i386
+:id: img2

data/specs/data/images/img3.yml

@@ -1,3 +1,4 @@
 :description: JBoss
 :owner_id: mockuser
 :architecture: i386
+:id: img3

data/specs/data/instances/inst0.yml

@@ -0,0 +1,16 @@
+---
+:realm_id: us
+:public_addresses:
+- img1.inst0.public.com
+:state: RUNNING
+:name: "Mock Instance With Profile Change"
+:private_addresses:
+- img1.inst0.private.com
+:image_id: img1
+:instance_profile: !ruby/object:InstanceProfile
+  id: m1-large
+  memory: "12288"
+:owner_id: mockuser
+:actions:
+- :reboot
+- :stop

data/specs/data/instances/inst1.yml

@@ -4,5 +4,6 @@
 :owner_id: mockuser
 :public_addresses: [ img3.inst1.public.com ]
 :private_addresses: [ img3.inst1.private.com ]
-:flavor_id: m1-small
 :realm_id: us
+:instance_profile: !ruby/object:InstanceProfile
+  id: m1-small

data/specs/data/instances/inst2.yml

@@ -4,5 +4,6 @@
 :owner_id: anotheruser
 :public_addresses: [ img1.inst2.public.com ]
 :private_addresses: [ img1.inst2.private.com ]
-:flavor_id: m1-small
 :realm_id: us
+:instance_profile: !ruby/object:InstanceProfile
+  id: m1-large

data/specs/fixtures/images/img1.yml

@@ -1,3 +1,4 @@
 :description: Fedora 10
 :owner_id: fedoraproject
 :architecture: x86_64
+:id: img1

data/specs/fixtures/images/img2.yml

@@ -1,3 +1,4 @@
 :description: Fedora 10
 :owner_id: fedoraproject
 :architecture: i386
+:id: img2

data/specs/fixtures/images/img3.yml

@@ -1,3 +1,4 @@
 :description: JBoss
 :owner_id: mockuser
 :architecture: i386
+:id: img3

data/specs/fixtures/instances/inst0.yml

@@ -0,0 +1,16 @@
+---
+:realm_id: us
+:public_addresses:
+- img1.inst0.public.com
+:state: RUNNING
+:name: "Mock Instance With Profile Change"
+:private_addresses:
+- img1.inst0.private.com
+:image_id: img1
+:instance_profile: !ruby/object:InstanceProfile
+  id: m1-large
+  memory: "12288"
+:owner_id: mockuser
+:actions:
+- :reboot
+- :stop

data/specs/fixtures/instances/inst1.yml

@@ -4,5 +4,6 @@
 :owner_id: mockuser
 :public_addresses: [ img3.inst1.public.com ]
 :private_addresses: [ img3.inst1.private.com ]
-:flavor_id: m1-small
 :realm_id: us
+:instance_profile: !ruby/object:InstanceProfile
+  id: m1-small

data/specs/fixtures/instances/inst2.yml

@@ -4,5 +4,6 @@
 :owner_id: anotheruser
 :public_addresses: [ img1.inst2.public.com ]
 :private_addresses: [ img1.inst2.private.com ]
-:flavor_id: m1-small
 :realm_id: us
+:instance_profile: !ruby/object:InstanceProfile
+  id: m1-large

data/specs/hardware_profiles_spec.rb

@@ -0,0 +1,71 @@
+#
+# Copyright (C) 2009  Red Hat, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+require 'specs/spec_helper'
+
+def prop_check(prop, value_class)
+  if prop.present?
+    prop.value.should_not be_nil
+    prop.value.should be_a(value_class)
+  end
+end
+
+describe "hardware_profiles" do
+
+  it_should_behave_like "all resources"
+
+  it "should allow retrieval of all hardware profiles" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      hardware_profiles = client.hardware_profiles
+      hardware_profiles.should_not be_empty
+      hardware_profiles.each do |hwp|
+        hwp.uri.should_not be_nil
+        hwp.uri.should be_a(String)
+        prop_check(hwp.architecture, String)
+        prop_check(hwp.storage, Float)
+        prop_check(hwp.memory, Float)
+      end
+    end
+  end
+
+  it "should allow filtering of hardware_profiles by architecture" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      hardware_profiles = client.hardware_profiles( :architecture=>'i386' )
+      hardware_profiles.should_not be_empty
+      hardware_profiles.size.should eql( 2 )
+      hardware_profiles.first.architecture.value.should eql( 'i386' )
+    end
+  end
+
+  it "should allow fetching a hardware_profile by id" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      hwp = client.hardware_profile( 'm1-small' )
+      hwp.should_not be_nil
+      hwp.id.should eql( 'm1-small' )
+    end
+  end
+
+  it "should allow fetching a hardware_profile by URI" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      hwp = client.fetch_hardware_profile( API_URL + '/hardware_profiles/m1-small' )
+      hwp.should_not be_nil
+      hwp.id.should eql( 'm1-small' )
+    end
+  end
+
+end

data/specs/initialization_spec.rb

@@ -28,7 +28,7 @@ describe "initializing the client" do
 
   it "should discover entry points upon connection" do
     DeltaCloud.new( "name", "password", API_URL ) do |client|
-      client.entry_points[:flavors].should           eql( "#{API_URL}/flavors" )
+      client.entry_points[:hardware_profiles].should eql( "#{API_URL}/hardware_profiles" )
       client.entry_points[:images].should            eql( "#{API_URL}/images" )
       client.entry_points[:instances].should         eql( "#{API_URL}/instances" )
       client.entry_points[:storage_volumes].should   eql( "#{API_URL}/storage_volumes" )

data/specs/instances_spec.rb

@@ -33,8 +33,8 @@ describe "instances" do
         instance.owner_id.should be_a( String )
         instance.image.should_not be_nil
         instance.image.should be_a( DCloud::Image )
-        instance.flavor.should_not be_nil
-        instance.flavor.should be_a( DCloud::Flavor )
+        instance.instance_profile.should_not be_nil
+        instance.instance_profile.should be_a( DCloud::InstanceProfile )
         instance.state.should_not be_nil
         instance.state.should be_a( String )
         instance.public_addresses.should_not be_nil
@@ -60,18 +60,21 @@ describe "instances" do
 
   it "should allow retrieval of a single instance" do
     DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
-      instance = client.instance( "inst1" )
+      instance = client.instance( "inst0" )
       instance.should_not be_nil
       instance.name.should_not be_nil
-      instance.name.should eql( 'MockUserInstance' )
+      instance.name.should eql( 'Mock Instance With Profile Change' )
       instance.uri.should_not be_nil
       instance.uri.should be_a( String )
       instance.owner_id.should eql( "mockuser" )
-      instance.public_addresses.first.should eql( "img3.inst1.public.com" )
+      instance.public_addresses.first.should eql( "img1.inst0.public.com" )
       instance.image.should_not be_nil
-      instance.image.uri.should eql( API_URL + "/images/img3" )
-      instance.flavor.should_not be_nil
-      instance.flavor.uri.should eql( API_URL + "/flavors/m1-small" )
+      instance.image.uri.should eql( API_URL + "/images/img1" )
+      instance.instance_profile.should_not be_nil
+      instance.instance_profile.hardware_profile.should_not be_nil
+      instance.instance_profile.hardware_profile.uri.should eql( API_URL + "/hardware_profiles/m1-large" )
+      instance.instance_profile[:memory].should eql( "12288" )
+      instance.instance_profile[:storage].should be_nil
       instance.state.should eql( "RUNNING" )
       instance.actions.should_not be_nil
     end
@@ -85,7 +88,7 @@ describe "instances" do
       instance.id.should match( /inst[0-9]+/ )
       instance.name.should eql( 'TestInstance' )
       instance.image.id.should eql( 'img1' )
-      instance.flavor.id.should eql( 'm1-large' )
+      instance.instance_profile.id.should eql( 'm1-large' )
       instance.realm.id.should eql( 'us' )
     end
   end
@@ -97,31 +100,47 @@ describe "instances" do
       instance.uri.should match( %r{#{API_URL}/instances/inst[0-9]+} )
       instance.id.should match( /inst[0-9]+/ )
       instance.image.id.should eql( 'img1' )
-      instance.flavor.id.should eql( 'm1-large' )
+      instance.instance_profile.id.should eql( 'm1-large' )
       instance.realm.id.should eql( 'eu' )
     end
   end
 
-  it "should allow creation of new instances with specific flavor" do
+  it "should allow creation of new instances with specific hardware profile" do
     DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
-      instance = client.create_instance( 'img1', :flavor=>'m1-xlarge' )
+      instance = client.create_instance( 'img1',
+                                         :hardware_profile=>'m1-xlarge' )
       instance.should_not be_nil
       instance.uri.should match( %r{#{API_URL}/instances/inst[0-9]+} )
       instance.id.should match( /inst[0-9]+/ )
       instance.image.id.should eql( 'img1' )
-      instance.flavor.id.should eql( 'm1-xlarge' )
+      instance.instance_profile.id.should eql( 'm1-xlarge' )
       instance.realm.id.should eql( 'us' )
     end
   end
 
-  it "should allow creation of new instances with specific realm and flavor" do
+  it "should allow creation of new instances with specific hardware profile overriding memory" do
     DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
-      instance = client.create_instance( 'img1', :realm=>'eu', :flavor=>'m1-xlarge' )
+      hwp = { :id => 'm1-xlarge', :memory => 32768 }
+      instance = client.create_instance( 'img1', :hardware_profile=> hwp )
       instance.should_not be_nil
       instance.uri.should match( %r{#{API_URL}/instances/inst[0-9]+} )
       instance.id.should match( /inst[0-9]+/ )
       instance.image.id.should eql( 'img1' )
-      instance.flavor.id.should eql( 'm1-xlarge' )
+      instance.instance_profile.id.should eql( 'm1-xlarge' )
+      instance.instance_profile[:memory].should eql( "32768" )
+      instance.realm.id.should eql( 'us' )
+    end
+  end
+
+  it "should allow creation of new instances with specific realm and hardware profile" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      instance = client.create_instance( 'img1', :realm=>'eu',
+                                         :hardware_profile=>'m1-xlarge' )
+      instance.should_not be_nil
+      instance.uri.should match( %r{#{API_URL}/instances/inst[0-9]+} )
+      instance.id.should match( /inst[0-9]+/ )
+      instance.image.id.should eql( 'img1' )
+      instance.instance_profile.id.should eql( 'm1-xlarge' )
       instance.realm.id.should eql( 'eu' )
     end
   end

data/specs/spec_helper.rb

@@ -24,8 +24,8 @@ api_host = ENV['API_HOST']
 ( api_host = 'localhost' ) if api_host == ''
 
 api_port = ENV['API_PORT']
-( api_port = 3000 ) if api_port.nil?
-( api_port = 3000 ) if api_port == ''
+( api_port = 3001 ) if api_port.nil?
+( api_port = 3001 ) if api_port == ''
 
 API_HOST = api_host
 API_PORT = api_port

data/specs/storage_volume_spec.rb

@@ -46,7 +46,8 @@ describe "storage volumes" do
       storage_volume.device.should eql( '/dev/sda1' )
       storage_volume.instance.should_not be_nil
       storage_volume.instance.id.should eql( 'inst1' )
-      storage_volume.instance.flavor.architecture.should eql( 'i386' )
+      ip = storage_volume.instance.instance_profile
+      ip.hardware_profile.architecture.value.should eql( 'i386' )
     end
   end
 
@@ -62,7 +63,8 @@ describe "storage volumes" do
       storage_volume.device.should eql( '/dev/sda1' )
       storage_volume.instance.should_not be_nil
       storage_volume.instance.id.should eql( 'inst1' )
-      storage_volume.instance.flavor.architecture.should eql( 'i386' )
+      ip = storage_volume.instance.instance_profile
+      ip.hardware_profile.architecture.value.should eql( 'i386' )
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-client
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -05:00
+date: 2010-06-17 00:00:00 +02:00
 default_executable: deltacloudc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.3.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.0
+    version: 
 description: Deltacloud REST Client for API
 email: deltacloud-users@lists.fedorahosted.org
 executables: 
@@ -33,16 +43,16 @@ extra_rdoc_files:
 files: 
 - Rakefile
 - credentials.yml
-- lib/dcloud/image.rb
-- lib/dcloud/storage_snapshot.rb
-- lib/dcloud/realm.rb
+- lib/deltacloud.rb
 - lib/dcloud/base_model.rb
-- lib/dcloud/storage_volume.rb
+- lib/dcloud/hardware_profile.rb
+- lib/dcloud/image.rb
 - lib/dcloud/instance.rb
+- lib/dcloud/realm.rb
 - lib/dcloud/state.rb
-- lib/dcloud/flavor.rb
+- lib/dcloud/storage_snapshot.rb
+- lib/dcloud/storage_volume.rb
 - lib/dcloud/transition.rb
-- lib/deltacloud.rb
 - init.rb
 - bin/deltacloudc
 - COPYING
@@ -75,35 +85,37 @@ signing_key:
 specification_version: 3
 summary: Deltacloud REST Client
 test_files: 
-- specs/storage_volume_spec.rb
-- specs/realms_spec.rb
-- specs/initialization_spec.rb
-- specs/spec_helper.rb
-- specs/images_spec.rb
-- specs/instances_spec.rb
-- specs/fixtures/images/img3.yml
 - specs/fixtures/images/img1.yml
 - specs/fixtures/images/img2.yml
+- specs/fixtures/images/img3.yml
+- specs/fixtures/instances/inst1.yml
+- specs/fixtures/instances/inst2.yml
+- specs/fixtures/instances/inst0.yml
 - specs/fixtures/storage_snapshots/snap1.yml
-- specs/fixtures/storage_snapshots/snap3.yml
 - specs/fixtures/storage_snapshots/snap2.yml
+- specs/fixtures/storage_snapshots/snap3.yml
 - specs/fixtures/storage_volumes/vol1.yml
-- specs/fixtures/storage_volumes/vol3.yml
 - specs/fixtures/storage_volumes/vol2.yml
-- specs/fixtures/instances/inst1.yml
-- specs/fixtures/instances/inst2.yml
+- specs/fixtures/storage_volumes/vol3.yml
+- specs/spec_helper.rb
+- specs/images_spec.rb
+- specs/initialization_spec.rb
 - specs/instance_states_spec.rb
-- specs/flavors_spec.rb
-- specs/data/images/img3.yml
+- specs/instances_spec.rb
+- specs/realms_spec.rb
+- specs/shared/resources.rb
+- specs/storage_snapshot_spec.rb
+- specs/storage_volume_spec.rb
+- specs/hardware_profiles_spec.rb
 - specs/data/images/img1.yml
 - specs/data/images/img2.yml
+- specs/data/images/img3.yml
+- specs/data/instances/inst1.yml
+- specs/data/instances/inst2.yml
+- specs/data/instances/inst0.yml
 - specs/data/storage_snapshots/snap1.yml
-- specs/data/storage_snapshots/snap3.yml
 - specs/data/storage_snapshots/snap2.yml
+- specs/data/storage_snapshots/snap3.yml
 - specs/data/storage_volumes/vol1.yml
-- specs/data/storage_volumes/vol3.yml
 - specs/data/storage_volumes/vol2.yml
-- specs/data/instances/inst1.yml
-- specs/data/instances/inst2.yml
-- specs/storage_snapshot_spec.rb
-- specs/shared/resources.rb
+- specs/data/storage_volumes/vol3.yml

data/lib/dcloud/flavor.rb

@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2009  Red Hat, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-require 'dcloud/base_model'
-
-module DCloud
-    class Flavor < BaseModel
-
-      xml_tag_name :flavor
-
-      attribute :memory
-      attribute :storage
-      attribute :architecture
-
-      def initialize(client, uri, xml=nil)
-        super( client, uri, xml )
-      end
-
-      def load_payload(xml=nil)
-        super(xml)
-        unless xml.nil?
-          @memory = xml.text( 'memory' ).to_f
-          @storage = xml.text( 'storage' ).to_f
-          @architecture = xml.text( 'architecture' )
-        end
-      end
-
-      def to_plain
-        sprintf("%-15s | %-6s | %10s GB | %10s GB", self.id[0, 15], self.architecture[0,6],
-          self.memory.to_s[0,10], self.storage.to_s[0,10])
-      end
-
-    end
-end

data/specs/flavors_spec.rb

@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2009  Red Hat, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-require 'specs/spec_helper'
-
-describe "flavors" do
-
-  it_should_behave_like "all resources"
-
-  it "should allow retrieval of all flavors" do
-    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
-      flavors = client.flavors
-      flavors.should_not be_empty
-      flavors.each do |flavor|
-        flavor.uri.should_not be_nil
-        flavor.uri.should be_a(String)
-        flavor.architecture.should_not be_nil
-        flavor.architecture.should be_a(String)
-        flavor.storage.should_not be_nil
-        flavor.storage.should be_a(Float)
-        flavor.memory.should_not be_nil
-        flavor.memory.should be_a(Float)
-      end
-    end
-  end
-
-  it "should allow filtering of flavors by architecture" do
-    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
-      flavors = client.flavors( :architecture=>'i386' )
-      flavors.should_not be_empty
-      flavors.size.should eql( 1 )
-      flavors.first.architecture.should eql( 'i386' )
-    end
-  end
-
-  it "should allow fetching a flavor by id" do
-    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
-      flavor = client.flavor( 'm1-small' )
-      flavor.should_not be_nil
-      flavor.id.should eql( 'm1-small' )
-    end
-  end
-
-  it "should allow fetching a flavor by URI" do
-    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
-      flavor = client.fetch_flavor( API_URL + '/flavors/m1-small' )
-      flavor.should_not be_nil
-      flavor.id.should eql( 'm1-small' )
-    end
-  end
-
-end