deltacloud-core 1.1.1 → 1.1.2

data/lib/deltacloud/models/image.rb

@@ -14,37 +14,38 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+module Deltacloud
+  class Image < BaseModel
 
-class Image < BaseModel
+    attr_accessor :name
+    attr_accessor :owner_id
+    attr_accessor :description
+    attr_accessor :architecture
+    attr_accessor :state
+    attr_accessor :hardware_profiles
+    attr_accessor :creation_time
+    attr_accessor :root_type
 
-  attr_accessor :name
-  attr_accessor :owner_id
-  attr_accessor :description
-  attr_accessor :architecture
-  attr_accessor :state
-  attr_accessor :hardware_profiles
-  attr_accessor :creation_time
-  attr_accessor :root_type
+    def root_type
+      @root_type || 'transient'
+    end
 
-  def root_type
-    @root_type || 'transient'
-  end
-
-  def to_hash(context)
-    {
-      :id => self.id,
-      :href => context.image_url(self.id),
-      :name => name,
-      :description => description,
-      :owner => owner_id,
-      :architecture => architecture,
-      :state => state,
-      :root_type => root_type,
-      :creation_time => creation_time,
-      :hardware_profiles => hardware_profiles.map { |p|
-        { :id => p.id, :href => context.hardware_profile_url(p.id), :rel => :hardware_profile }
+    def to_hash(context)
+      {
+        :id => self.id,
+        :href => context.image_url(self.id),
+        :name => name,
+        :description => description,
+        :owner => owner_id,
+        :architecture => architecture,
+        :state => state,
+        :root_type => root_type,
+        :creation_time => creation_time,
+        :hardware_profiles => hardware_profiles.map { |p|
+          { :id => p.id, :href => context.hardware_profile_url(p.id), :rel => :hardware_profile }
+        }
       }
-    }
-  end
+    end
 
+  end
 end

data/lib/deltacloud/models/instance.rb

@@ -14,111 +14,109 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-require 'timeout'
+module Deltacloud
+  class Instance < BaseModel
 
-class Instance < BaseModel
+    attr_accessor :owner_id
+    attr_accessor :image_id
+    attr_accessor :name
+    attr_accessor :realm_id
+    attr_accessor :state
+    attr_accessor :actions
+    attr_accessor :public_addresses
+    attr_accessor :private_addresses
+    attr_accessor :instance_profile
+    attr_accessor :launch_time
+    attr_accessor :keyname
+    attr_accessor :authn_error
+    attr_accessor :username
+    attr_accessor :password
+    attr_accessor :create_image
+    attr_accessor :firewalls
+    attr_accessor :storage_volumes
 
-  include Timeout
-
-  attr_accessor :owner_id
-  attr_accessor :image_id
-  attr_accessor :name
-  attr_accessor :realm_id
-  attr_accessor :state
-  attr_accessor :actions
-  attr_accessor :public_addresses
-  attr_accessor :private_addresses
-  attr_accessor :instance_profile
-  attr_accessor :launch_time
-  attr_accessor :keyname
-  attr_accessor :authn_error
-  attr_accessor :username
-  attr_accessor :password
-  attr_accessor :create_image
-  attr_accessor :firewalls
-  attr_accessor :storage_volumes
-
-  def to_hash(context)
-    r = {
-      :id => self.id,
-      :href => context.instance_url(self.id),
-      :name => name,
-      :state => state,
-      :owner => owner_id,
-      :image => { :href => context.image_url(image_id), :id => image_id, :rel => :image },
-      :realm => { :href => context.realm_url(realm_id), :id => realm_id, :rel => :realm },
-      :actions => actions.compact.map { |a|
-        {
-          :href => context.send("#{a}_instance_url", self.id),
-          :rel => "#{a}",
-          :method => context.instance_action_method(a)
-        }
-      },
-      :hardware_profile => {
-        :id => instance_profile.id,
-        :href => context.hardware_profile_url(instance_profile.id),
-        :rel => :hardware_profile,
-        :properties => instance_profile.overrides
-      },
-      :public_addresses => public_addresses.map { |addr| addr.to_hash(context) },
-      :private_addresses => private_addresses.map { |addr| addr.to_hash(context) }
-    }
-    if context.driver.respond_to? :run_on_instance
-      r[:actions] << { :href => "#{context.run_instance_url(self.id)};id=#{self.id}", :rel => 'run', :method => 'post'}
-    end
-    if can_create_image?
-      r[:actions] << { :href => "#{context.create_image_url};instance_id=#{self.id}", :rel => 'create_image', :method => 'post'}
-    end
-    r.merge!(:create_time => launch_time) if launch_time
-    r.merge!(:create_image => create_image) if create_image
-    r.merge!(:firewalls => firewalls.map { |f| { :id => f, :href => context.firewall_url(f), :rel => :firewall }}) if firewalls
-    if storage_volumes
-      r.merge!(:storage_volumes => storage_volumes.map { |v| { :id => v.keys.first, :href => context.storage_volume_url(v.keys.first), :rel => :storage_volume }})
-    end
-    if context.driver.class.has_feature?(:instances, :authentication_key)
-      r.merge!(:authentication_type => 'key' )
-      r.merge!(:authentication => { :keyname => keyname }) if keyname
+    def to_hash(context)
+      r = {
+        :id => self.id,
+        :href => context.instance_url(self.id),
+        :name => name,
+        :state => state,
+        :owner => owner_id,
+        :image => { :href => context.image_url(image_id), :id => image_id, :rel => :image },
+        :realm => { :href => context.realm_url(realm_id), :id => realm_id, :rel => :realm },
+        :actions => actions.compact.map { |a|
+          {
+            :href => context.send("#{a}_instance_url", self.id),
+            :rel => "#{a}",
+            :method => context.instance_action_method(a)
+          }
+        },
+        :hardware_profile => {
+          :id => instance_profile.id,
+          :href => context.hardware_profile_url(instance_profile.id),
+          :rel => :hardware_profile,
+          :properties => instance_profile.overrides
+        },
+        :public_addresses => public_addresses.map { |addr| addr.to_hash(context) },
+        :private_addresses => private_addresses.map { |addr| addr.to_hash(context) }
+      }
+      if context.driver.respond_to? :run_on_instance
+        r[:actions] << { :href => "#{context.run_instance_url(self.id)};id=#{self.id}", :rel => 'run', :method => 'post'}
+      end
+      if can_create_image?
+        r[:actions] << { :href => "#{context.create_image_url};instance_id=#{self.id}", :rel => 'create_image', :method => 'post'}
+      end
+      r.merge!(:create_time => launch_time) if launch_time
+      r.merge!(:create_image => create_image) if create_image
+      r.merge!(:firewalls => firewalls.map { |f| { :id => f, :href => context.firewall_url(f), :rel => :firewall }}) if firewalls
+      if storage_volumes
+        r.merge!(:storage_volumes => storage_volumes.map { |v| { :id => v.keys.first, :href => context.storage_volume_url(v.keys.first), :rel => :storage_volume }})
+      end
+      if context.driver.class.has_feature?(:instances, :authentication_key)
+        r.merge!(:authentication_type => 'key' )
+        r.merge!(:authentication => { :keyname => keyname }) if keyname
+      end
+      if context.driver.class.has_feature?(:instances, :authentication_password)
+        r[:authentication] && username ? r[:authentication].merge!({ :user => username, :password => password }) :
+                (username ? r.merge!(:authentication => { :user => username, :password => password }) : nil)
+      end
+      r
     end
-    if context.driver.class.has_feature?(:instances, :authentication_password)
-      r[:authentication] && username ? r[:authentication].merge!({ :user => username, :password => password }) :
-              (username ? r.merge!(:authentication => { :user => username, :password => password }) : nil)
+
+    def storage_volumes
+      @storage_volumes || []
     end
-    r
-  end
 
-  def storage_volumes
-    @storage_volumes || []
-  end
+    def can_create_image?
+      self.create_image
+    end
 
-  def can_create_image?
-    self.create_image
-  end
+    def hardware_profile
+      instance_profile
+    end
 
-  def hardware_profile
-    instance_profile
-  end
+    def hardware_profile=(profile)
+      @instance_profile = profile
+    end
 
-  def hardware_profile=(profile)
-    @instance_profile = profile
-  end
+    def initialize(init=nil)
+      super(init)
+      self.actions = [] if self.actions.nil?
+      self.public_addresses = [] if self.public_addresses.nil?
+      self.private_addresses = [] if self.private_addresses.nil?
+    end
 
-  def initialize(init=nil)
-    super(init)
-    self.actions = [] if self.actions.nil?
-    self.public_addresses = [] if self.public_addresses.nil?
-    self.private_addresses = [] if self.private_addresses.nil?
-  end
+    def method_missing(name, *args)
+      if name.to_s =~ /is_(\w+)\?/
+        self.state.downcase.eql?($1)
+      else
+        raise NoMethodError.new(name.to_s)
+      end
+    end
 
-  def method_missing(name, *args)
-    if name.to_s =~ /is_(\w+)\?/
-      self.state.downcase.eql?($1)
-    else
-      raise NoMethodError.new(name.to_s)
+    def authn_feature_failed?
+      return true unless authn_error.nil?
     end
-  end
 
-  def authn_feature_failed?
-    return true unless authn_error.nil?
   end
-
 end

data/lib/deltacloud/models/instance_address.rb

@@ -16,54 +16,56 @@
 # Model to store the hardware profile applied to an instance together with
 # any instance-specific overrides
 
-class InstanceAddress
-  attr_accessor :address
-  attr_accessor :port
-  attr_accessor :address_type
+module Deltacloud
+  class InstanceAddress
+    attr_accessor :address
+    attr_accessor :port
+    attr_accessor :address_type
 
-  def initialize(address, opts={})
-    self.address = address
-    self.port = opts[:port] if opts[:port]
-    self.address_type = opts[:type] || :ipv4
-    self
-  end
+    def initialize(address, opts={})
+      self.address = address
+      self.port = opts[:port] if opts[:port]
+      self.address_type = opts[:type] || :ipv4
+      self
+    end
 
-  def address_type
-    (address and !address.strip.empty?) ? @address_type : :unavailable
-  end
+    def address_type
+      (address and !address.strip.empty?) ? @address_type : :unavailable
+    end
 
-  def to_s
-    return ['VNC', address, port].join(':') if is_vnc?
-    address
-  end
+    def to_s
+      return ['VNC', address, port].join(':') if is_vnc?
+      address
+    end
 
-  def to_hash(context)
-    r = {
-      :address => address,
-      :type => address_type
-    }
-    r.merge!(:port => port) if !port.nil?
-    r
-  end
+    def to_hash(context)
+      r = {
+        :address => address,
+        :type => address_type
+      }
+      r.merge!(:port => port) if !port.nil?
+      r
+    end
 
-  def is_mac?
-    address_type == :mac
-  end
+    def is_mac?
+      address_type == :mac
+    end
 
-  def is_ipv4?
-    address_type == :ipv4
-  end
+    def is_ipv4?
+      address_type == :ipv4
+    end
 
-  def is_ipv6?
-    address_type == :ipv6
-  end
+    def is_ipv6?
+      address_type == :ipv6
+    end
 
-  def is_hostname?
-    address_type == :hostname
-  end
+    def is_hostname?
+      address_type == :hostname
+    end
 
-  def is_vnc?
-    address_type == :vnc
-  end
+    def is_vnc?
+      address_type == :vnc
+    end
 
+  end
 end

data/lib/deltacloud/models/instance_profile.rb

@@ -17,39 +17,41 @@
 # 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
-  attr_accessor :architecture
-  attr_accessor :cpu
+module Deltacloud
+  class InstanceProfile < BaseModel
+    attr_accessor :memory
+    attr_accessor :storage
+    attr_accessor :architecture
+    attr_accessor :cpu
 
-  def initialize(hwp_name, args = {})
-    opts = args.inject({ :id => hwp_name.to_s }) do |m, e|
-      k, v = e
-      m[$1] = v if k.to_s =~ /^hwp_(.*)$/
-      m
+    def initialize(hwp_name, args = {})
+      opts = args.inject({ :id => hwp_name.to_s }) do |m, e|
+        k, v = e
+        m[$1] = v if k.to_s =~ /^hwp_(.*)$/
+        m
+      end
+      super(opts)
     end
-    super(opts)
-  end
 
-  def name
-    id
-  end
+    def name
+      id
+    end
 
-  def to_s
-    name
-  end
+    def to_s
+      name
+    end
 
-  def override?(property)
-    overrides.find { |p, v| p == property }
-  end
+    def override?(property)
+      overrides.find { |p, v| p == property }
+    end
 
-  def overrides
-    [:memory, :storage, :architecture, :cpu].inject({}) do |h, p|
-      if v = instance_variable_get("@#{p}")
-        h[p] = v
+    def overrides
+      [:memory, :storage, :architecture, :cpu].inject({}) do |h, p|
+        if v = instance_variable_get("@#{p}")
+          h[p] = v
+        end
+        h
       end
-      h
     end
   end
 end

data/lib/deltacloud/models/key.rb

@@ -14,57 +14,59 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-class Key < BaseModel
+module Deltacloud
+  class Key < BaseModel
 
-  attr_accessor :credential_type
-  attr_accessor :fingerprint
-  attr_accessor :username
-  attr_accessor :password
-  attr_accessor :pem_rsa_key
-  attr_accessor :state
+    attr_accessor :credential_type
+    attr_accessor :fingerprint
+    attr_accessor :username
+    attr_accessor :password
+    attr_accessor :pem_rsa_key
+    attr_accessor :state
 
-  def name
-    @name || @id
-  end
+    def name
+      super || @id
+    end
 
-  def is_password?
-    @credential_type.eql?(:password)
-  end
+    def is_password?
+      @credential_type.eql?(:password)
+    end
 
-  def is_key?
-    @credential_type.eql?(:key)
-  end
+    def is_key?
+      @credential_type.eql?(:key)
+    end
 
-  # Mock fingerprint generator
-  # 1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:6f
-  def self.generate_mock_fingerprint
-    (0..19).map { "%02x" % (rand * 0xff) }.join(':')
-  end
+    # Mock fingerprint generator
+    # 1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:6f
+    def self.generate_mock_fingerprint
+      (0..19).map { "%02x" % (rand * 0xff) }.join(':')
+    end
 
-  # Mock PEM file
-  # NOTE: This is a fake PEM file, it will not work against SSH
-  def self.generate_mock_pem
-    chars = (('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a + %w(= / + ))
-    pem_material = (1..21).map do
-      (1..75).collect{|a| chars[rand(chars.size)] }.join
-    end.join("\n") + "\n" + (1..68).collect{|a| chars[rand(chars.size)] }.join
-    "-----BEGIN RSA PRIVATE KEY-----\n"+pem_material+"-----END RSA PRIVATE KEY-----"
-  end
+    # Mock PEM file
+    # NOTE: This is a fake PEM file, it will not work against SSH
+    def self.generate_mock_pem
+      chars = (('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a + %w(= / + ))
+      pem_material = (1..21).map do
+        (1..75).collect{|a| chars[rand(chars.size)] }.join
+      end.join("\n") + "\n" + (1..68).collect{|a| chars[rand(chars.size)] }.join
+      "-----BEGIN RSA PRIVATE KEY-----\n"+pem_material+"-----END RSA PRIVATE KEY-----"
+    end
 
-  def to_hash(context)
-    r = {
-      :id => self.id,
-      :href => context.key_url(self.id),
-      :credential_type => credential_type,
-      :username => username,
-      :password => password,
-      :state => state
-    }
-    r[:pem_rsa_key] = pem_rsa_key if pem_rsa_key
-    r[:fingerprint] = fingerprint if fingerprint
-    r[:username] = username if username
-    r[:password] = password if password
-    r
-  end
+    def to_hash(context)
+      r = {
+        :id => self.id,
+        :href => context.key_url(self.id),
+        :credential_type => credential_type,
+        :username => username,
+        :password => password,
+        :state => state
+      }
+      r[:pem_rsa_key] = pem_rsa_key if pem_rsa_key
+      r[:fingerprint] = fingerprint if fingerprint
+      r[:username] = username if username
+      r[:password] = password if password
+      r
+    end
 
+  end
 end