deltacloud-core 1.1.1 → 1.1.2

data/lib/cimi/collections/volumes.rb

@@ -49,8 +49,8 @@ module CIMI::Collections
       operation :create, :with_capability => :create_storage_volume do
         description "Create a new Volume."
         control do
-          content_type = grab_content_type(request.content_type, request.body)
-          new_volume = Volume.create(request.body.read, self, content_type)
+          vol = CIMI::Model::VolumeCreate.parse(request.body, request.content_type)
+          new_volume = vol.create(self)
           headers_for_create new_volume
           respond_to do |format|
             format.json { new_volume.to_json }

data/lib/cimi/dependencies.rb

@@ -58,5 +58,3 @@ require 'sinatra/rack_date'
 require 'sinatra/rack_matrix_params'
 require 'sinatra/rack_syslog'
 require 'sinatra/sinatra_verbose'
-
-CMWG_NAMESPACE = "http://schemas.dmtf.org/cimi/1"

data/lib/cimi/helpers/cimi_helper.rb

@@ -16,6 +16,18 @@
 module CIMI
   module Helper
 
+    def current_content_type
+      case request.content_type
+        when 'application/json' then :json
+        when 'text/xml', 'application/xml' then :xml
+        else
+          raise Deltacloud::Exceptions.exception_from_status(
+            406,
+            translate_error_code(406)[:message]
+          )
+      end
+    end
+
     def expand?(collection)
       params['$expand'] == '*' ||
         (params['$expand'] || '').split(',').include?(collection.to_s)
@@ -59,39 +71,6 @@ module CIMI
       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"
@@ -106,27 +85,3 @@ module CIMI
 
   end
 end
-
-class Array
-  def to_xml_cimi_collection(_self)
-    model_name = first.class.xml_tag_name
-    XmlSimple.xml_out({
-      "xmlns" => "http://schemas.dmtf.org/cimi/1",
-      "uri" => [ _self.send(:"#{model_name.underscore.pluralize}_url") ],
-      "name" => [ "default" ],
-      "created" => [ Time.now.to_s ],
-      model_name => map { |model| { 'href' => model.uri } }
-    }, :root_name => "#{model_name}Collection")
-  end
-
-  def to_json_cimi_collection(_self)
-    model_name = first.class.xml_tag_name
-    {
-      "uri" => _self.send(:"#{model_name.underscore.pluralize}_url"),
-      "name" => "default",
-      "created" => Time.now.to_s,
-      model_name.pluralize.uncapitalize => map { |model| { 'href' => model.uri } }
-    }.to_json
-  end
-
-end

data/lib/cimi/helpers/database_helper.rb

@@ -24,10 +24,6 @@ module Deltacloud
       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

data/lib/cimi/models.rb

@@ -36,17 +36,15 @@ 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
+# 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'
@@ -62,22 +60,35 @@ require_relative './models/cloud_entry_point'
 
 CIMI::Model::ResourceMetadata.acts_as_root_entity
 
+require_relative './models/credential'
+require_relative './models/credential_template'
+require_relative './models/credential_create'
 require_relative './models/volume'
-require_relative './models/volume_template'
 require_relative './models/volume_configuration'
 require_relative './models/volume_image'
+require_relative './models/volume_template'
+require_relative './models/volume_create'
+require_relative './models/volume_image_create'
+require_relative './models/volume_template_create'
 require_relative './models/machine'
-require_relative './models/machine_template'
 require_relative './models/machine_configuration'
 require_relative './models/machine_image'
-require_relative './models/credential'
+require_relative './models/machine_image_create'
+require_relative './models/machine_template'
+require_relative './models/machine_template_create'
+require_relative './models/machine_create'
 require_relative './models/network_port'
 require_relative './models/network'
-require_relative './models/network_template'
 require_relative './models/network_configuration'
 require_relative './models/network_port_template'
 require_relative './models/network_port_configuration'
 require_relative './models/address'
 require_relative './models/address_template'
+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'

data/lib/cimi/models/address.rb

