occi-core 4.1.3 → 4.2.0

data/lib/occi/errors/parser_type_error.rb

@@ -0,0 +1,5 @@
+module Occi
+  module Errors
+    class ParserTypeError < ArgumentError; end
+  end
+end

data/lib/occi/errors.rb

@@ -0,0 +1 @@
+Dir[File.join(File.dirname(__FILE__), 'errors', '*.rb')].each { |file| require file.gsub('.rb', '') }

data/lib/occi/extensions/hashie.rb

@@ -0,0 +1,25 @@
+##
+# Monkeypatch for Hashie
+module Hashie
+  class Hash
+
+    # Converts a mash back to a hash (with stringified keys)
+    def to_hash(options={})
+      out = {}
+      keys.each do |k|
+        if self[k].is_a?(Array)
+          k = options[:symbolize_keys] ? k.to_sym : k.to_s
+          out[k] ||= []
+          self[k].each do |array_object|
+            out[k] << (array_object.respond_to?(:to_hash) ? array_object.to_hash : array_object)
+          end
+        else
+          k = options[:symbolize_keys] ? k.to_sym : k.to_s
+          out[k] = self[k].respond_to?(:to_hash) ? self[k].to_hash : self[k]
+        end
+      end
+      out
+    end
+
+  end
+end

data/lib/occi/helpers/comparators/action_instance.rb

@@ -0,0 +1,22 @@
+module Occi
+  module Helpers
+    module Comparators
+      module ActionInstance
+
+        def ==(obj)
+          return false unless obj && obj.respond_to?(:action) && obj.respond_to?(:attributes)
+          (self.action == obj.action) && (self.attributes == obj.attributes)
+        end
+
+        def eql?(obj)
+          self == obj
+        end
+
+        def hash
+          [self.action, self.attributes].hash
+        end
+
+      end
+    end
+  end
+end

data/lib/occi/helpers/comparators/attributes.rb

@@ -0,0 +1,22 @@
+module Occi
+  module Helpers
+    module Comparators
+      module Attributes
+
+        def ==(obj)
+          return false unless obj && obj.respond_to?(:names)
+          self.names == obj.names
+        end
+
+        def eql?(obj)
+          self == obj
+        end
+
+        def hash
+          self.names.hash
+        end
+
+      end
+    end
+  end
+end

data/lib/occi/helpers/comparators/categories.rb

@@ -0,0 +1,22 @@
+module Occi
+  module Helpers
+    module Comparators
+      module Categories
+
+        def ==(obj)
+          return false unless obj && obj.respond_to?(:to_a)
+          self.to_a == obj.to_a
+        end
+
+        def eql?(obj)
+          self == obj
+        end
+
+        def hash
+          self.to_a.hash
+        end
+
+      end
+    end
+  end
+end

data/lib/occi/helpers/comparators/category.rb

@@ -0,0 +1,22 @@
+module Occi
+  module Helpers
+    module Comparators
+      module Category
+
+        def ==(obj)
+          return false unless obj && obj.respond_to?(:type_identifier)
+          self.type_identifier == obj.type_identifier
+        end
+
+        def eql?(obj)
+          self == obj
+        end
+
+        def hash
+          self.type_identifier.hash
+        end
+
+      end
+    end
+  end
+end

data/lib/occi/helpers/comparators/collection.rb

@@ -0,0 +1,40 @@
+module Occi
+  module Helpers
+    module Comparators
+      module Collection
+
+        REQUIRED_ACCESSORS = [:kinds, :mixins, :actions, :resources, :links, :action].freeze
+
+        def ==(obj)
+          return false unless obj && has_accessors?(obj)
+          contents_matches?(obj)
+        end
+
+        def eql?(obj)
+          self == obj
+        end
+
+        def hash
+          REQUIRED_ACCESSORS.collect { |accessor| self.send(accessor) }.hash
+        end
+
+        def has_accessors?(obj)
+          result = true
+          REQUIRED_ACCESSORS.each { |accessor| result = result && obj.respond_to?(accessor) }
+
+          result
+        end
+        private :has_accessors?
+
+        def contents_matches?(obj)
+          result = true
+          REQUIRED_ACCESSORS.each { |accessor| result = result && (self.send(accessor) == obj.send(accessor)) }
+
+          result
+        end
+        private :contents_matches?
+
+      end
+    end
+  end
+end

data/lib/occi/helpers/comparators/entities.rb

