deltacloud-core 1.0.5 → 1.1.0

data/lib/cimi/collections/network_ports.rb

@@ -47,7 +47,7 @@ module CIMI::Collections
       operation :create, :with_capability => :create_network_port do
         description "Create a new NetworkPort"
         control do
-          if request.content_type.end_with?("json")
+          if grab_content_type(request.content_type, request.body) == :json
             network_port = CIMI::Model::NetworkPort.create(request.body.read, self, :json)
           else
             network_port = CIMI::Model::NetworkPort.create(request.body.read, self, :xml)
@@ -73,7 +73,7 @@ module CIMI::Collections
         control do
           network_port = NetworkPort.find(params[:id], self)
           report_error(404) unless network_port
-          if request.content_type.end_with?("json")
+          if grab_content_type(request.content_type, request.body) == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -91,7 +91,7 @@ module CIMI::Collections
         control do
           network_port = NetworkPort.find(params[:id], self)
           report_error(404) unless network_port
-          if request.content_type.end_with?("json")
+          if grab_content_type(request.content_type, request.body) == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)

data/lib/cimi/collections/networks.rb

@@ -46,7 +46,7 @@ module CIMI::Collections
       operation :create, :with_capability => :create_network do
         description "Create a new Network"
         control do
-          if request.content_type.end_with?("json")
+          if grab_content_type(request.content_type, request.body) == :json
             network = Network.create(request.body.read, self, :json)
           else
             network = Network.create(request.body.read, self, :xml)
@@ -72,7 +72,7 @@ module CIMI::Collections
         control do
           network = Network.find(params[:id], self)
           report_error(404) unless network
-          if request.content_type.end_with?("json")
+          if grab_content_type(request.content_type, request.body) == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -90,7 +90,7 @@ module CIMI::Collections
         control do
           network = Network.find(params[:id], self)
           report_error(404) unless network
-          if request.content_type.end_with?("json")
+          if grab_content_type(request.content_type, request.body) == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -108,7 +108,7 @@ module CIMI::Collections
         control do
           network = Network.find(params[:id], self)
           report_error(404) unless network
-          if request.content_type.end_with?("json")
+          if grab_content_type(request.content_type, request.body) == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)

data/lib/cimi/collections/resource_metadata.rb

@@ -32,7 +32,7 @@ module CIMI::Collections
       operation :show do
         description "Get the resource metadata for a specific collection"
         control do
-          resource_metadata = ResourceMetadata.find(params[:id], self)
+          resource_metadata = CIMI::Model::ResourceMetadata.find(params[:id], self)
           respond_to do |format|
             format.xml{resource_metadata.to_xml}
             format.json{resource_metadata.to_json}

data/lib/cimi/collections/volume_configurations.rb

@@ -41,6 +41,31 @@ module CIMI::Collections
           end
         end
       end
+
+      operation :create, :with_capability => :create_storage_volume do
+        description "Create new VolumeConfiguration"
+        control do
+          if grab_content_type(request.content_type, request.body) == :json
+            new_config = CIMI::Model::VolumeConfiguration.create_from_json(request.body.read, self)
+          else
+            new_config = CIMI::Model::VolumeConfiguration.create_from_xml(request.body.read, self)
+          end
+          headers_for_create new_config
+          respond_to do |format|
+            format.json { new_config.to_json }
+            format.xml { new_config.to_xml }
+          end
+        end
+      end
+
+      operation :destroy, :with_capability => :destroy_storage_volume do
+        description "Delete a specified VolumeConfiguration"
+        control do
+          CIMI::Model::VolumeConfiguration.delete!(params[:id], self)
+          no_content_with_status(200)
+        end
+      end
+
     end
 
   end

data/lib/cimi/collections/volume_images.rb

@@ -42,8 +42,28 @@ module CIMI::Collections
           end
         end
       end
-    end
 
+      operation :create, :with_capability => :create_storage_snapshot do
+        description "Create a new volume image."
+        control do
+          volume_image = CIMI::Model::VolumeImage.create(request.body, self)
+          headers_for_create volume_image
+          respond_to do |format|
+            format.xml { volume_image.to_xml }
+            format.json { volume_image.to_json }
+          end
+        end
+      end
+
+      operation :destroy, :with_capability => :destroy_storage_snapshot do
+        description "Delete a specified VolumeImage"
+        control do
+          CIMI::Model::VolumeImage.delete!(params[:id], self)
+          no_content_with_status 200
+        end
+      end
+
+    end
 
   end
 end

data/lib/cimi/collections/volume_templates.rb

