deltacloud-core 1.0.2 → 1.0.3

data/lib/cimi/collections/network_templates.rb

@@ -16,10 +16,11 @@
 module CIMI::Collections
   class NetworkTemplates < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
+
     collection :network_templates do
 
-      operation :index do
+      operation :index, :with_capability => :network_templates do
         description 'List all Network Templates in the NetworkTemplateCollection'
         param :CIMISelect, :string, :optional
         control do
@@ -31,7 +32,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :network_template do
         description 'Show a specific Network Template'
         control do
           network_template = NetworkTemplate.find(params[:id], self)

data/lib/cimi/collections/networks.rb

@@ -16,12 +16,12 @@
 module CIMI::Collections
   class Networks < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
 
     collection :networks do
       description 'A Network represents an abstraction of a layer 2 broadcast domain'
 
-      operation :index do
+      operation :index, :with_capability => :networks do
         description "List all Networks"
         param :CIMISelect,  :string,  :optional
         control do
@@ -33,7 +33,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :networks do
         description "Show a specific Network"
         control do
           network = Network.find(params[:id], self)
@@ -44,7 +44,7 @@ module CIMI::Collections
         end
       end
 
-      operation :create do
+      operation :create, :with_capability => :create_network do
         description "Create a new Network"
         control do
           if request.content_type.end_with?("json")
@@ -59,7 +59,7 @@ module CIMI::Collections
         end
       end
 
-      operation :destroy do
+      operation :destroy, :with_capability => :delete_network do
         description "Delete a specified Network"
         param :id, :string, :required
         control do
@@ -68,7 +68,7 @@ module CIMI::Collections
         end
       end
 
-      action :start do
+      action :start, :with_capability => :start_network do
         description "Start specific network."
         control do
           network = Network.find(params[:id], self)
@@ -85,7 +85,7 @@ module CIMI::Collections
         end
       end
 
-      action :stop do
+      action :stop, :with_capability => :stop_network do
         description "Stop specific network."
         control do
           network = Network.find(params[:id], self)
@@ -102,7 +102,7 @@ module CIMI::Collections
         end
       end
 
-      action :suspend do
+      action :suspend, :with_capability => :suspend_network do
         description "Suspend specific network."
         control do
           network = Network.find(params[:id], self)

data/lib/cimi/collections/routing_group_templates.rb

@@ -16,10 +16,11 @@
 module CIMI::Collections
   class RoutingGroupTemplates < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
+
     collection :routing_group_templates do
 
-      operation :index do
+      operation :index, :with_capability => :routing_groups do
         description 'List all RoutingGroupTemplates in the RoutingGroupTemplateCollection'
         param :CIMISelect, :string, :optional
         control do
@@ -31,7 +32,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :routing_group do
         description 'Show a specific RoutingGroupTemplate'
         control do
           routing_group_template = RoutingGroupTemplate.find(params[:id], self)

data/lib/cimi/collections/routing_groups.rb

@@ -16,10 +16,11 @@
 module CIMI::Collections
   class RoutingGroups < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
+
     collection :routing_groups do
 
-      operation :index do
+      operation :index, :with_capability => :routing_groups do
         description 'List all RoutingGroups in the RoutingGroupsCollection'
         param :CIMISelect, :string, :optional
         control do
@@ -31,7 +32,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :routing_group do
         description 'Show a specific RoutingGroup'
         control do
           routing_group = RoutingGroup.find(params[:id], self)

data/lib/cimi/collections/volume_configurations.rb

@@ -16,11 +16,11 @@
 module CIMI::Collections
   class VolumeConfigurations < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
 
     collection :volume_configurations do
 
-      operation :index do
+      operation :index, :with_capability => :storage_volumes do
         description "Get list all VolumeConfigurations"
         param :CIMISelect,  :string,  :optional
         control do