@@ -0,0 +1,22 @@
+module Occi
+  module Helpers
+    module Comparators
+      module Entities
+
+        def ==(obj)
+          return false unless obj && obj.respond_to?(:to_a)
+          self.to_a == obj.to_a
+        end
+
+        def eql?(obj)
+          self == obj
+        end
+
+        def hash
+          self.to_a.hash
+        end
+
+      end
+    end
+  end
+end

data/lib/occi/helpers/comparators/entity.rb

@@ -0,0 +1,22 @@
+module Occi
+  module Helpers
+    module Comparators
+      module Entity
+
+        def ==(obj)
+          return false unless obj && obj.respond_to?(:kind) && obj.respond_to?(:attributes)
+          (self.kind == obj.kind) && (self.attributes['occi.core.id'] == obj.attributes['occi.core.id'])
+        end
+
+        def eql?(obj)
+          self == obj
+        end
+
+        def hash
+          [self.kind, self.attributes['occi.core.id']].hash
+        end
+
+      end
+    end
+  end
+end

data/lib/occi/helpers/comparators/properties.rb

@@ -0,0 +1,26 @@
+module Occi
+  module Helpers
+    module Comparators
+      module Properties
+
+        def ==(obj)
+          return false unless obj && obj.respond_to?(:instance_variables)
+
+          local_attrs = self.instance_variables.map { |ivar| self.instance_variable_get ivar }
+          remote_attrs = obj.instance_variables.map { |ivar| obj.instance_variable_get ivar }
+
+          local_attrs == remote_attrs
+        end
+
+        def eql?(obj)
+          self == obj
+        end
+
+        def hash
+          self.instance_variables.map { |ivar| self.instance_variable_get ivar }.hash
+        end
+
+      end
+    end
+  end
+end

data/lib/occi/helpers/comparators.rb

@@ -0,0 +1 @@
+Dir[File.join(File.dirname(__FILE__), 'comparators', '*.rb')].each { |file| require file.gsub('.rb', '') }

data/lib/occi/infrastructure/compute.rb

@@ -29,7 +29,7 @@ module Occi
 
       self.actions = Occi::Core::Actions.new << start << stop << restart << suspend
 
-      self.attributes = Occi::Core::Attributes.new
+      self.attributes = Occi::Core::Attributes.new(Occi::Core::Resource.attributes)
       self.attributes['occi.compute.architecture'] = {:mutable => true,
                                                       :pattern => 'x86|x64'}
       self.attributes['occi.compute.cores'] = {:type => 'number',
@@ -38,6 +38,8 @@ module Occi
                                                   :pattern => '(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*'}
       self.attributes['occi.compute.memory'] = {:type => 'number',
                                                 :mutable => true}
+      self.attributes['occi.compute.speed'] = {:type => 'number',
+                                                :mutable => true}
       self.attributes['occi.compute.state'] = {:pattern => 'inactive|active|suspended|error',
                                                :default => 'inactive'}
 
@@ -51,10 +53,10 @@ module Occi
 
       require 'occi/infrastructure/resource_tpl'
       require 'occi/infrastructure/os_tpl'
-      self.mixins = Occi::Core::Mixins.new << Occi::Infrastructure::Resource_tpl.mixin << Occi::Infrastructure::Os_tpl.mixin
+      self.mixins = Occi::Core::Mixins.new << Occi::Infrastructure::ResourceTpl.mixin << Occi::Infrastructure::OsTpl.mixin
 
       def architecture
-        @attributes.occi.compute.architecture if @attributes.occi.compute if @attributes.occi
+        @attributes.occi_.compute_.architecture
       end
 
       def architecture=(architecture)
@@ -62,7 +64,7 @@ module Occi
       end
 
       def cores
-        @attributes.occi.compute.cores if @attributes.occi.compute if @attributes.occi
+        @attributes.occi_.compute_.cores
       end
 
       def cores=(cores)
@@ -70,7 +72,7 @@ module Occi
       end
 
       def hostname
-        @attributes.occi.compute.hostname if @attributes.occi.compute if @attributes.occi
+        @attributes.occi_.compute_.hostname
       end
 
       def hostname=(hostname)
@@ -78,7 +80,7 @@ module Occi
       end
 
       def speed
-        @attributes.occi.compute.speed if @attributes.occi.compute if @attributes.occi
+        @attributes.occi_.compute_.speed
       end
 
       def speed=(speed)
