deltacloud-core 1.0.4 → 1.0.5

data/Rakefile

@@ -199,8 +199,8 @@ namespace :test do
         t.loader = :testrb
       end
       t.test_files = FileList[
-        'tests/cimi/spec/cimi/model/*spec.rb',        # CIMI frontend serialization API tests
-        'tests/cimi/collections/*test.rb',        # CIMI frontend API tests
+        'tests/cimi/model/*spec.rb',            # CIMI frontend serialization API tests
+        'tests/cimi/collections/*test.rb',      # CIMI frontend API tests
       ]
     end
   end

data/config/drivers/aruba.yaml

@@ -2,7 +2,7 @@
 :aruba:
   :entrypoints:
     compute:
-      dc1: https://api.dc1.computing.cloud.it/WsEndUser/v1.7/WsEndUser.svc?wsdl
-      dc2: https://api.dc2.computing.cloud.it/WsEndUser/v1.7/WsEndUser.svc?wsdl
-      dc3: https://api.dc3.computing.cloud.it/WsEndUser/v1.7/WsEndUser.svc?wsdl
+      dc1: https://api.dc1.computing.cloud.it/WsEndUser/v2.0/WsEndUser.svc?wsdl
+      dc2: https://api.dc2.computing.cloud.it/WsEndUser/v2.0/WsEndUser.svc?wsdl
+      dc3: https://api.dc3.computing.cloud.it/WsEndUser/v2.0/WsEndUser.svc?wsdl
   :name: Aruba

data/deltacloud-core.gemspec

@@ -82,7 +82,7 @@ Gem::Specification.new do |s|
   # dependencies for various cloud providers:
 
   # RHEV-M and oVirt
-  s.add_dependency('rbovirt', '>=0.0.12')
+  s.add_dependency('rbovirt', '>=0.0.13')
 
   # Amazon EC2 S3
   s.add_dependency('aws', '>=2.5.4')
@@ -104,7 +104,7 @@ Gem::Specification.new do |s|
   s.add_dependency('uuidtools', '>= 2.1.1')
 
   # Openstack Compute and Object-Storage
-  s.add_dependency('openstack', '>= 1.0.4')
+  s.add_dependency('openstack', '>= 1.0.6')
 
   # Aruba Cloud
   s.add_dependency('savon', '>= 1.0.0')

data/lib/cimi/collections/address_templates.rb

@@ -22,9 +22,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :address_templates do
         description 'List all AddressTemplates in the AddressTemplateCollection'
-        param :CIMISelect, :string, :optional
         control do
-          address_templates = AddressTemplate.list(self).filter_by(params[:CIMISelect])
+          address_templates = AddressTemplate.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml {address_templates.to_xml}
             format.json {address_templates.to_json}

data/lib/cimi/collections/addresses.rb

@@ -24,9 +24,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :addresses do
         description 'List all Addresses in the AddressCollection'
-        param :CIMISelect, :string, :optional
         control do
-          addresses = Address.list(self).filter_by(params[:CIMISelect])
+          addresses = Address.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml {addresses.to_xml}
             format.json {addresses.to_json}

data/lib/cimi/collections/base.rb

@@ -47,7 +47,7 @@ module CIMI::Collections
       report_error
     end
 
-    error Deltacloud::ExceptionHandler::ValidationFailure do
+    error Deltacloud::Exceptions::ValidationFailure do
       report_error
     end
 

data/lib/cimi/collections/credentials.rb

@@ -23,9 +23,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :keys do
         description "List all machine admins"
-        param :CIMISelect,  :string,  :optional
         control do
-          credentials = Credential.list(self).filter_by(params[:CIMISelect])
+          credentials = Credential.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml { credentials.to_xml }
             format.json { credentials.to_json }
@@ -47,7 +46,7 @@ module CIMI::Collections
       operation :create, :with_capability => :create_key do
         description "Show specific machine admin"
         control do
-          if request.content_type.end_with?("+json")
+          if request.content_type.end_with?("json")
             new_admin = Credential.create_from_json(request.body.read, self)
           else
             new_admin = Credential.create_from_xml(request.body.read, self)

data/lib/cimi/collections/forwarding_group_templates.rb

@@ -21,9 +21,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :forwarding_groups do
         description 'List all ForwardingGroupTemplates in the ForwardingGroupTemplateCollection'
-        param :CIMISelect, :string, :optional
         control do
-          forwarding_group_templates = ForwardingGroupTemplate.list(self).filter_by(params[:CIMISelect])
+          forwarding_group_templates = ForwardingGroupTemplate.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml {forwarding_group_templates.to_xml}
             format.json {forwarding_group_templates.to_json}

data/lib/cimi/collections/forwarding_groups.rb

@@ -21,9 +21,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :forwarding_groups do
         description 'List all ForwardingGroups in the ForwardingGroupsCollection'