@@ -49,30 +49,6 @@ class CIMI::Model::Address < CIMI::Model::Base
     end
   end
 
-  def self.create(request_body, context, type)
-    input = (type == :xml)? XmlSimple.xml_in(request_body, {"ForceArray"=>false, "NormaliseSpace"=>2}) : JSON.parse(request_body)
-    if input['addressTemplate'] and input["addressTemplate"]["href"] #by reference
-      address_template = CIMI::Model::AddressTemplate.find(context.href_id(input["addressTemplate"]["href"], :address_templates), context)
-    else
-      case type
-        when :json
-          address_template = CIMI::Model::AddressTemplate.from_json(JSON.generate(input["addressTemplate"]))
-        when :xml
-          xml = XmlSimple.xml_in(request_body, {"NormaliseSpace"=>2})
-          address_template = CIMI::Model::AddressTemplate.from_xml(XmlSimple.xml_out(xml["addressTemplate"][0]))
-      end
-    end
-    params = {:name=>input["name"], :description=>input["description"], :address_template=>address_template, :env=>context }
-    raise CIMI::Model::BadRequest.new("Bad request - missing required parameters. Client sent: #{request_body} which produced #{params.inspect}")  if params.has_value?(nil)
-    address = context.driver.create_address(context.credentials, params)
-    result = from_address(address, context)
-    result.name = input['name'] if input['name']
-    result.description = input['description'] if input['description']
-    result.extract_properties!(input)
-    result.save
-    result
-  end
-
   def self.delete!(id, context)
     context.driver.delete_address(context.credentials, id)
     new(:id => id).destroy
@@ -86,16 +62,13 @@ class CIMI::Model::Address < CIMI::Model::Base
       :id => context.address_url(address.id),
       :description => "Address #{address.id}",
       :ip => address.id,
-      :allocation => "dynamic", #or "static"
-      :default_gateway => "unknown", #wtf
-      :dns => "unknown", #wtf
+      :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 #unknown
-      #optional:
-      #:hostname =>
-      #:
+      :network => nil
     )
   end
 

data/lib/cimi/models/address_create.rb

@@ -0,0 +1,51 @@
+# 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::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

@@ -17,20 +17,8 @@ class CIMI::Model::AddressTemplate < CIMI::Model::Base
 
   acts_as_root_entity
 
-  text :ip
-
-  text :hostname
-
-  text :allocation
-
-  text :default_gateway
-
-  text :dns
-
-  text :protocol
-
-  text :mask
-
+  text :ip, :required => true
+  text :hostname, :allocation, :default_gateway, :dns, :protocol, :mask
   href :network
 
   array :operations do
@@ -45,8 +33,8 @@ class CIMI::Model::AddressTemplate < CIMI::Model::Base
         current_db.address_templates.map { |t| from_db(t, context) }
       end
     else
-      if context.driver.respond_to? :address_template
-        context.driver.address_template(context.credentials, id, :env=>context)
+      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
@@ -55,41 +43,6 @@ class CIMI::Model::AddressTemplate < CIMI::Model::Base
     end
   end
 
-  def self.create_from_json(body, context)
-    json = JSON.parse(body)
-    new_template = current_db.add_address_template(
-      :name => json['name'],
-      :description => json['description'],
-      :hostname => json['hostname'],
-      :ip => json['ip'],
-      :allocation => json['allocation'],
-      :default_gateway => json['default_gateway'],
-      :dns => json['dns'],
-      :protocol => json['protocol'],
-      :mask => json['mask'],
-      :ent_properties => json['properties'] ? json['properties'].to_json : {}
-    )
-    from_db(new_template, context)
-  end
-
-  def self.create_from_xml(body, context)
-    xml = XmlSimple.xml_in(body)
-    xml['property'] ||= []
-    new_template = current_db.add_address_template(
-      :name => xml['name'].first,
-      :description => xml['description'].first,
-      :ip => xml['ip'].first,
-      :hostname => xml['hostname'].first,
-      :allocation => xml['allocation'].first,
-      :default_gateway => xml['default_gateway'].first,
-      :dns => xml['dns'].first,
-      :protocol => xml['protocol'].nil? ? nil : xml['protocol'].first,
-      :mask => xml['mask'].first,
-      :ent_properties => xml['property'] ? JSON::dump(xml['property'].inject({}) { |r, p| r[p['key']]=p['content']; r }) : {}
-    )
-    from_db(new_template, context)
-  end
-
   def self.delete!(id, context)
     current_db.address_templates.first(:id => id).destroy
   end
