deltacloud-core 1.0.3 → 1.0.4

data/lib/cimi/collections/volume_configurations.rb

@@ -24,7 +24,7 @@ module CIMI::Collections
         description "Get list all VolumeConfigurations"
         param :CIMISelect,  :string,  :optional
         control do
-          volume_configuration = VolumeConfigurationCollection.default(self).filter_by(params[:CIMISelect])
+          volume_configuration = VolumeConfiguration.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
             format.xml { volume_configuration.to_xml }
             format.json { volume_configuration.to_json }

data/lib/cimi/collections/volume_images.rb

@@ -25,7 +25,7 @@ module CIMI::Collections
         description "List all volumes images"
         param :CIMISelect,  :string,  :optional
         control do
-          volume_images = VolumeImageCollection.default(self).filter_by(params[:CIMISelect])
+          volume_images = VolumeImage.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
             format.xml { volume_images.to_xml }
             format.json { volume_images.to_json }

data/lib/cimi/collections/volumes.rb

@@ -24,7 +24,7 @@ module CIMI::Collections
         description "List all volumes"
         param :CIMISelect,  :string,  :optional
         control do
-          volumes = VolumeCollection.default(self).filter_by(params[:CIMISelect])
+          volumes = Volume.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
             format.xml { volumes.to_xml }
             format.json { volumes.to_json }
@@ -67,7 +67,6 @@ module CIMI::Collections
 
       operation :destroy do
         description "Delete a specified Volume"
-        param :id, :string, :required
         control do
           Volume.delete!(params[:id], self)
           no_content_with_status(200)

data/lib/cimi/dependencies.rb

@@ -60,4 +60,4 @@ require 'sinatra/rack_matrix_params'
 require 'sinatra/rack_syslog'
 require 'sinatra/sinatra_verbose'
 
-CMWG_NAMESPACE = "http://www.dmtf.org/cimi"
+CMWG_NAMESPACE = "http://schemas.dmtf.org/cimi/1"

data/lib/cimi/helpers.rb

@@ -13,104 +13,23 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-module Deltacloud; end
-module CIMI; end
-
 require_relative '../deltacloud/drivers/features'
 
-# Declare namespace for CIMI models
-#
-
 module CIMI
   module Model; end
-
   class FakeCollection
     extend Sinatra::Rabbit::Features
     include Deltacloud::Features
   end
 end
 
+# Declare namespace for CIMI models
+#
+
 require_relative '../deltacloud/drivers'
 require_relative '../deltacloud/models'
 require_relative '../deltacloud/helpers/driver_helper'
 require_relative '../deltacloud/helpers/auth_helper'
-require_relative '../deltacloud/helpers/url_helper'
 require_relative '../deltacloud/helpers/deltacloud_helper'
 require_relative '../deltacloud/helpers/rabbit_helper'
 require_relative './helpers/cimi_helper'
-require_relative './models'
-
-module CIMI::Collections
-  class Base < Sinatra::Base
-
-    include Sinatra::Rabbit
-    extend Deltacloud::Helpers::Drivers
-    include Sinatra::Rabbit::Features
-    include CIMI::Model
-
-    helpers Deltacloud::Helpers::Drivers
-    helpers Sinatra::AuthHelper
-    helpers Sinatra::UrlForHelper
-    helpers Rack::RespondTo::Helpers
-    helpers Deltacloud::Helpers::Application
-    helpers CIMIHelper
-
-    register Rack::RespondTo
-
-    enable :xhtml
-    enable :dump_errors
-    enable :show_errors
-    disable :show_exceptions
-
-    set :config, Deltacloud[:cimi]
-    set :root_url, config.root_url
-    set :root_path, config.root_url
-    set :version, config.version
-    set :root, File.join(File.dirname(__FILE__), '..', '..')
-    set :views, root + '/views/cimi'
-    set :public_folder, root + '/public'
-
-    Sinatra::Rabbit.set :root_path, "#{config.root_url}/"
-
-    error do
-      report_error
-    end
-
-    error Deltacloud::ExceptionHandler::ValidationFailure do
-      report_error
-    end
-
-    before do
-      # Respond with 400, If we don't get a http Host header,
-      halt 400, "Unable to find HTTP Host header" if @env['HTTP_HOST'] == nil
-    end
-
-    after do
-      headers 'CIMI-Specification-Version' => Deltacloud[:cimi].version
-    end
-
-    def self.new_route_for(route, &block)
-      get route_for('/' + route.to_s + '/new') do
-        instance_eval(&block) if block_given?
-        respond_to do |format|
-          format.html do
-            haml :"#{route}/new"
-          end
-        end
-      end
-    end
-
-    def self.check_capability(opts={})
-      Sinatra::Rabbit.set :check_capability, opts[:for]
-    end
-
-    def self.check_features(opts={})
-      Sinatra::Rabbit.set :check_features, opts[:for]
-    end
-
-    def self.route_for(url)
-      "#{settings.root_url}#{url}"
-    end
-
-  end
-end

