deltacloud-core 1.0.3 → 1.0.4

data/lib/cimi/models/{vsp_template.rb → network_port_template.rb}

@@ -13,11 +13,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-class CIMI::Model::VSPTemplate < CIMI::Model::Base
+class CIMI::Model::NetworkPortTemplate < CIMI::Model::Base
+
+  acts_as_root_entity
 
   href :network
 
-  href :vsp_config
+  href :network_port_config
 
   array :operations do
     scalar :rel, :href
@@ -25,9 +27,9 @@ class CIMI::Model::VSPTemplate < CIMI::Model::Base
 
   def self.find(id, context)
     if id==:all
-      context.driver.vsp_templates(context.credentials, {:env=>context})
+      context.driver.network_port_templates(context.credentials, {:env=>context})
     else
-      context.driver.vsp_templates(context.credentials, {:env=>context, :id=>id})
+      context.driver.network_port_templates(context.credentials, {:env=>context, :id=>id})
     end
   end
 

data/lib/cimi/models/{network_template_collection.rb → network_port_template_collection.rb}

@@ -13,22 +13,24 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+class CIMI::Model::NetworkPortTemplateCollection < CIMI::Model::Base
 
-class CIMI::Model::NetworkTemplateCollection < CIMI::Model::Base
+  CIMI::Model.register_as_root_entity! "NetworkPortTemplates"
 
-  act_as_root_entity :network_template
+  text :count
 
-  array :network_templates do
-    scalar :href
-  end
+  #add array of network_port_templates:
+  self << CIMI::Model::NetworkPortTemplate
 
   def self.default(context)
+    network_port_templates = CIMI::Model::NetworkPortTemplate.all(context)
     self.new(
-      :id => context.network_templates_url,
+      :id => context.network_port_templates_url,
       :name => 'default',
       :created => Time.now,
-      :description => "#{context.driver.name.capitalize} NetworkTemplateCollection",
-      :network_templates => CIMI::Model::NetworkTemplate.all_uri(context)
+      :description => "#{context.driver.name.capitalize} NetworkPortTemplateCollection",
+      :count => network_port_templates.size,
+      :network_port_templates => network_port_templates
     )
   end
 

data/lib/cimi/models/network_template.rb

@@ -15,9 +15,11 @@
 
 class CIMI::Model::NetworkTemplate < CIMI::Model::Base
 
+  acts_as_root_entity
+
   href :network_config
 
-  href :routing_group
+  href :forwarding_group
 
   array :operations do
     scalar :rel, :href

data/lib/cimi/models/{entity_metadata.rb → resource_metadata.rb}

@@ -14,7 +14,9 @@
 # under the License.
 
 
-class CIMI::Model::EntityMetadata < CIMI::Model::Base
+class CIMI::Model::ResourceMetadata < CIMI::Model::Base
+
+  acts_as_root_entity
 
   text :type_uri
 
@@ -36,25 +38,24 @@ class CIMI::Model::EntityMetadata < CIMI::Model::Base
   end
 
   def self.find(id, context)
-    entity_metadata = []
+    resource_metadata = []
     if id == :all
-      CIMI::Model.root_entities.each do |entity|
-        entity_class = CIMI::Model.const_get("#{entity.singularize}")
-        entity_metadata << entity_class.create_entity_metadata(context) if entity_class.respond_to?(:create_entity_metadata)
+      CIMI::Model.root_entities.each do |resource_class|
+        resource_metadata << resource_class.create_resource_metadata(context) if resource_class.respond_to?(:create_resource_metadata)
       end
-      return entity_metadata
+      return resource_metadata
     else
-      entity_class = CIMI::Model.const_get("#{id.camelize}")
-      if entity_class.respond_to?(:create_entity_metadata)
-        entity_class.create_entity_metadata(context)
+      resource_class = CIMI::Model.const_get("#{id.camelize}")
+      if resource_class.respond_to?(:create_resource_metadata)
+        resource_class.create_resource_metadata(context)
       end
     end
   end
 