@@ -0,0 +1,69 @@
+# 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 CIMI::Collections
+  class VolumeTemplates < Base
+
+    set :capability, lambda { |m| driver.respond_to? m }
+
+    collection :volume_templates do
+
+      operation :index, :with_capability => :storage_volumes do
+        description "Retrieve the Volume Template Collection"
+        control do
+          volume_template = VolumeTemplate.list(self).filter_by(params['$select'])
+          respond_to do |format|
+            format.xml { volume_template.to_xml }
+            format.json { volume_template.to_json }
+          end
+        end
+      end
+
+      operation :show, :with_capability => :storage_volume do
+        description "Get a specific VolumeTemplate"
+        control do
+          volume_template = VolumeTemplate.find(params[:id], self)
+          respond_to do |format|
+            format.xml { volume_template.to_xml }
+            format.json { volume_template.json }
+          end
+        end
+      end
+
+      operation :create, :with_capability => :create_storage_volume do
+        description "Create new VolumeTemplate"
+        control do
+          content_type = grab_content_type(request.content_type, request.body)
+          new_template = CIMI::Model::VolumeTemplate.create(request.body.read, self, content_type)
+          headers_for_create new_template
+          respond_to do |format|
+            format.json { new_template.to_json }
+            format.xml { new_template.to_xml }
+          end
+        end
+      end
+
+      operation :destroy, :with_capability => :destroy_storage_volume do
+        description "Delete a specified VolumeTemplate"
+        control do
+          CIMI::Model::VolumeTemplate.delete!(params[:id], self)
+          no_content_with_status(200)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/cimi/collections/volumes.rb

@@ -46,17 +46,12 @@ module CIMI::Collections
         end
       end
 
-      operation :create do
+      operation :create, :with_capability => :create_storage_volume do
         description "Create a new Volume."
         control do
-          content_type = (request.content_type.end_with?("json") ? :json  : :xml)
-          #((request.content_type.end_with?("xml")) ? :xml : report_error(415) ) FIXME
-          case content_type
-          when :json
-            new_volume = Volume.create_from_json(request.body.read, self)
-          when :xml
-            new_volume = Volume.create_from_xml(request.body.read, self)
-          end
+          content_type = grab_content_type(request.content_type, request.body)
+          new_volume = Volume.create(request.body.read, self, content_type)
+          headers_for_create new_volume
           respond_to do |format|
             format.json { new_volume.to_json }
             format.xml { new_volume.to_xml }
@@ -64,7 +59,7 @@ module CIMI::Collections
         end
       end
 
-      operation :destroy do
+      operation :destroy, :with_capability => :destroy_storage_volume do
         description "Delete a specified Volume"
         control do
           Volume.delete!(params[:id], self)

data/lib/cimi/dependencies.rb

@@ -39,7 +39,6 @@ require 'deltacloud/models/load_balancer'
 require 'deltacloud/models/firewall'
 require 'deltacloud/models/firewall_rule'
 
-require 'json'
 require 'sinatra/rack_accept'
 require 'sinatra/rack_cimi'
 require 'sinatra/static_assets'

data/lib/cimi/helpers.rb

@@ -14,12 +14,13 @@
 # under the License.
 
 require_relative '../deltacloud/drivers/features'
-
+require_relative '../deltacloud/drivers/cimi_features'
 module CIMI
   module Model; end
   class FakeCollection
     extend Sinatra::Rabbit::Features
     include Deltacloud::Features
+    include CIMI::Features
   end
 end
 
@@ -32,4 +33,6 @@ require_relative '../deltacloud/helpers/driver_helper'
 require_relative '../deltacloud/helpers/auth_helper'
 require_relative '../deltacloud/helpers/deltacloud_helper'
 require_relative '../deltacloud/helpers/rabbit_helper'
+
 require_relative './helpers/cimi_helper'
+require_relative './helpers/database_helper'

data/lib/cimi/helpers/cimi_helper.rb

@@ -26,12 +26,20 @@ module CIMI
       status code
     end
 
+    # Set status to 201 and a Location header
+    def headers_for_create(resource)
+      status 201
+      headers 'Location' => resource.id
+    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)
+      #value may be a string. convert to_f
+      value = value.to_f # not to_i because e.g. 0.5 GB
       case unit
       when "GB"
         (value*1024*1024).to_i
@@ -42,6 +50,60 @@ module CIMI
       end
     end
 