data/lib/cimi/helpers/cimi_helper.rb

@@ -13,36 +13,38 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-module CIMIHelper
+module CIMI
+  module Helper
 
-  def no_content_with_status(code=200)
-    body ''
-    status code
-  end
+    def no_content_with_status(code=200)
+      body ''
+      status code
+    end
 
-  def href_id(href, entity)
-    split_on = self.send(:"#{entity.to_s}_url")
-    href.split("#{split_on}/").last
-  end
+    def href_id(href, entity)
+      split_on = self.send(:"#{entity.to_s}_url")
+      href.split("#{split_on}/").last
+    end
 
-  def to_kibibyte(value, unit)
-    case unit
+    def to_kibibyte(value, unit)
+      case unit
       when "GB"
         value*1024*1024
       when "MB"
         value*1024
       else
         nil # should probably be exploding something here...
+      end
     end
-  end
 
+  end
 end
 
 class Array
   def to_xml_cimi_collection(_self)
     model_name = first.class.xml_tag_name
     XmlSimple.xml_out({
-      "xmlns" => "http://www.dmtf.org/cimi",
+      "xmlns" => "http://schemas.dmtf.org/cimi/1",
       "uri" => [ _self.send(:"#{model_name.underscore.pluralize}_url") ],
       "name" => [ "default" ],
       "created" => [ Time.now.to_s ],
@@ -61,4 +63,3 @@ class Array
   end
 
 end
-

data/lib/cimi/models.rb

@@ -21,50 +21,34 @@ require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative './models/schema'
 require_relative './models/base'
+require_relative './models/collection'
 require_relative './models/errors'
-require_relative './models/entity_metadata'
-require_relative './models/entity_metadata_collection'
+require_relative './models/action'
+require_relative './models/disk'
+require_relative './models/disk_collection'
+require_relative './models/machine_volume'
+require_relative './models/machine_volume_collection'
+
+# Toplevel entities; order matters as it determines the order
+# in which the entities appear in the CEP
 require_relative './models/cloud_entry_point'
+require_relative './models/resource_metadata'
+require_relative './models/machine'
 require_relative './models/machine_template'
-require_relative './models/machine_image'
 require_relative './models/machine_configuration'
-require_relative './models/action'
-require_relative './models/machine'
+require_relative './models/machine_image'
+require_relative './models/credential'
 require_relative './models/volume'
-require_relative './models/machine_admin'
+require_relative './models/volume_template'
 require_relative './models/volume_configuration'
 require_relative './models/volume_image'
-require_relative './models/volume_template'
-require_relative './models/machine_template_collection'
-require_relative './models/machine_image_collection'
-require_relative './models/machine_configuration_collection'
-require_relative './models/machine_collection'
-require_relative './models/volume_collection'
-require_relative './models/machine_admin_collection'
-require_relative './models/volume_configuration_collection'
-require_relative './models/volume_image_collection'
-require_relative './models/volume_template_collection'
 require_relative './models/network'
-require_relative './models/network_collection'
-require_relative './models/network_configuration'
-require_relative './models/network_configuration_collection'
 require_relative './models/network_template'
-require_relative './models/network_template_collection'
-require_relative './models/routing_group'
-require_relative './models/routing_group_collection'
-require_relative './models/routing_group_template'
-require_relative './models/routing_group_template_collection'
-require_relative './models/vsp'
-require_relative './models/vsp_collection'
-require_relative './models/vsp_configuration'
-require_relative './models/vsp_configuration_collection'
-require_relative './models/vsp_template'
-require_relative './models/vsp_template_collection'
+require_relative './models/network_configuration'
+require_relative './models/network_port'
+require_relative './models/network_port_template'
+require_relative './models/network_port_configuration'
 require_relative './models/address'
-require_relative './models/address_collection'
 require_relative './models/address_template'
-require_relative './models/address_template_collection'
-require_relative './models/disk'
-require_relative './models/disk_collection'
-require_relative './models/machine_volume'
-require_relative './models/machine_volume_collection'
+require_relative './models/forwarding_group'
+require_relative './models/forwarding_group_template'

data/lib/cimi/models/address.rb

@@ -15,6 +15,8 @@
 
 class CIMI::Model::Address < CIMI::Model::Base
 
+  acts_as_root_entity
+
   text :ip
 
   text :hostname
@@ -25,8 +27,6 @@ class CIMI::Model::Address < CIMI::Model::Base
 
   text :dns
 
-  text :mac_address
-
   text :protocol
 
   text :mask
@@ -41,9 +41,11 @@ class CIMI::Model::Address < CIMI::Model::Base
 
   def self.find(id, context)
     if id==:all
-      context.driver.addresses(context.credentials, {:env=>context})
+      addresses = context.driver.addresses(context.credentials)
+      addresses.map{|addr| from_address(addr, context)}
     else
-      context.driver.addresses(context.credentials, {:id=>id, :env=>context})
+      address = context.driver.address(context.credentials, {:id=>id})
+      from_address(address, context)
     end
   end
 
@@ -69,4 +71,30 @@ class CIMI::Model::Address < CIMI::Model::Base
     context.driver.delete_address(context.credentials, id)
   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", #or "static"
+      :default_gateway => "unkown", #wtf
+      :dns => "unknown", #wtf
+      :protocol => protocol_from_address(address.id),
+      :mask => "unknown",
+      :resource => (address.instance_id) ? {:href=> context.machine_url(address.instance_id)} : nil,
+      :network => nil #unknown
+      #optional:
+      #:hostname =>
+      #:
+    )
+  end
+
+  def self.protocol_from_address(address)
+    addr = IPAddr.new(address)
+    addr.ipv4? ? "ipv4" : "ipv6"
+  end
+
 end

data/lib/cimi/models/address_template.rb

@@ -15,6 +15,8 @@
 
 class CIMI::Model::AddressTemplate < CIMI::Model::Base
 
+  acts_as_root_entity
+
   text :ip
 
   text :hostname
@@ -25,8 +27,6 @@ class CIMI::Model::AddressTemplate < CIMI::Model::Base
 
   text :dns
 
-  text :mac_address
-
   text :protocol
 
   text :mask

data/lib/cimi/models/base.rb

@@ -69,11 +69,16 @@ require 'json'
 
 module CIMI::Model
 
-  def self.register_as_root_entity!(name)
+  def self.register_as_root_entity!(klass, opts = {})
     @root_entities ||= []
-    @root_entities << name
+    @root_entities << klass
+    name = klass.name.split("::").last.pluralize
     unless CIMI::Model::CloudEntryPoint.href_defined?(name)
-      CIMI::Model::CloudEntryPoint.send(:href, name.underscore)
+      params = {}
+      if opts[:as]
+        params[:xml_name] = params[:json_name] = opts[:as]
+      end
+      CIMI::Model::CloudEntryPoint.send(:href, name.underscore, params)
     end
   end
 
@@ -94,6 +99,20 @@ class CIMI::Model::Base
   # attribute, we also define a getter and a setter to access/change the
   # value for that attribute
   class << self
+
+    def <<(model)
+      clone_base_schema unless base_schema_cloned?
+      member_name = model.name.split("::").last
+      if ::Struct.const_defined?("CIMI_#{member_name}")
+        puts "Removing struct"
+        ::Struct.send(:remove_const, "CIMI_#{member_name}")
+      end
+      member_symbol = member_name.underscore.pluralize.to_sym
+      members = CIMI::Model::Schema::Array.new(member_symbol)
+      members.struct.schema.attributes = model.schema.attributes
+      base_schema.attributes << members
+    end
+
     def base_schema
       @schema ||= CIMI::Model::Schema.new
     end
@@ -192,7 +211,7 @@ class CIMI::Model::Base
 
   def self.to_xml(model)
     xml = @schema.to_xml(model)
-    xml["xmlns"] = "http://www.dmtf.org/cimi"
+    xml["xmlns"] = "http://schemas.dmtf.org/cimi/1"
     XmlSimple.xml_out(xml, :root_name => xml_tag_name)
   end
 
@@ -211,7 +230,7 @@ class CIMI::Model::Base
 
   hash :property
 
-  def self.act_as_root_entity(name=nil)
+  def self.acts_as_root_entity(name=nil)
     if name
       name = name.to_s.camelize.pluralize
     else

data/lib/cimi/models/cloud_entry_point.rb

@@ -17,18 +17,13 @@ class CIMI::Model::CloudEntryPoint < CIMI::Model::Base
 
   text  :base_uri, :xml_name => "baseURI", :json_name => "baseURI"
 
-  array :entity_metadata do
-    scalar :href
-  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",
       :id => context.cloudEntryPoint_url,
-      :base_uri => context.root_url,
-      :created => Time.now,
-      :entity_metadata => CIMI::Model::EntityMetadata.all_uri(context)
+      :base_uri => context.base_uri,
+      :created => Time.now
     }))
   end
 
@@ -46,8 +41,8 @@ class CIMI::Model::CloudEntryPoint < CIMI::Model::Base
 
   private
 
-  def self.href_defined?(entity)
-    true if schema.attribute_names.include? entity.underscore
+  def self.href_defined?(resource)
+    true if schema.attribute_names.include? resource.underscore
   end
 
 end