-  def self.metadata_from_deltacloud_features(cimi_entity, dcloud_entity, context)
-    deltacloud_features = context.driver.class.features[dcloud_entity]
+  def self.metadata_from_deltacloud_features(cimi_resource, dcloud_resource, context)
+    deltacloud_features = context.driver.class.features[dcloud_resource]
     metadata_attributes = deltacloud_features.map{|f| attributes_from_feature(f)}
-    from_feature(cimi_entity, context, metadata_attributes.flatten!)
+    from_feature(cimi_resource, context, metadata_attributes.flatten!)
   end
 
   def includes_attribute?(attribute)
@@ -75,9 +76,9 @@ class CIMI::Model::EntityMetadata < CIMI::Model::Base
     end
   end
 
-  def self.from_feature(cimi_entity, context, metadata_attributes)
-    self.new(:name => cimi_entity, :uri=>"#{context.entity_metadata_url}/#{cimi_entity.underscore}",
-             :type_uri=> context.send("#{cimi_entity.pluralize.underscore}_url"),
+  def self.from_feature(cimi_resource, context, metadata_attributes)
+    self.new(:name => cimi_resource, :uri=>"#{context.resource_metadata_url}/#{cimi_resource.underscore}",
+             :type_uri=> context.send("#{cimi_resource.pluralize.underscore}_url"),
              :attributes => metadata_attributes)
   end
 

data/lib/cimi/models/schema.rb

@@ -87,9 +87,16 @@ class CIMI::Model::Schema
     def initialize(name, opts, &block)
       content = opts[:content]
       super(name, opts)
-      @schema = CIMI::Model::Schema.new
-      @schema.instance_eval(&block) if block_given?
-      @schema.scalar(content, :text => :direct) if content
+      if opts[:schema]
+        if block_given?
+          raise "Cannot provide :schema option and a block"
+        end
+        @schema = opts[:schema]
+      else
+        @schema = CIMI::Model::Schema.new
+        @schema.instance_eval(&block) if block_given?
+        @schema.scalar(content, :text => :direct) if content
+      end
     end
 
     def from_xml(xml, model)
@@ -138,13 +145,7 @@ class CIMI::Model::Schema
 
     private
     def struct
-      cname = "CIMI_#{json_name.upcase_first}"
-      if ::Struct.const_defined?(cname)
-        ::Struct.const_get(cname)
-      else
-        ::Struct.new("CIMI_#{json_name.upcase_first}",
-                     *@schema.attribute_names)
-      end
+      @struct_class ||= ::Struct.new(nil, *@schema.attribute_names)
     end
   end
 
@@ -233,7 +234,8 @@ class CIMI::Model::Schema
     model
   end
 
-  def to_xml(model, xml = {})
+  def to_xml(model, xml = nil)
+    xml ||= OrderedHash.new
     @attributes.freeze
     @attributes.each { |attr| attr.to_xml(model, xml) }
     xml
@@ -265,7 +267,8 @@ class CIMI::Model::Schema
   # +add_attributes!+ method
   module DSL
     def href(*args)
-      args.each { |arg| struct(arg) { scalar :href } }
+      opts = args.extract_opts!
+      args.each { |arg| struct(arg, opts) { scalar :href } }
     end
 
     def text(*args)
@@ -288,6 +291,14 @@ class CIMI::Model::Schema
     def hash(name)
       add_attributes!([name, {}], Hash)
     end
+
+    def collection(name, opts={})
+      text :count
+
+      array :operations do
+        scalar :rel, :href
+      end
+    end
   end
 
   include DSL

data/lib/cimi/models/volume.rb

@@ -15,6 +15,8 @@
 
 class CIMI::Model::Volume < CIMI::Model::Base
 
+  acts_as_root_entity
+
   struct :capacity do
     scalar :quantity
     scalar :units

data/lib/cimi/models/volume_configuration.rb

@@ -15,6 +15,8 @@
 
 class CIMI::Model::VolumeConfiguration < CIMI::Model::Base
 
+  acts_as_root_entity :as => "volumeConfigs"
+
   text :format
   struct :capacity do
     scalar :quantity

data/lib/cimi/models/volume_image.rb

@@ -15,6 +15,8 @@
 
 class CIMI::Model::VolumeImage < CIMI::Model::Base
 
+  acts_as_root_entity
+
   href :image_location
   text :image_data
   text :bootable

data/lib/cimi/models/volume_template.rb

@@ -15,6 +15,8 @@
 
 class CIMI::Model::VolumeTemplate < CIMI::Model::Base
 
+  acts_as_root_entity
+
   href :volume_config
   href :volume_image
   array :operations do

data/lib/cimi/server.rb

@@ -25,7 +25,7 @@ require_relative '../sinatra'
 require_relative './helpers'
 require_relative './collections'
 
-CMWG_NAMESPACE = "http://www.dmtf.org/cimi"
+CMWG_NAMESPACE = "http://schemas.dmtf.org/cimi/1"
 
 module CIMI
   class API < Collections::Base
@@ -36,17 +36,21 @@ module CIMI
     use Rack::ETag
     use Rack::MatrixParams
     use Rack::DriverSelect
-    use Rack::Accept
-    use Rack::MediaType
 
-    helpers CIMIHelper
+    helpers CIMI::Helper
 
     include Deltacloud::Helpers
     include CIMI::Collections
     include CIMI::Model
 
-    get Deltacloud[:cimi].root_url do
-      redirect Deltacloud[:cimi].root_url + '/cloudEntryPoint', 301
+    enable :method_override
+    disable :show_exceptions
+    disable :dump_errors
+
+    helpers Sinatra::Rabbit::URLFor(CIMI.collections)
+
+    get '/' do
+      redirect url('/cloudEntryPoint'), 301
     end
 
   end

data/lib/deltacloud/collections.rb

@@ -14,6 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+require_relative './collections/base'
+
 module Deltacloud
 
   def self.collection_names
@@ -35,8 +37,9 @@ module Deltacloud
     end
 
     Dir[File.join(File::dirname(__FILE__), "collections", "*.rb")].each do |collection|
-      require collection
       base_collection_name = File.basename(collection).gsub('.rb', '')
+      next if base_collection_name == 'base'
+      require collection
       deltacloud_module_class = Deltacloud::Collections.const_get(base_collection_name.camelize)
       deltacloud_modules << deltacloud_module_class
       deltacloud_module_class.collections.each do |c|
@@ -46,7 +49,9 @@ module Deltacloud
 
     def self.included(klass)
       klass.class_eval do
-        Deltacloud::Collections.deltacloud_modules.each { |c| use c }
+        Deltacloud::Collections.deltacloud_modules.each do |collection_class|
+          use collection_class
+        end
       end
     end
 

data/lib/deltacloud/collections/addresses.rb

@@ -18,7 +18,7 @@ module Deltacloud::Collections
 
     set :capability, lambda { |m| driver.respond_to? m }
 
-    get route_for('/addresses/:id/associate') do
+    get '/addresses/:id/associate' do
       @address = driver.address(credentials, params )
       @instances = driver.instances(credentials)
       respond_to do |format|
@@ -60,6 +60,7 @@ module Deltacloud::Collections
 
       action :associate, :with_capability => :associate_address do
         description "Associate an IP address to an instance"
+        param :id, :string, :required
         param :instance_id, :string, :required
         control do
           driver.associate_address(credentials, { :id => params[:id], :instance_id => params[:instance_id]})
@@ -74,6 +75,7 @@ module Deltacloud::Collections
 
       action :disassociate, :with_capability => :associate_address do
         description "Disassociate an IP address from an instance"
+        param :id, :string, :required
         control do
           driver.disassociate_address(credentials, { :id => params[:id] })
           status 202   # Accepted

data/lib/deltacloud/collections/base.rb

@@ -0,0 +1,64 @@
+# 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.
+
+module Deltacloud::Collections
+  class Base < Sinatra::Base
+
+    include Sinatra::Rabbit
+    include Sinatra::Rabbit::Features
+
+    helpers Deltacloud::Helpers::Drivers
+    helpers Sinatra::AuthHelper
+    helpers Deltacloud::Helpers::Application
+    helpers Sinatra::Rabbit::URLHelper
+    register Rack::RespondTo
+
+    enable :method_override
+    disable :show_exceptions
+    disable :dump_errors
+
+    set :config, Deltacloud[:deltacloud]
+    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, File.join(settings.root, 'views')
+    set :public_folder, root + '/public'
+    # A class where the Rabbit will look up for 'collections'
+    set :documentation_class, Deltacloud
+
+    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 'Server' => 'Apache-Deltacloud/' + settings.version
+      headers 'X-Deltacloud-Driver' => driver_name
+      if provider_name
+        headers 'X-Deltacloud-Provider' => provider_name
+      end
+    end
+
+  end
+end

data/lib/deltacloud/collections/buckets.rb

@@ -24,7 +24,7 @@ module Deltacloud::Collections
 
     new_route_for :buckets
 
-    get route_for('/buckets/:bucket/%s' % NEW_BLOB_FORM_ID) do
+    get '/buckets/:bucket/%s' % NEW_BLOB_FORM_ID do
       @bucket_id = params[:bucket]
       respond_to do |format|
         format.html {haml :"blobs/new"}
@@ -32,7 +32,7 @@ module Deltacloud::Collections
     end
 
 
-    head route_for('/buckets/:bucket/:blob') do
+    head '/buckets/:bucket/:blob' do
       @blob_id = params[:blob]
       @blob_metadata = driver.blob_metadata(credentials, {:id => params[:blob], 'bucket' => params[:bucket]})
       if @blob_metadata
@@ -49,7 +49,7 @@ module Deltacloud::Collections
       end
     end
 
-    put route_for("/buckets/:bucket/:blob") do
+    put "/buckets/:bucket/:blob" do
       if(env["BLOB_SUCCESS"]) #ie got a 200ok after putting blob
         content_type = env["CONTENT_TYPE"]
         content_type ||=  ""
@@ -120,6 +120,7 @@ module Deltacloud::Collections
       collection :blobs, :with_id => :blob_id, :no_member => true do
 
         operation :show, :with_capability => :blob do
+          param :blob_id, :string, :required
           control do
             @blob = driver.blob(credentials, { :id => params[:blob_id], 'bucket' => params[:id]} )
             if @blob
@@ -137,6 +138,7 @@ module Deltacloud::Collections
 
         operation :create, :with_capability => :create_blob do
           description "Create new blob"
+          param :id, :string, :required, 'The bucket ID'
           param :blob_id,  :string,  :required
           param :blob_data, :hash, :required
           control do
@@ -165,6 +167,7 @@ module Deltacloud::Collections
         end
 
         operation :destroy, :with_capability => :delete_blob do
+          param :blob_id, :string, :required, 'The id of the blob to destroy'
           control do
             bucket_id = params[:id]
             blob_id = params[:blob_id]
@@ -180,6 +183,8 @@ module Deltacloud::Collections
 
         action :stream, :http_method => :put, :with_capability => :create_blob do
           description "Stream new blob data into the blob"
+          param :id, :string, :required
+          param :blob_id, :string, :required
           control do
             if(env["BLOB_SUCCESS"]) #ie got a 200ok after putting blob
               content_type = env["CONTENT_TYPE"]
@@ -215,6 +220,8 @@ module Deltacloud::Collections
         end
 
         action :metadata, :http_method => :head, :with_capability => :blob_metadata do
+          param :id, :string, :required
+          param :blob_id, :string, :required
           control do
             @blob_id = params[:blob_id]
             @blob_metadata = driver.blob_metadata(credentials, {:id => params[:blob_id], 'bucket' => params[:id]})
@@ -234,10 +241,11 @@ module Deltacloud::Collections
         end
 
         action :update, :http_method => :post, :with_capability => :update_blob_metadata do
+          param :blob_id, :string, :required
           control do
             meta_hash = BlobHelper::extract_blob_metadata_hash(request.env)
             success = driver.update_blob_metadata(credentials, {'bucket'=>params[:id], :id =>params[:blob_id], 'meta_hash' => meta_hash})
-           if(success)
+            if(success)
               meta_hash.each do |k,v|
                 headers["X-Deltacloud-Blobmeta-#{k}"] = v
               end
@@ -254,6 +262,8 @@ module Deltacloud::Collections
 
         action :content, :http_method => :get, :with_capability => :blob do
           description "Download blob content"
+          param :id, :string, :required
+          param :blob_id, :string, :required
           control do
             @blob = driver.blob(credentials, { :id => params[:blob_id], 'bucket' => params[:id]})
             if @blob