deltacloud-core 1.1.2 → 1.1.3

data/lib/cimi/helpers/database_helper.rb

@@ -25,8 +25,7 @@ module Deltacloud
         "volume_configuration", "volume_template" ]
 
      def provides?(entity)
-       return true if DATABASE_COLLECTIONS.include? entity
-       return false
+       DATABASE_COLLECTIONS.include? entity.to_s
      end
 
       def current_provider

data/lib/cimi/models.rb

@@ -37,15 +37,6 @@ end
 
 require 'require_relative' if RUBY_VERSION < '1.9'
 
-# Database entities
-#
-require_relative './../db/provider'
-require_relative './../db/entity'
-require_relative './../db/machine_template'
-require_relative './../db/address_template'
-require_relative './../db/volume_configuration'
-require_relative './../db/volume_template'
-
 require_relative './models/schema'
 require_relative './models/resource'
 require_relative './models/collection'
@@ -65,6 +56,7 @@ require_relative './models/credential_template'
 require_relative './models/credential_create'
 require_relative './models/volume'
 require_relative './models/volume_configuration'
+require_relative './models/volume_configuration_create'
 require_relative './models/volume_image'
 require_relative './models/volume_template'
 require_relative './models/volume_create'
@@ -88,7 +80,16 @@ require_relative './models/address_template_create'
 require_relative './models/address_create'
 require_relative './models/forwarding_group'
 require_relative './models/forwarding_group_template'
-require_relative './models/system_template'
-require_relative './models/system'
 require_relative './models/network_template'
 require_relative './models/network_create'
+require_relative './models/system_template'
+require_relative './models/system_network_port'
+require_relative './models/system_network'
+require_relative './models/system_address'
+require_relative './models/system_forwarding_group'
+require_relative './models/system_machine'
+require_relative './models/system_volume'
+require_relative './models/system_credential'
+require_relative './models/system_system'
+require_relative './models/system'
+require_relative './models/system_create'

data/lib/cimi/models/action.rb

@@ -17,8 +17,4 @@ class CIMI::Model::Action < CIMI::Model::Base
 
   text :action
 
-  def name
-    action.split('/').last.strip.intern
-  end
-
 end

data/lib/cimi/models/address.rb

@@ -39,42 +39,4 @@ class CIMI::Model::Address < CIMI::Model::Base
     scalar :rel, :href
   end
 
-  def self.find(id, context)
-    if id==:all
-      addresses = context.driver.addresses(context.credentials)
-      addresses.map{|addr| from_address(addr, context)}
-    else
-      address = context.driver.address(context.credentials, {:id=>id})
-      from_address(address, context)
-    end
-  end
-
-  def self.delete!(id, context)
-    context.driver.delete_address(context.credentials, id)
-    new(:id => id).destroy
-  end
-
-  private
-
-  def self.from_address(address, context)
-    self.new(
-      :name => address.id,
-      :id => context.address_url(address.id),
-      :description => "Address #{address.id}",
-      :ip => address.id,
-      :allocation => "dynamic",
-      :default_gateway => "unknown",
-      :dns => "unknown",
-      :protocol => protocol_from_address(address.id),
-      :mask => "unknown",
-      :resource => (address.instance_id) ? {:href=> context.machine_url(address.instance_id)} : nil,
-      :network => nil
-    )
-  end
-
-  def self.protocol_from_address(address)
-    addr = IPAddr.new(address)
-    addr.ipv4? ? "ipv4" : "ipv6"
-  end
-
 end

data/lib/cimi/models/address_create.rb

@@ -17,35 +17,4 @@ class CIMI::Model::AddressCreate < CIMI::Model::Base
 
   ref :address_template, :required => true
 
-  def create(context)
-    validate!
-
-    if address_template.href?
-      template = address_template.find(context)
-    end
-
-    params = {
-      :name => name,
-      :description => description,
-      :address_template => template,
-      :env => context # FIXME: We should not pass the context to the driver (!)
-    }
-
-    unless context.driver.respond_to? :create_address
-       raise Deltacloud::Exceptions.exception_from_status(
-         501,
-         "Creating Address is not supported by the current driver"
-       )
-    end
-
-    address = context.driver.create_address(context.credentials, params)
-
-    result = CIMI::Model::Address.from_address(address, context)
-    result.name = name if name
-    result.description = description if description
-    result.property = property if property
-    result.save
-    result
-  end
-
 end

data/lib/cimi/models/address_template.rb

@@ -24,51 +24,4 @@ class CIMI::Model::AddressTemplate < CIMI::Model::Base
   array :operations do
     scalar :rel, :href
   end