@@ -86,7 +88,7 @@ module Occi
       end
 
       def memory
-        @attributes.occi.compute.memory if @attributes.occi.compute if @attributes.occi
+        @attributes.occi_.compute_.memory
       end
 
       def memory=(memory)
@@ -94,7 +96,7 @@ module Occi
       end
 
       def state
-        @attributes.occi.compute.state if @attributes.occi.compute if @attributes.occi
+        @attributes.occi_.compute_.state
       end
 
       def state=(state)
@@ -119,4 +121,4 @@ module Occi
 
     end
   end
-end
+end

data/lib/occi/infrastructure/network.rb

@@ -12,13 +12,14 @@ module Occi
 
       self.actions = Occi::Core::Actions.new << up << down
 
-      self.attributes = Occi::Core::Attributes.new
+      self.attributes = Occi::Core::Attributes.new(Occi::Core::Resource.attributes)
       self.attributes['occi.network.vlan'] = {:type => 'number',
                                               :mutable => true,
-                                              :pattern => 'x86|x64'}
-      self.attributes['occi.network.label'] = {:type => 'number',
+                                              :pattern => '\d+'}
+      self.attributes['occi.network.label'] = {:type => 'string',
                                                :mutable => true}
-      self.attributes['occi.network.state'] ={:pattern => 'active|inactive|error',
+      self.attributes['occi.network.state'] ={:type => 'string',
+                                              :pattern => 'active|inactive|error',
                                               :default => 'inactive'}
 
       self.kind = Occi::Core::Kind.new scheme='http://schemas.ogf.org/occi/infrastructure#',
@@ -32,16 +33,18 @@ module Occi
       require 'occi/infrastructure/network/ipnetwork'
       self.mixins = Occi::Core::Mixins.new << Occi::Infrastructure::Network::Ipnetwork.mixin
 
-      def ipnetwork(boolean=true)
-        if boolean
-          mixins << Occi::Infrastructure::Network::Ipnetwork.mixin.type_identifier
+      def ipnetwork(add = true)
+        if add
+          Occi::Log.info "[#{self.class}] Adding mixin IPNetwork"
+          @mixins << Occi::Infrastructure::Network::Ipnetwork.mixin
         else
-          mixins.delete Occi::Infrastructure::Network::Ipnetwork.mixin.type_identifier
+          Occi::Log.info "[#{self.class}] Removing mixin IPNetwork"
+          @mixins.delete Occi::Infrastructure::Network::Ipnetwork.mixin
         end
       end
 
       def vlan
-        @attributes.occi.nework.vlan if @attributes.occi.network if @attributes.occi
+        @attributes.occi_.network_.vlan
       end
 
       def vlan=(vlan)
@@ -49,7 +52,7 @@ module Occi
       end
 
       def label
-        @attributes.occi.nework.label if @attributes.occi.network if @attributes.occi
+        @attributes.occi_.network_.label
       end
 
       def label=(label)
@@ -57,7 +60,7 @@ module Occi
       end
 
       def state
-        @attributes.occi.nework.state if @attributes.occi.network if @attributes.occi
+        @attributes.occi_.network_.state
       end
 
       def state=(state)
@@ -67,41 +70,38 @@ module Occi
       # IPNetwork Mixin attributes
 
       def address
-        @attributes.occi.network.address if @attributes.occi.network if @attributes.occi
+        @attributes.occi_.network_.address
       end
 
       def address=(address)
-        if @mixins.select { |mixin| mixin.kind_of? Occi::Infrastructure::Network::Ipnetwork }.empty?
-          Occi::Log.info 'Adding mixin IPNetwork mixin'
-          @mixins << Occi::Infrastructure::Network::Ipnetwork.new
-        end
+        add_ipnetwork_mixin
         @attributes.occi!.network!.address = address
       end
 
       def gateway
-        @attributes.occi.network.gateway if @attributes.occi.network if @attributes.occi
+        @attributes.occi_.network_.gateway
       end
 
       def gateway=(gateway)
-        if @mixins.select { |mixin| mixin.kind_of? Occi::Infrastructure::Network::Ipnetwork }.empty?
-          Occi::Log.info 'Adding mixin IP network'
-          @mixins << Occi::Infrastructure::Network::Ipnetwork.new
-        end
+        add_ipnetwork_mixin
         @attributes.occi!.network!.gateway = gateway
       end
 
       def allocation
-        @attributes.occi.network.allocation if @attributes.occi.network if @attributes.occi
+        @attributes.occi_.network_.allocation
       end
 
       def allocation=(allocation)
-        if @mixins.select { |mixin| mixin.kind_of? Occi::Infrastructure::Network::Ipnetwork }.empty?
-          Occi::Log.info 'Adding mixin IPNetwork mixin'
-          @mixins << Occi::Infrastructure::Network::Ipnetwork.new
-        end
+        add_ipnetwork_mixin
         @attributes.occi!.network!.allocation = allocation
       end
 
+      private
+
+      def add_ipnetwork_mixin
+        ipnetwork(true) if @mixins.select { |mixin| mixin.type_identifier == Occi::Infrastructure::Network::Ipnetwork.mixin.type_identifier }.empty?
+      end
+
     end
   end
-end
+end

data/lib/occi/infrastructure/networkinterface.rb

@@ -12,7 +12,7 @@ module Occi
 
       self.actions = Occi::Core::Actions.new << up << down
 
-      self.attributes = Occi::Core::Attributes.new
+      self.attributes = Occi::Core::Attributes.new(Occi::Core::Link.attributes)
       self.attributes['occi.networkinterface.interface'] ={:mutable => true}
       self.attributes['occi.networkinterface.mac'] = {:mutable => true,
                                                       :pattern => '^([0-9a-fA-F]{2}[:-]){5}([0-9a-fA-F]{2})$'}
@@ -30,16 +30,18 @@ module Occi
       require 'occi/infrastructure/networkinterface/ipnetworkinterface'
       self.mixins = Occi::Core::Mixins.new << Occi::Infrastructure::Networkinterface::Ipnetworkinterface.mixin
 
-      def ipnetworkinterface(boolean=true)
-        if boolean
-          @mixins << Occi::Infrastructure::Networkinterface::Ipnetworkinterface.type_identifier
+      def ipnetworkinterface(add = true)
+        if add
+          Occi::Log.info "[#{self.class}] Adding mixin IPNetworkInterface"
+          @mixins << Occi::Infrastructure::Networkinterface::Ipnetworkinterface.mixin
         else
-          mixins.delete Occi::Infrastructure::Networkinterface::Ipnetworkinterface.type_identifier
+          Occi::Log.info "[#{self.class}] Removing mixin IPNetworkInterface"
+          @mixins.delete Occi::Infrastructure::Networkinterface::Ipnetworkinterface.mixin
         end
       end
 
       def interface
-        @attributes.occi.networkinterface.interface if @attributes.occi.networkinterface if @attributes.occi
+        @attributes.occi_.networkinterface_.interface
       end
 
       def interface=(interface)
@@ -47,7 +49,7 @@ module Occi
       end
 
       def mac
-        @attributes.occi.networkinterface.mac if @attributes.occi.networkinterface if @attributes.occi
+        @attributes.occi_.networkinterface_.mac
       end
 
       def mac=(mac)
@@ -55,7 +57,7 @@ module Occi
       end
 
       def state
-        @attributes.occi.networkinterface.state if @attributes.occi.networkinterface if @attributes.occi
+        @attributes.occi_.networkinterface_.state
       end
 
       def state=(state)
@@ -63,41 +65,38 @@ module Occi
       end
 
       def address
-        @attributes.occi.networkinterface.address if @attributes.occi.networkinterface if @attributes.occi
+        @attributes.occi_.networkinterface_.address
       end
 
       def address=(address)
-        if @mixins.select { |mixin| mixin.kind_of? Occi::Infrastructure::Networkinterface::Ipnetworkinterface }.empty?
-          Occi::Log.info 'Adding mixin IP network interface'
-          @mixins << Occi::Infrastructure::Networkinterface::Ipnetworkinterface.new
-        end
+        add_ipnetworkinterface_mixin
         @attributes.occi!.networkinterface!.address = address
       end
 
       def gateway
-        @attributes.occi.networkinterface.gateway if @attributes.occi.networkinterface if @attributes.occi
+        @attributes.occi_.networkinterface_.gateway
       end
 
       def gateway=(gateway)
-        if @mixins.select { |mixin| mixin.kind_of? Occi::Infrastructure::Networkinterface::Ipnetworkinterface }.empty?
-          Occi::Log.info 'Adding mixin IP network interface'
-          @mixins << Occi::Infrastructure::Networkinterface::Ipnetworkinterface.new
-        end
+        add_ipnetworkinterface_mixin
         @attributes.occi!.networkinterface!.gateway = gateway
       end
 
       def allocation
-        @attributes.occi.networkinterface.allocation if @attributes.occi.networkinterface if @attributes.occi
+        @attributes.occi_.networkinterface_.allocation
       end
 
       def allocation=(allocation)
-        if @mixins.select { |mixin| mixin.kind_of? Occi::Infrastructure::Networkinterface::Ipnetworkinterface }.empty?
-          Occi::Log.info 'Adding mixin IP network interface'
-          @mixins << Occi::Infrastructure::Networkinterface::Ipnetworkinterface.new
-        end
+        add_ipnetworkinterface_mixin
         @attributes.occi!.networkinterface!.allocation = allocation
       end
 
+      private
+
+      def add_ipnetworkinterface_mixin
+        ipnetworkinterface(true) if @mixins.select { |mixin| mixin.type_identifier == Occi::Infrastructure::Networkinterface::Ipnetworkinterface.mixin.type_identifier }.empty?
+      end
+
     end
   end
 end

data/lib/occi/infrastructure/os_tpl.rb

@@ -1,6 +1,6 @@
 module Occi
   module Infrastructure
-    module Os_tpl
+    module OsTpl
 
       mattr_accessor :attributes, :mixin
 

data/lib/occi/infrastructure/resource_tpl.rb

@@ -1,6 +1,6 @@
 module Occi
   module Infrastructure
-    module Resource_tpl
+    module ResourceTpl
 
       mattr_accessor :attributes, :mixin
 

data/lib/occi/infrastructure/storage.rb

@@ -26,9 +26,10 @@ module Occi
 
       self.actions = Occi::Core::Actions.new << online << offline << backup << snapshot << resize
 
-      self.attributes = Occi::Core::Attributes.new
+      self.attributes = Occi::Core::Attributes.new(Occi::Core::Resource.attributes)
       self.attributes['occi.storage.size'] = {:type => 'number',
-                                              :mutable => true}
+                                              :mutable => true,
+                                              :pattern => '\d+' }
       self.attributes['occi.storage.state'] = {:pattern => 'online|offline|backup|snapshot|resize|degraded',
                                                :default => 'offline'}
 