@@ -32,7 +32,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :storage_volume do
         description "Get a specific VolumeConfiguration"
         control do
           volume_config = VolumeConfiguration.find(params[:id], self)

data/lib/cimi/collections/volume_images.rb

@@ -16,12 +16,12 @@
 module CIMI::Collections
   class VolumeImages < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
 
     collection :volume_images do
       description 'This entity represents an image that could be place on a pre-loaded volume.'
 
-      operation :index do
+      operation :index, :with_capability => :storage_snapshots do
         description "List all volumes images"
         param :CIMISelect,  :string,  :optional
         control do
@@ -33,7 +33,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :storage_snapshot do
         description "Show a specific volume image"
         control do
           volume_image = VolumeImage.find(params[:id], self)

data/lib/cimi/collections/volumes.rb

@@ -16,10 +16,11 @@
 module CIMI::Collections
   class Volumes < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
+
     collection :volumes do
 
-      operation :index do
+      operation :index, :with_capability => :storage_volumes do
         description "List all volumes"
         param :CIMISelect,  :string,  :optional
         control do
@@ -31,7 +32,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :storage_volume do
         description "Show specific Volume."
         control do
           volume = Volume.find(params[:id], self)

data/lib/cimi/collections/vsp_configurations.rb

@@ -16,10 +16,11 @@
 module CIMI::Collections
   class VspConfigurations < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
+
     collection :vsp_configurations do
 
-      operation :index do
+      operation :index, :with_capability => :vsp_configurations do
         description 'List all VSPConfigurations in the VSPConfigurationCollection'
         param :CIMISelect, :string, :optional
         control do
@@ -31,7 +32,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :vsp_configuration do
         description 'Show a specific VSPConfiguration'
         control do
           vsp_config = VSPConfiguration.find(params[:id], self)

data/lib/cimi/collections/vsp_templates.rb

@@ -16,12 +16,13 @@
 module CIMI::Collections
   class VspTemplates < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
+
     collection :vsp_templates do
 
       description 'The VSP Template is a set of Configuration values for realizing a VSP. A VSP Template may be used to create multiple VSPs'
 
-      operation :index do
+      operation :index, :with_capability => :vsp_templates do
         description 'List all VSPTemplates in the VSPTemplateCollection'
         param :CIMISelect, :string, :optional
         control do
@@ -33,7 +34,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :vsp_template do
         description 'Show a specific VSPTemplate'
         control do
           vsp_template = VSPTemplate.find(params[:id], self)

data/lib/cimi/collections/vsps.rb

@@ -16,12 +16,13 @@
 module CIMI::Collections
   class Vsps < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
+
     collection :vsps do
 
       description 'A VSP represents the connection parameters of a network port'
 
-      operation :index do
+      operation :index, :with_capability => :vsps do
         description 'List all VSPs in the VSPCollection'
         param :CIMISelect, :string, :optional
         control do
@@ -33,7 +34,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :vsp do
         description 'Show a specific VSP'
         control do
           vsp = VSP.find(params[:id], self)
@@ -44,7 +45,7 @@ module CIMI::Collections
         end
       end
 
-      operation :create do
+      operation :create, :with_capability => :create_vsp do
         description "Create a new VSP"
         control do
           if request.content_type.end_with?("json")
@@ -59,7 +60,7 @@ module CIMI::Collections
         end
       end
 
-      operation :destroy do
+      operation :destroy, :with_capability => :delete_vsp do
         description "Delete a specified VSP"
         control do
           CIMI::Model::VSP.delete!(params[:id], self)
@@ -67,7 +68,7 @@ module CIMI::Collections
         end
       end
 
-      action :start do
+      action :start, :with_capability => :start_vsp do
         description "Start specific VSP."
         param :id,          :string,    :required
         control do
@@ -85,7 +86,7 @@ module CIMI::Collections
         end
       end
 
-      action :stop do
+      action :stop, :with_capability => :stop_vsp do
         description "Stop specific VSP."
         control do
           vsp = VSP.find(params[:id], self)