-
-  def self.find(id, context)
-    if id==:all
-      if context.driver.respond_to? :address_templates
-        context.driver.address_templates(context.credentials, {:env=>context})
-      else
-        current_db.address_templates.map { |t| from_db(t, context) }
-      end
-    else
-      if context.driver.respond_to? :address_templates
-        context.driver.address_templates(context.credentials, {:id=>id, :env=>context})
-      else
-        template = current_db.address_templates_dataset.first(:id => id)
-        raise CIMI::Model::NotFound unless template
-        from_db(template, context)
-      end
-    end
-  end
-
-  def self.delete!(id, context)
-    current_db.address_templates.first(:id => id).destroy
-  end
-
-  private
-
-  def self.from_db(model, context)
-    self.new(
-      :id => context.address_template_url(model.id),
-      :name => model.name,
-      :description => model.description,
-      :ip => model.ip,
-      :hostname => model.hostname,
-      :allocation => model.allocation,
-      :default_gateway => model.default_gateway,
-      :dns => model.dns,
-      :protocol => model.protocol,
-      :mask => model.mask,
-      :property => (model.ent_properties ? JSON::parse(model.ent_properties) :  nil),
-      :operations => [
-        {
-          :href => context.destroy_address_template_url(model.id),
-          :rel => 'http://schemas.dmtf.org/cimi/1/action/delete'
-        }
-      ]
-    )
-  end
-
 end

data/lib/cimi/models/address_template_create.rb

@@ -25,20 +25,4 @@ class CIMI::Model::AddressTemplateCreate < CIMI::Model::Base
 
   href :network
 
-  def create(context)
-    validate!
-    new_template = context.current_db.add_address_template(
-      :name => name,
-      :description => description,
-      :hostname => hostname,
-      :ip => ip,
-      :allocation => allocation,
-      :default_gateway => default_gateway,
-      :dns => dns,
-      :protocol => protocol,
-      :mask => mask,
-      :ent_properties => property.to_json
-    )
-    CIMI::Model::AddressTemplate.from_db(new_template, context)
-  end
 end

data/lib/cimi/models/base.rb

@@ -15,8 +15,6 @@
 
 require 'xmlsimple'
 
-require_relative '../helpers/database_helper'
-
 # The base class for any CIMI object that we either read from a request or
 # write as a response. This class handles serializing/deserializing XML and
 # JSON into a common form.
@@ -109,86 +107,16 @@ module CIMI::Model
 
   class Base < Resource
 
-    # Extend the base model with database methods
-    extend Deltacloud::Helpers::Database
-
     # Extend the base model with the collection handling methods
     extend CIMI::Model::CollectionMethods
 
     # Include methods needed to handle the $select query parameter
     include CIMI::Helpers::SelectBaseMethods
+
     #
     # Common attributes for all resources
     #
     text :id, :name, :description, :created, :updated
-    hash :property
-
-    def initialize(values = {})
-      super(values)
-      retrieve_entity
-    end
-
-    def []=(a, v)
-      v = super
-      retrieve_entity if a == :id
-      v
-    end
-
-    # Save the common attributes name, description, and properties to the
-    # database
-    def save
-      if @entity
-        @entity.name = name
-        @entity.description = description
-        @entity.properties = property
-        @entity.save
-      end
-      self
-    end
-
-    # Destroy the database attributes for this model
-    def destroy
-      @entity.destroy
-      self
-    end
-
-    # FIXME: Kludge around the fact that we do not have proper *Create
-    # objects that deserialize properties by themselves
-    def extract_properties!(data)
-      h = {}
-      if data['property']
-        # Data came from XML
-        h = data['property'].inject({}) do |r,v|
-          r[v['key']] = v['content']
-          r
-        end
-      elsif data['properties']
-        h = data['properties']
-      end
-      property ||= {}
-      property.merge!(h)
-    end
-
-    def ref_id(ref_url)
-      ref_url.split('/').last if ref_url
-    end
-
-    private
-
-    # Load an existing database entity for this object, or create a new one
-    def retrieve_entity
-      if self.id
-        @entity = Deltacloud::Database::Entity::retrieve(self)
-        if @entity.exists?
-          self.name = @entity.name
-          self.description = @entity.description
-          self.property ||= {}
-          self.property.merge!(@entity.properties)
-        end
-      else
-        @entity = nil
-      end
-    end
-
+    hash_map :property
   end
 end

data/lib/cimi/models/cloud_entry_point.rb

@@ -15,8 +15,8 @@
 
 class CIMI::Model::CloudEntryPoint < CIMI::Model::Base
 
-  resource_attr :driver, :required => true
-  resource_attr :provider, :required => true
+  text :driver, :required => true
+  text :provider, :required => true
 
   # All possible CIMI collections, in the order in which they should appear
   # in the CEP