-        param :CIMISelect, :string, :optional
         control do
-          forwarding_groups = ForwardingGroup.list(self).filter_by(params[:CIMISelect])
+          forwarding_groups = ForwardingGroup.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml {forwarding_groups.to_xml}
             format.json {forwarding_groups.to_json}

data/lib/cimi/collections/machine_configurations.rb

@@ -22,10 +22,9 @@ module CIMI::Collections
       description 'List all machine configurations'
 
       operation :index, :with_capability => :hardware_profiles do
-        param :CIMISelect,  :string,  :optional
         description "List all machine configurations"
         control do
-          machine_configs = MachineConfiguration.list(self).filter_by(params[:CIMISelect])
+          machine_configs = MachineConfiguration.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml { machine_configs.to_xml }
             format.json { machine_configs.to_json }

data/lib/cimi/collections/machine_images.rb

@@ -23,9 +23,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :images do
         description "List all machine configurations"
-        param :CIMISelect,  :string,  :optional
         control do
-          machine_images = MachineImage.list(self).filter_by(params[:CIMISelect])
+          machine_images = MachineImage.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml { machine_images.to_xml }
             format.json { machine_images.to_json }

data/lib/cimi/collections/machines.rb

@@ -22,10 +22,9 @@ module CIMI::Collections
       description 'List all machine'
 
       operation :index, :with_capability => :instances do
-        param :CIMISelect,  :string,  :optional
         description "List all machines"
         control do
-          machines = Machine.list(self).filter_by(params[:CIMISelect])
+          machines = Machine.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml { machines.to_xml }
             format.json { machines.to_json }
@@ -47,12 +46,13 @@ module CIMI::Collections
       operation :create, :with_capability => :create_instance do
         description "Create a new Machine entity."
         control do
-          if request.content_type.end_with?("+json")
+          if request.content_type.end_with?("json")
             new_machine = Machine.create_from_json(request.body.read, self)
           else
             new_machine = Machine.create_from_xml(request.body.read, self)
           end
           status 201 # Created
+          headers 'Location' => new_machine.id
           respond_to do |format|
             format.json { new_machine.to_json }
             format.xml { new_machine.to_xml }
@@ -73,7 +73,7 @@ module CIMI::Collections
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
-          if request.content_type.end_with?("+json")
+          if request.content_type.end_with?("json")
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -90,7 +90,7 @@ module CIMI::Collections
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
-          if request.content_type.end_with?("+json")
+          if request.content_type.end_with?("json")
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -107,7 +107,7 @@ module CIMI::Collections
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
-          if request.content_type.end_with?("+json")
+          if request.content_type.end_with?("json")
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -123,7 +123,7 @@ module CIMI::Collections
         description "Retrieve the Machine's DiskCollection"
         param :id,          :string,    :required
         control do
-          disks = DiskCollection.default(params[:id], self)
+          disks = CIMI::Model::Disk.collection_for_instance(params[:id], self)
           respond_to do |format|
             format.json {disks.to_json}
             format.xml  {disks.to_xml}
@@ -150,7 +150,7 @@ module CIMI::Collections
         description "Attach CIMI Volume(s) to a machine."
         param :id,          :string,    :required
         control do
-          if request.content_type.end_with?("+json")
+          if request.content_type.end_with?("json")
             volumes_to_attach = Volume.find_to_attach_from_json(request.body.read, self)
           else
             volumes_to_attach = Volume.find_to_attach_from_xml(request.body.read, self)
@@ -167,7 +167,7 @@ module CIMI::Collections
         description "Detach CIMI Volume(s) from a machine."
         param :id,          :string,    :required
         control do
-          if request.content_type.end_with?("+json")
+          if request.content_type.end_with?("json")
             volumes_to_detach = Volume.find_to_attach_from_json(request.body.read, self)
           else
             volumes_to_detach = Volume.find_to_attach_from_xml(request.body.read, self)

data/lib/cimi/collections/network_configurations.rb

@@ -22,9 +22,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :network_configurations do
         description 'List all NetworkConfigurations'
-        param :CIMISelect, :string, :optional
         control do
-          network_configurations = NetworkConfiguration.list(self).filter_by(params[:CIMISelect])
+          network_configurations = NetworkConfiguration.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml { network_configurations.to_xml  }
             format.json { network_configurations.to_json }

data/lib/cimi/collections/network_port_configurations.rb

@@ -22,9 +22,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :network_port_configurations do
         description 'List all NetworkPortConfigurations in the NetworkPortConfigurationCollection'
-        param :CIMISelect, :string, :optional
         control do
-          net_port_configs = NetworkPortConfiguration.list(self).filter_by(params[:CIMISelect])
+          net_port_configs = NetworkPortConfiguration.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml {net_port_configs.to_xml}
             format.json {net_port_configs.to_json}