@@ -110,7 +63,10 @@ class CIMI::Model::AddressTemplate < CIMI::Model::Base
       :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' }
+        {
+          :href => context.destroy_address_template_url(model.id),
+          :rel => 'http://schemas.dmtf.org/cimi/1/action/delete'
+        }
       ]
     )
   end

data/lib/cimi/models/address_template_create.rb

@@ -0,0 +1,44 @@
+# 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::AddressTemplateCreate < CIMI::Model::Base
+
+  text :ip, :required => true
+  text :hostname, :required => true
+  text :allocation, :required => true
+  text :default_gateway, :required => true
+  text :dns, :required => true
+  text :protocol, :required => true
+  text :mask, :required => true
+
+  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

@@ -28,12 +28,22 @@ require_relative '../helpers/database_helper'
 #
 #   class Machine < CIMI::Model::Base
 #     text :status
-#     href :meter
+#     collection :meters
 #     array :volumes do
-#       scalar :href, :attachment_point, :protocol
+#       scalar :href, :initial_location
 #     end
+#     ref :latest_snapshot, CIMI::Model::MachineImage
 #   end
 #
+#   class SystemTemplate < CIMI::Model::Base
+#     array component_descriptors do
+#       text :name
+#       ...
+#     end
+#     array :meter_templates, :ref => CIMI::Model::MeterTemplate
+#   end
+#
+#
 # The DSL automatically takes care of converting identifiers from their
 # underscored form to the camel-cased form used by CIMI. The above class
 # can be used in the following way:
@@ -42,7 +52,7 @@ require_relative '../helpers/database_helper'
 #   if machine.status == "UP"
 #     ...
 #   end
-#   sda = machine.volumes.find { |v| v.attachment_point == "/dev/sda" }
+#   sda = machine.volumes.find { |v| v.initial_location == "/dev/sda" }
 #   handle_meter(machine.meter.href)
 #
 # The keywords for the DSL are
@@ -60,19 +70,43 @@ require_relative '../helpers/database_helper'
 #     A shorthand for +struct name { scalar :href }+; in JSON, this is
 #     represented as +{ name: { "href": string } }+, and in XML as +<name
 #     href="..."/>+
+#   [ref(name, [klass])]
+#     A reference to another object, like the reference to the
+#     MachineConfiguration in a MachineTemplate. If +klass+ is not given,
+#     an attempt is made to infer the class of the target of the reference
+#     from +name+
 #   [struct(name, opts, &block)]
 #     A structured subobject; the block defines the schema of the
 #     subobject. The +:content+ option can be used to specify the attribute
 #     that should receive the content of the corresponding XML element
-#   [array(name, opts, &block)]
-#     An array of structured subobjects; the block defines the schema of
-#     the subobjects.
+#   [array(name, opts, &block)] An array of structured subobjects; the
+#     block defines the schema of the subobjects. If the entries are
+#     references to other resources, instead of passing a block, pass the
+#     class of the target of the references with the +:ref+ option
 #   [collection(name, opts)]
 #     A collection of associated objects; use the +:class+ option to
 #     specify the type of the collection entries
 
 module CIMI::Model
 
+  class ValidationError < StandardError
+
+    def initialize(attr_list, format)
+      @lst = attr_list
+      super("Required attributes not set: #{name}")
+    end
+
+    # Report the ValidationError as HTTP 400 - Bad Request
+    def code
+      400
+    end
+
+    def name
+      @lst.join(',')
+    end
+
+  end
+
   class Base < Resource
 
     # Extend the base model with database methods
@@ -135,6 +169,10 @@ module CIMI::Model
       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