@@ -37,34 +37,6 @@ class CIMI::Model::CloudEntryPoint < CIMI::Model::Base
     href coll.underscore
   end
 
-  def self.create(context)
-    self.new(entities(context).merge({
-      :name => context.driver.name,
-      :description => "Cloud Entry Point for the Deltacloud #{context.driver.name} driver",
-      :driver => context.driver.name,
-      :provider => context.current_provider,
-      :id => context.cloudEntryPoint_url,
-      :base_uri => context.base_uri + "/",
-      :created => Time.now.xmlschema
-    }))
-  end
-
-  # Return an Hash of the CIMI root entities used in CloudEntryPoint
-  def self.entities(context)
-    CIMI::Collections.modules(:cimi).inject({}) do |supported_entities, m|
-      m.collections.each do |c|
-        index_operation_capability = c.operation(:index).required_capability
-        next if m.settings.respond_to?(:capability) and !m.settings.capability(index_operation_capability)
-        supported_entities[c.collection_name.to_s] = { :href => context.send(:"#{c.collection_name}_url") }
-      end
-      supported_entities
-    end
-  end
-
-  def entities
-    @attribute_values.clone.delete_if { |key, value| !value.respond_to? :href }
-  end
-
   private
 
   def self.href_defined?(resource)

data/lib/cimi/models/collection.rb

@@ -120,32 +120,15 @@ module CIMI::Model
     end
 
     # Return a collection of entities
-    def list(context)
-      entries = find(:all, context)
-      desc = "#{self.name.split("::").last} Collection for the #{context.driver.name.capitalize} driver"
-      acts_as_root_entity unless collection_class
-      id = context.send("#{collection_class.entry_name}_url")
-      ops = []
-      cimi_entity = collection_class.entry_name.to_s.singularize
-      cimi_create = "create_#{cimi_entity}_url"
-      dcloud_create = context.deltacloud_create_method_for(cimi_entity)
-      if(context.respond_to?(cimi_create) &&
-         context.driver.respond_to?(dcloud_create)) ||
-      provides?(cimi_entity)
-        url = context.send(cimi_create)
-        ops << { :rel => "add", :href => url }
+    def list(id, entries, params = {})
+      params[:id] = id
+      params[:entries] = entries
+      params[:count] = params[:entries].size
+      if params[:add_url]
+        params[:operations] ||= []
+        params[:operations] << { :rel => "add", :href => params.delete(:add_url) }
       end
-      collection_class.new(:id => id,
-                           :count => entries.size,
-                           :entries => entries,
-                           :operations => ops,
-                           :description => desc)
+      collection_class.new(params)
     end
-
-    def all(context)
-      find :all, context
-    end
-
   end
-
 end

data/lib/cimi/models/credential.rb

@@ -25,38 +25,4 @@ class CIMI::Model::Credential < CIMI::Model::Base
     scalar :rel, :href
   end
 
-  def self.find(id, context)
-    if id == :all
-      return [] unless context.driver.respond_to?(:keys)
-      keys = context.driver.keys(context.credentials)
-      keys.map { |key| from_key(key, context) }
-    else
-      key = context.driver.key(context.credentials, :id => id)
-      from_key(key, context)
-    end
-  end
-
-  def self.create_from_xml(body, context)
-    credential = Credential.from_xml(body)
-    key = context.driver.create_key(context.credentials, :key_name => credential.name)
-    from_key(key, context)
-  end
-
-  def self.delete!(id, context)
-    context.driver.destroy_key(context.credentials, :id => id)
-  end
-
-  private
-
-  def self.from_key(key, context)
-    self.new(
-      :name => key.id,
-      :username => key.username,
-      :password => key.is_password? ? key.password : key.fingerprint,
-      :key => key.is_key? ? key.pem_rsa_key : nil,
-      :id => context.credential_url(key.id),
-      :created => Time.now.xmlschema
-    )
-  end
-
 end

data/lib/cimi/models/credential_create.rb

@@ -17,30 +17,4 @@ class CIMI::Model::CredentialCreate < CIMI::Model::Base
 
   ref :credential_template, :required => true
 
-  def create(context)
-    validate!
-
-    unless context.driver.respond_to? :create_key
-       raise Deltacloud::Exceptions.exception_from_status(
-         501,
-         "Creating Credential is not supported by the current driver"
-       )
-    end
-
-    if credential_template.href?
-      template = credential_template.find(ctx)
-    else
-      template = credential_template
-    end
-
-    key = context.driver.create_key(context.credentials, :key_name => name)
-
-    result = CIMI::Model::Credential.from_key(key, context)
-    result.name = name if name
-    result.description = description if description
-    result.property = property if property
-    result.save
-    result
-
-  end
 end