data/lib/cimi/collections/network_port_templates.rb

@@ -24,9 +24,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :network_port_templates do
         description 'List all NetworkPortTemplates in the NetworkPortTemplateCollection'
-        param :CIMISelect, :string, :optional
         control do
-          network_port_templates = NetworkPortTemplate.list(self).filter_by(params[:CIMISelect])
+          network_port_templates = NetworkPortTemplate.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml {network_port_templates.to_xml}
             format.json {network_port_templates.to_json}

data/lib/cimi/collections/network_ports.rb

@@ -24,9 +24,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :network_ports do
         description 'List all NetworkPorts in the NetworkPortCollection'
-        param :CIMISelect, :string, :optional
         control do
-          network_ports = NetworkPort.list(self).filter_by(params[:CIMISelect])
+          network_ports = NetworkPort.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml {network_ports.to_xml}
             format.json {network_ports.to_json}

data/lib/cimi/collections/network_templates.rb

@@ -22,9 +22,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :network_templates do
         description 'List all Network Templates in the NetworkTemplateCollection'
-        param :CIMISelect, :string, :optional
         control do
-          network_templates = NetworkTemplate.list(self).filter_by(params[:CIMISelect])
+          network_templates = NetworkTemplate.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml {network_templates.to_xml}
             format.json {network_templates.to_json}

data/lib/cimi/collections/networks.rb

@@ -23,9 +23,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :networks do
         description "List all Networks"
-        param :CIMISelect,  :string,  :optional
         control do
-          networks = Network.list(self).filter_by(params[:CIMISelect])
+          networks = Network.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml { networks.to_xml }
             format.json { networks.to_json }
@@ -125,7 +124,7 @@ module CIMI::Collections
         description "Retrieve the Network's NetworkPortCollection"
         param :id, :string, :required
         control do
-          network_ports = NetworkPortCollection.for_network(params[:id], self)
+          network_ports = NetworkPort.collection_for_network(params[:id], self)
           respond_to do |format|
             format.json {network_ports.to_json}
             format.xml  {network_ports.to_xml}

data/lib/cimi/collections/volume_configurations.rb

@@ -22,9 +22,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :storage_volumes do
         description "Get list all VolumeConfigurations"
-        param :CIMISelect,  :string,  :optional
         control do
-          volume_configuration = VolumeConfiguration.list(self).filter_by(params[:CIMISelect])
+          volume_configuration = VolumeConfiguration.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml { volume_configuration.to_xml }
             format.json { volume_configuration.to_json }

data/lib/cimi/collections/volume_images.rb

@@ -23,9 +23,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :storage_snapshots do
         description "List all volumes images"
-        param :CIMISelect,  :string,  :optional
         control do
-          volume_images = VolumeImage.list(self).filter_by(params[:CIMISelect])
+          volume_images = VolumeImage.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml { volume_images.to_xml }
             format.json { volume_images.to_json }

data/lib/cimi/collections/volumes.rb

@@ -22,9 +22,8 @@ module CIMI::Collections
 
       operation :index, :with_capability => :storage_volumes do
         description "List all volumes"
-        param :CIMISelect,  :string,  :optional
         control do
-          volumes = Volume.list(self).filter_by(params[:CIMISelect])
+          volumes = Volume.list(self).filter_by(params['$select'])
           respond_to do |format|
             format.xml { volumes.to_xml }
             format.json { volumes.to_json }
@@ -50,8 +49,8 @@ module CIMI::Collections
       operation :create 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
+          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)

data/lib/cimi/helpers/cimi_helper.rb

@@ -16,6 +16,11 @@
 module CIMI
   module Helper
 
+    def expand?(collection)
+      params['$expand'] == '*' ||
+        (params['$expand'] || '').split(',').include?(collection.to_s)
+    end
+
     def no_content_with_status(code=200)
       body ''
       status code
@@ -29,9 +34,9 @@ module CIMI
     def to_kibibyte(value, unit)
       case unit
       when "GB"
-        value*1024*1024
+        (value*1024*1024).to_i
       when "MB"
-        value*1024
+        (value*1024).to_i
       else
         nil # should probably be exploding something here...
       end

data/lib/cimi/models.rb

@@ -24,28 +24,24 @@ require_relative './models/base'
 require_relative './models/collection'
 require_relative './models/errors'
 require_relative './models/action'
-require_relative './models/disk'
-require_relative './models/disk_collection'
 require_relative './models/machine_volume'
-require_relative './models/machine_volume_collection'
+require_relative './models/disk'
 
-# 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/volume'
+require_relative './models/volume_template'
+require_relative './models/volume_configuration'
+require_relative './models/volume_image'
 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/volume'
-require_relative './models/volume_template'
-require_relative './models/volume_configuration'
-require_relative './models/volume_image'
+require_relative './models/network_port'
 require_relative './models/network'
 require_relative './models/network_template'
 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'