+    #e.g. convert volume to GB for deltacloud driver
+    def from_kibibyte(value, unit="GB")
+      case unit
+        when "GB" then ((value.to_f)/1024/1024)
+        when "MB" then ((value.to_f)/1024)
+        else nil
+      end
+    end
+
+    def grab_content_type(request_content_type, request_body)
+      case request_content_type
+        when /xml$/ then :xml
+        when /json$/ then :json
+        else raise CIMI::Model::UnsupportedMediaType.new("Unsupported content type - only xml and json supported by CIMI")
+        #guess_content_type(request_body)
+      end
+    end
+
+    #not being used - was called from above grab_content_type
+    #decided to reject anything not xml || json
+    def guess_content_type(request_body)
+      xml = json = false
+      body = request_body.read
+      request_body.rewind
+      begin
+        XmlSimple.xml_in(body)
+        xml = true
+      rescue Exception
+        xml = false
+      end
+      begin
+        JSON.parse(body)
+        json = true
+      rescue Exception
+        json = false
+      end
+      if (json == xml) #both true or both false
+        raise CIMI::Model::BadRequest.new("Couldn't guess content type of: #{body}")
+      end
+      type = (xml)? :xml : :json
+    end
+
+    def deltacloud_create_method_for(cimi_entity)
+      case cimi_entity
+        when "machine"                then "create_instance"
+        when "machine_configuration"  then "create_hardware_profile"
+        when "machine_image"          then "create_image"
+        when "volume"                 then "create_storage_volume"
+        when "volume_image"           then "create_storage_snapshot"
+        else "create_#{cimi_entity}"
+      end
+
+    end
+
   end
 end
 

data/lib/cimi/helpers/database_helper.rb

@@ -0,0 +1,95 @@
+module Deltacloud
+  module Helpers
+
+    require_relative '../../deltacloud/helpers/driver_helper.rb'
+
+    module Database
+      include Deltacloud::Helpers::Drivers
+
+      DATABASE_COLLECTIONS = [ "machine_template", "address_template",
+        "volume_configuration", "volume_template" ]
+
+      def test_environment?
+        Deltacloud.test_environment?
+      end
+
+     def provides?(entity)
+       return true if DATABASE_COLLECTIONS.include? entity
+       return false
+     end
+
+      def load_attributes_for(model)
+        return {} if test_environment?
+        entity = get_entity(model)
+        entity.nil? ? {} : entity.to_hash
+      end
+
+      def delete_attributes_for(model)
+        return if test_environment?
+        entity = get_entity(model)
+        !entity.nil? && entity.destroy
+      end
+
+      def get_entity(model)
+        current_db.entities_dataset.first(
+          :be_kind => model.to_entity,
+          :be_id => model.id
+        )
+      end
+
+      def current_provider
+        Thread.current[:provider] || ENV['API_PROVIDER'] || 'default'
+      end
+
+      # This method allows to store things into database based on current driver
+      # and provider.
+      #
+
+      def current_db
+        Deltacloud::Database::Provider.find_or_create(:driver => driver_symbol.to_s, :url => current_provider)
+      end
+
+      def store_attributes_for(model, attrs={})
+        return if test_environment? or model.nil? or attrs.empty?
+        return if model.id.nil?
+
+        unless entity = get_entity(model)
+          entity = Deltacloud::Database::Entity.new(
+            :provider_id => current_db.id,
+            :be_id => model.id,
+            :be_kind => model.to_entity
+          )
+        end
+
+        entity.description = extract_attribute_value('description', attrs) if attrs.has_key? 'description'
+        entity.name = extract_attribute_value('name', attrs) if attrs.has_key? 'name'
+
+        if attrs.has_key? 'properties'
+          entity.ent_properties = extract_attribute_value('properties', attrs).to_json
+        elsif attrs.has_key? 'property'
+          entity.ent_properties = extract_attribute_value('property', attrs).to_json
+        end
+
+        entity.exists? ? entity.save_changes : entity.save
+
+        entity
+      end
+
+      # In XML serialization the values stored in attrs are arrays, dues to
+      # XmlSimple. This method will help extract values from them
+      #
+      def extract_attribute_value(name, attrs={})
+        return unless attrs[name]
+        if name == 'property'
+          attrs[name].is_a?(Array) ?
+            attrs[name].inject({}) { |r, v| r[v['key']] = v['content']; r} :
+            attrs[name]
+        else
+          attrs[name].is_a?(Array) ? attrs[name].first : attrs[name]
+        end
+      end
+
+    end
+  end
+
+end

data/lib/cimi/models.rb

@@ -18,6 +18,17 @@ module CIMI
 end
 
 require 'require_relative' if RUBY_VERSION < '1.9'
+require_relative '../db'
+
+unless Deltacloud.test_environment?
+  Deltacloud::initialize_database
+  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'
+end
 
 require_relative './models/schema'
 require_relative './models/base'
@@ -27,8 +38,11 @@ require_relative './models/action'
 require_relative './models/machine_volume'
 require_relative './models/disk'
 
-require_relative './models/cloud_entry_point'
 require_relative './models/resource_metadata'
+require_relative './models/cloud_entry_point'
+
+CIMI::Model::ResourceMetadata.acts_as_root_entity
+
 require_relative './models/volume'
 require_relative './models/volume_template'
 require_relative './models/volume_configuration'