@@ -41,15 +42,15 @@ module Occi
                                        location = '/storage/'
 
       def size
-        @attributes.occi.storage.size if @attributes.occi.storage if @attributes.occi
+        @attributes.occi_.storage_['size']
       end
 
       def size=(size)
-        @attributes.occi!.storage!.size = size
+        @attributes.occi!.storage!['size'] = size
       end
 
       def state
-        @attributes.occi.storage.state if @attributes.occi.storage if @attributes.occi
+        @attributes.occi_.storage_.state
       end
 
       def state=(state)
@@ -58,4 +59,4 @@ module Occi
 
     end
   end
-end
+end

data/lib/occi/infrastructure/storagelink.rb

@@ -12,7 +12,7 @@ module Occi
 
       self.actions = Occi::Core::Actions.new << online << offline
 
-      self.attributes = Occi::Core::Attributes.new
+      self.attributes = Occi::Core::Attributes.new(Occi::Core::Link.attributes)
       self.attributes['occi.storagelink.deviceid'] = {:mutable => true}
       self.attributes['occi.storagelink.mountpoint'] = {:mutable => true}
       self.attributes['occi.storagelink.state'] = {:pattern => 'active|inactive|error',
@@ -28,7 +28,7 @@ module Occi
 
 
       def deviceid
-        @attributes.occi.storagelink.deviceid if @attributes.occi.storagelink if @attributes.occi
+        @attributes.occi_.storagelink_.deviceid
       end
 
       def deviceid=(deviceid)
@@ -36,7 +36,7 @@ module Occi
       end
 
       def mountpoint
-        @attributes.occi.storagelink.mountpoint if @attributes.occi.storagelink if @attributes.occi
+        @attributes.occi_.storagelink_.mountpoint
       end
 
       def mountpoint=(mountpoint)
@@ -44,7 +44,7 @@ module Occi
       end
 
       def state
-        @attributes.occi.storagelink.state if @attributes.occi.storagelink if @attributes.occi
+        @attributes.occi_.storagelink_.state
       end
 
       def state=(state)