data/lib/cimi/models/base.rb

@@ -66,6 +66,9 @@ require 'json'
 #   [array(name, opts, &block)]
 #     An array of structured subobjects; the block defines the schema of
 #     the subobjects.
+#   [collection(name, opts)]
+#     A collection of associated objects; use the +:class+ option to
+#     specify the type of the collection entries
 
 module CIMI::Model
 
@@ -88,13 +91,15 @@ module CIMI::Model
 
 end
 
-class CIMI::Model::Base
+class CIMI::Model::Resource
 
   #
   # We keep the values of the attributes in a hash
   #
   attr_reader :attribute_values
 
+  CMWG_NAMESPACE = "http://schemas.dmtf.org/cimi/1"
+
   # Keep the list of all attributes in an array +attributes+; for each
   # attribute, we also define a getter and a setter to access/change the
   # value for that attribute
@@ -143,8 +148,8 @@ class CIMI::Model::Base
         base_schema.add_attributes!(names, attr_klass, &block)
       end
       names.each do |name|
-        define_method(name) { @attribute_values[name] }
-        define_method(:"#{name}=") { |newval| @attribute_values[name] = newval }
+        define_method(name) { self[name] }
+        define_method(:"#{name}=") { |newval| self[name] = newval }
       end
     end
 
@@ -161,14 +166,26 @@ class CIMI::Model::Base
   end
 
   def []=(a, v)
-    @attribute_values[a] = v
+    @attribute_values[a] = self.class.schema.convert(a, v)
+  end
+
+  # Prepare to serialize
+  def prepare
+    self.class.schema.collections.map { |coll| coll.name }.each do |n|
+      self[n].href = "#{self.id}/#{n}" unless self[n].href
+      self[n].id = "#{self.id}/#{n}" if !self[n].entries.empty?
+    end
   end
 
   #
   # Factory methods
   #
   def initialize(values = {})
-    @attribute_values = values
+    names = self.class.schema.attribute_names
+    @attribute_values = names.inject({}) do |hash, name|
+      hash[name] = self.class.schema.convert(name, values[name])
+      hash
+    end
   end
 
   # Construct a new object from the XML representation +xml+
@@ -205,13 +222,20 @@ class CIMI::Model::Base
     self.name.split("::").last
   end
 
+  def self.resource_uri
+    CMWG_NAMESPACE + "/" + self.name.split("::").last
+  end
+
   def self.to_json(model)
-    JSON::unparse(@schema.to_json(model))
+    json = @schema.to_json(model)
+    json[:resourceURI] = resource_uri
+    JSON::unparse(json)
   end
 
   def self.to_xml(model)
     xml = @schema.to_xml(model)
-    xml["xmlns"] = "http://schemas.dmtf.org/cimi/1"
+    xml["xmlns"] = CMWG_NAMESPACE
+    xml["resourceURI"] = resource_uri
     XmlSimple.xml_out(xml, :root_name => xml_tag_name)
   end
 
@@ -223,24 +247,6 @@ class CIMI::Model::Base
     self.class.to_xml(self)
   end
 
-  #
-  # Common attributes for all resources
-  #
-  text :id, :name, :description, :created
-
-  hash :property
-
-  def self.acts_as_root_entity(name=nil)
-    if name
-      name = name.to_s.camelize.pluralize
-    else
-      name = xml_tag_name.pluralize.uncapitalize
-    end
-    CIMI::Model.register_as_root_entity! name
-  end
-
-  def self.all(_self); find(:all, _self); end
-
   def filter_by(filter_opts)
     return self if filter_opts.nil?
     return filter_attributes(filter_opts.split(',').map{ |a| a.intern }) if filter_opts.include? ','
@@ -252,16 +258,6 @@ class CIMI::Model::Base
     end
   end
 
-  private
-
-  def filter_attributes(attr_list)
-    attrs = attr_list.inject({}) do |result, attr|
-      result[attr] = self.send(attr) if self.respond_to?(attr)
-      result
-    end
-    self.class.new(attrs)
-  end
-
   def filter_by_arr_index(attr, filter)
     return self unless self.respond_to?(attr)
     self.class.new(attr => [self.send(attr)[filter.to_i]])
@@ -273,3 +269,20 @@ class CIMI::Model::Base
     self.class.new(attr => self.send(attr)[filter])
   end
 end
+
+class CIMI::Model::Base < CIMI::Model::Resource
+  #
+  # Common attributes for all resources
+  #
+  text :id, :name, :description, :created
+
+  hash :property
+
+  def filter_attributes(attr_list)
+    attrs = attr_list.inject({}) do |result, attr|
+      result[attr] = self.send(attr) if self.respond_to?(attr)
+      result
+    end
+    self.class.new(attrs)
+  end
+end