data/lib/cimi/helpers.rb

@@ -86,7 +86,7 @@ module CIMI::Collections
     end
 
     after do
-      headers 'X-CIMI-Specification-Version' => Deltacloud[:cimi].version
+      headers 'CIMI-Specification-Version' => Deltacloud[:cimi].version
     end
 
     def self.new_route_for(route, &block)

data/lib/cimi/helpers/cimi_helper.rb

@@ -20,12 +20,22 @@ module CIMIHelper
     status code
   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
+      when "GB"
+        value*1024*1024
+      when "MB"
+        value*1024
+      else
+        nil # should probably be exploding something here...
+    end
+  end
+
 end
 
 class Array

data/lib/cimi/models.rb

@@ -64,3 +64,7 @@ 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'

data/lib/cimi/models/base.rb

@@ -107,7 +107,7 @@ class CIMI::Model::Base
       @schema_duped
     end
 
-    private :'clone_base_schema', :'base_schema_cloned?'
+    private :clone_base_schema, :base_schema_cloned?
 
     def inherited(child)
       child.instance_eval do
@@ -168,6 +168,16 @@ class CIMI::Model::Base
     model
   end
 
+  def self.parse(text, content_type)
+    if content_type == "application/xml"
+      from_xml(text)
+    elsif content_type == "application/json"
+      from_json(text)
+    else
+      raise "Can not parse content type #{content_type}"
+    end
+  end
+
   #
   # Serialize
   #

data/lib/cimi/models/cloud_entry_point.rb

@@ -16,19 +16,11 @@
 class CIMI::Model::CloudEntryPoint < CIMI::Model::Base
 
   text  :base_uri, :xml_name => "baseURI", :json_name => "baseURI"
+
   array :entity_metadata do
     scalar :href
   end
 
-  DELTACLOUD_MAPPINGS = { "MachineImages" => "images",
-                          "MachineConfigurations" => "hardware_profiles",
-                          "Machines" => "instances",
-                          "Volumes" => "storage_volumes",
-                          "MachineAdmins" => "keys",
-                          "VolumeImages" => "storage_snapshots",
-                        }
-
-
   def self.create(context)
     self.new(entities(context).merge({
       :name => context.driver.name,
@@ -42,12 +34,13 @@ class CIMI::Model::CloudEntryPoint < CIMI::Model::Base
 
   # Return an Hash of the CIMI root entities used in CloudEntryPoint
   def self.entities(context)
-    CIMI::Model.root_entities.inject({}) do |result, entity|
-      if DELTACLOUD_MAPPINGS[entity]
-        next result unless context.driver.respond_to?(DELTACLOUD_MAPPINGS[entity])
+    CIMI::Collections.cimi_modules.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
-      result[entity.underscore] = { :href => context.send(:"#{entity.underscore}_url") }
-      result
+      supported_entities
     end
   end
 

data/lib/cimi/models/disk.rb

@@ -0,0 +1,40 @@
+# 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.
+
+class CIMI::Model::Disk < CIMI::Model::Base
+
+  text :capacity
+  text :initial_location
+
+  array :operations do
+    scalar :rel, :href
+  end
+
+  def self.find(instance, machine_config, context, id=:all)
+    if id == :all
+      storage_override = instance.instance_profile.overrides.find { |p, v| p == :storage }
+      capacity = storage_override.nil? ? machine_config.disks[0][:capacity] : context.to_kibibyte(storage_override[1].to_i, "MB")
+      name = instance.id+"_disk_#{capacity}" #assuming one disk for now...
+     [ self.new(
+       :id => context.machine_url(instance.id)+"/disks/#{name}",
+       :name => name,
+       :description => "DiskCollection for Machine #{instance.id}",
+       :created => instance.launch_time,
+       :capacity => capacity
+      ) ]
+    else
+    end
+  end
+end