occi-core 4.0.0.alpha.1

data/lib/occi/core/resources.rb

@@ -0,0 +1,14 @@
+module Occi
+  module Core
+    class Resources < Occi::Core::Entities
+
+      def create(*args)
+        resource       = Occi::Core::Resource.new(*args)
+        resource.model = @model
+        self << resource
+        resource
+      end
+
+    end
+  end
+end

data/lib/occi/core.rb

@@ -0,0 +1,31 @@
+require 'occi/core/properties'
+require 'occi/core/attribute'
+require 'occi/core/attributes'
+require 'occi/core/category'
+require 'occi/core/categories'
+require 'occi/core/related'
+require 'occi/core/kind'
+require 'occi/core/kinds'
+require 'occi/core/mixin'
+require 'occi/core/mixins'
+require 'occi/core/action'
+require 'occi/core/action_instance'
+require 'occi/core/actions'
+require 'occi/core/entities'
+require 'occi/core/entity'
+require 'occi/core/link'
+require 'occi/core/links'
+require 'occi/core/resource'
+require 'occi/core/resources'
+
+module Occi
+  module Core
+
+    extend Occi
+
+    def self.kinds
+      Occi::Core::Kinds.new << Occi::Core::Entity.kind << Occi::Core::Link.kind << Occi::Core::Resource.kind
+    end
+
+  end
+end

data/lib/occi/helpers/inspect.rb

@@ -0,0 +1,12 @@
+module Occi
+  module Helpers
+    module Inspect
+
+      # @return [String] json representation
+      def inspect
+        JSON.pretty_generate(JSON.parse(to_json))
+      end
+
+    end
+  end
+end

data/lib/occi/infrastructure/compute.rb

@@ -0,0 +1,122 @@
+module Occi
+  module Infrastructure
+    class Compute < Occi::Core::Resource
+
+      start = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/compute/action#',
+                                     term='start',
+                                     title='start compute instance'
+
+      stop = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/compute/action#',
+                                    term='stop',
+                                    title='stop compute instance'
+      stop.attributes['method'] = {:mutable => true,
+                                   :pattern => 'graceful|acpioff|poweroff',
+                                   :default => 'poweroff'}
+
+      restart = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/compute/action#',
+                                       term='restart',
+                                       title='restart compute instance'
+      restart.attributes['method'] = {:mutable => true,
+                                      :pattern => 'graceful|warm|cold',
+                                      :default => 'cold'}
+
+      suspend = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/compute/action#',
+                                       term='suspend',
+                                       title='suspend compute instance'
+      suspend.attributes['metod'] = {:mutable => true,
+                                     :pattern => 'hibernate|suspend',
+                                     :default => 'suspend'}
+
+      self.actions = Occi::Core::Actions.new << start << stop << restart << suspend
+
+      self.attributes = Occi::Core::Attributes.new
+      self.attributes['occi.compute.architecture'] = {:mutable => true,
+                                                      :pattern => 'x86|x64'}
+      self.attributes['occi.compute.cores'] = {:type => 'number',
+                                               :mutable => true}
+      self.attributes['occi.compute.hostname'] = {:mutable => true,
+                                                  :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.state'] = {:pattern => 'inactive|active|suspended|error',
+                                               :default => 'inactive'}
+
+      self.kind = Occi::Core::Kind.new scheme='http://schemas.ogf.org/occi/infrastructure#',
+                                       term='compute',
+                                       title = 'compute resource',
+                                       attributes=self.attributes,
+                                       related=Occi::Core::Related.new << Occi::Core::Resource.kind,
+                                       actions = self.actions,
+                                       location = '/compute/'
+
+      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
+
+      def architecture
+        @attributes.occi.compute.architecture if @attributes.occi.compute if @attributes.occi
+      end
+
+      def architecture=(architecture)
+        @attributes.occi!.compute!.architecture = architecture
+      end
+
+      def cores
+        @attributes.occi.compute.cores if @attributes.occi.compute if @attributes.occi
+      end
+
+      def cores=(cores)
+        @attributes.occi!.compute!.cores = cores
+      end
+
+      def hostname
+        @attributes.occi.compute.hostname if @attributes.occi.compute if @attributes.occi
+      end
+
+      def hostname=(hostname)
+        @attributes.occi!.compute!.hostname = hostname
+      end
+
+      def speed
+        @attributes.occi.compute.speed if @attributes.occi.compute if @attributes.occi
+      end
+
+      def speed=(speed)
+        @attributes.occi!.compute!.speed = speed
+      end
+
+      def memory
+        @attributes.occi.compute.memory if @attributes.occi.compute if @attributes.occi
+      end
+
+      def memory=(memory)
+        @attributes.occi!.compute!.memory = memory
+      end
+
+      def state
+        @attributes.occi.compute.state if @attributes.occi.compute if @attributes.occi
+      end
+
+      def state=(state)
+        @attributes.occi!.compute!.state = state
+      end
+
+      def storagelink(target, mixins=[], attributes=Occi::Core::Attributes.new)
+        link(target, Occi::Infrastructure::Storagelink.kind, mixins, attributes, rel=Occi::Infrastructure::Storage.type_identifier)
+      end
+
+      def networkinterface(target, mixins=[], attributes=Occi::Core::Attributes.new)
+        link(target, Occi::Infrastructure::Networkinterface.kind, mixins, attributes)
+      end
+
+      def storagelinks
+        @links.select { |link| link.kind == Occi::Infrastructure::Storagelink.kind }
+      end
+
+      def networkinterfaces
+        @links.select { |link| link.kind == Occi::Infrastructure::Networkinterface.kind }
+      end
+
+    end
+  end
+end

data/lib/occi/infrastructure/network/ipnetwork.rb

@@ -0,0 +1,27 @@
+module Occi
+  module Infrastructure
+    class Network
+      module Ipnetwork
+
+        mattr_accessor :attributes, :mixin
+
+        self.attributes = Occi::Core::Attributes.new
+        self.attributes['occi.network.address'] = {:mutable => true,
+                                                   :pattern => '(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?\\s*(\\/(\\d|\\d\\d|1[0-1]\\d|12[0-8]))$)|(^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/(\\d|[1-2]\\d|3[0-2]))$)'}
+        self.attributes['occi.network.gateway'] = {:mutable => true,
+                                                   :pattern => '(^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?\\s*)'}
+        self.attributes['occi.network.allocation'] = {:mutable => true,
+                                                      :pattern => 'dynamic|static'}
+
+        self.mixin = Occi::Core::Mixin.new scheme='http://schemas.ogf.org/occi/infrastructure/network#',
+                                           term='ipnetwork',
+                                           title='IP network mixin',
+                                           attributes=self.attributes,
+                                           related=Occi::Core::Related.new << Occi::Infrastructure::Network.kind,
+                                           actions=Occi::Core::Actions.new,
+                                           location='/mixins/ipnetwork/'
+
+      end
+    end
+  end
+end

data/lib/occi/infrastructure/network.rb

@@ -0,0 +1,107 @@
+module Occi
+  module Infrastructure
+    class Network < Occi::Core::Resource
+
+      up = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/network/action#',
+                                  term='up',
+                                  title='activate network'
+
+      down = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/network/action#',
+                                    term='down',
+                                    title='deactivate network'
+
+      self.actions = Occi::Core::Actions.new << up << down
+
+      self.attributes = Occi::Core::Attributes.new
+      self.attributes['occi.network.vlan'] = {:type => 'number',
+                                              :mutable => true,
+                                              :pattern => 'x86|x64'}
+      self.attributes['occi.network.label'] = {:type => 'number',
+                                               :mutable => true}
+      self.attributes['occi.network.state'] ={:pattern => 'active|inactive|error',
+                                              :default => 'inactive'}
+
+      self.kind = Occi::Core::Kind.new scheme='http://schemas.ogf.org/occi/infrastructure#',
+                                       term='network',
+                                       title = 'network resource',
+                                       attributes=self.attributes,
+                                       related=Occi::Core::Related.new << Occi::Core::Resource.kind,
+                                       actions = self.actions,
+                                       location = '/network/'
+
+      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
+        else
+          mixins.delete Occi::Infrastructure::Network::Ipnetwork.mixin.type_identifier
+        end
+      end
+
+      def vlan
+        @attributes.occi.nework.vlan if @attributes.occi.network if @attributes.occi
+      end
+
+      def vlan=(vlan)
+        @attributes.occi!.network!.vlan = vlan
+      end
+
+      def label
+        @attributes.occi.nework.label if @attributes.occi.network if @attributes.occi
+      end
+
+      def label=(label)
+        @attributes.occi!.network!.label = label
+      end
+
+      def state
+        @attributes.occi.nework.state if @attributes.occi.network if @attributes.occi
+      end
+
+      def state=(state)
+        @attributes.occi!.network!.state = state
+      end
+
+      # IPNetwork Mixin attributes
+
+      def address
+        @attributes.occi.network.address if @attributes.occi.network if @attributes.occi
+      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
+        @attributes.occi!.network!.address = address
+      end
+
+      def gateway
+        @attributes.occi.network.gateway if @attributes.occi.network if @attributes.occi
+      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
+        @attributes.occi!.network!.gateway = gateway
+      end
+
+      def allocation
+        @attributes.occi.network.allocation if @attributes.occi.network if @attributes.occi
+      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
+        @attributes.occi!.network!.allocation = allocation
+      end
+
+    end
+  end
+end

data/lib/occi/infrastructure/networkinterface/ipnetworkinterface.rb

@@ -0,0 +1,27 @@
+module Occi
+  module Infrastructure
+    class Networkinterface
+      module Ipnetworkinterface
+
+        mattr_accessor :attributes, :mixin
+
+        self.attributes = Occi::Core::Attributes.new
+        self.attributes['occi.networkinterface.address'] = {:mutable => true,
+                                                            :pattern => '(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?\\s*(\\/(\\d|\\d\\d|1[0-1]\\d|12[0-8]))$)|(^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/(\\d|[1-2]\\d|3[0-2]))$)'}
+        self.attributes['occi.networkinterface.gateway'] = {:mutable => true,
+                                                            :pattern => '(^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?\\s*)'}
+        self.attributes['occi.networkinterface.allocation'] = {:mutable => true,
+                                                               :pattern => 'dynamic|static'}
+
+        self.mixin = Occi::Core::Mixin.new scheme='http://schemas.ogf.org/occi/infrastructure/networkinterface#',
+                                           term='ipnetworkinterface',
+                                           title='IP network interface mixin',
+                                           attributes=self.attributes,
+                                           related=Occi::Core::Related.new << Occi::Infrastructure::Networkinterface.kind,
+                                           actions=Occi::Core::Actions.new,
+                                           location='/mixins/ipnetworkinterface/'
+
+      end
+    end
+  end
+end

data/lib/occi/infrastructure/networkinterface.rb

@@ -0,0 +1,103 @@
+module Occi
+  module Infrastructure
+    class Networkinterface < Occi::Core::Link
+
+      up = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/networkinterface/action#',
+                                  term='up',
+                                  title='activate networkinterface'
+
+      down = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/networkinterface/action#',
+                                    term='down',
+                                    title='deactivate networkinterface'
+
+      self.actions = Occi::Core::Actions.new << up << down
+
+      self.attributes = Occi::Core::Attributes.new
+      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})$'}
+      self.attributes['occi.networkinterface.state'] = {:pattern => 'active|inactive|error',
+                                                        :default => 'inactive'}
+
+      self.kind = Occi::Core::Kind.new scheme='http://schemas.ogf.org/occi/infrastructure#',
+                                       term='networkinterface',
+                                       title = 'networkinterface link',
+                                       attributes = self.attributes,
+                                       related = Occi::Core::Related.new << Occi::Core::Link.kind,
+                                       actions = self.actions,
+                                       location = '/networkinterface/'
+
+      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
+        else
+          mixins.delete Occi::Infrastructure::Networkinterface::Ipnetworkinterface.type_identifier
+        end
+      end
+
+      def interface
+        @attributes.occi.networkinterface.interface if @attributes.occi.networkinterface if @attributes.occi
+      end
+
+      def interface=(interface)
+        @attributes.occi!.networkinterface!.interface = interface
+      end
+
+      def mac
+        @attributes.occi.networkinterface.mac if @attributes.occi.networkinterface if @attributes.occi
+      end
+
+      def mac=(mac)
+        @attributes.occi!.networkinterface!.mac = mac
+      end
+
+      def state
+        @attributes.occi.networkinterface.state if @attributes.occi.networkinterface if @attributes.occi
+      end
+
+      def state=(state)
+        @attributes.occi!.networkinterface!.state = state
+      end
+
+      def address
+        @attributes.occi.networkinterface.address if @attributes.occi.networkinterface if @attributes.occi
+      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
+        @attributes.occi!.networkinterface!.address = address
+      end
+
+      def gateway
+        @attributes.occi.networkinterface.gateway if @attributes.occi.networkinterface if @attributes.occi
+      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
+        @attributes.occi!.networkinterface!.gateway = gateway
+      end
+
+      def allocation
+        @attributes.occi.networkinterface.allocation if @attributes.occi.networkinterface if @attributes.occi
+      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
+        @attributes.occi!.networkinterface!.allocation = allocation
+      end
+
+    end
+  end
+end

data/lib/occi/infrastructure/os_tpl.rb

@@ -0,0 +1,19 @@
+module Occi
+  module Infrastructure
+    module Os_tpl
+
+      mattr_accessor :attributes, :mixin
+
+      self.attributes = Occi::Core::Attributes.new
+
+      self.mixin = Occi::Core::Mixin.new scheme='http://schemas.ogf.org/occi/infrastructure#',
+                                         term='os_tpl',
+                                         title='operating system template',
+                                         attributes=self.attributes,
+                                         related=Occi::Core::Categories.new << Occi::Infrastructure::Compute.kind,
+                                         actions=Occi::Core::Actions.new,
+                                         location='/mixins/os_tpl/'
+    end
+
+  end
+end

data/lib/occi/infrastructure/resource_tpl.rb

@@ -0,0 +1,19 @@
+module Occi
+  module Infrastructure
+    module Resource_tpl
+
+      mattr_accessor :attributes, :mixin
+
+      self.attributes = Occi::Core::Attributes.new
+
+      self.mixin = Occi::Core::Mixin.new scheme='http://schemas.ogf.org/occi/infrastructure#',
+                                         term='resource_tpl',
+                                         title='resource template',
+                                         attributes=self.attributes,
+                                         related=Occi::Core::Categories.new << Occi::Infrastructure::Compute.kind,
+                                         actions=Occi::Core::Actions.new,
+                                         location='/mixins/resource_tpl/'
+    end
+
+  end
+end

data/lib/occi/infrastructure/storage.rb

@@ -0,0 +1,61 @@
+module Occi
+  module Infrastructure
+    class Storage < Occi::Core::Resource
+
+      online = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/storage/action#',
+                                      term='online',
+                                      title='activate storage'
+
+      offline = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/storage/action#',
+                                       term='offline',
+                                       title='deactivate storage'
+
+      backup = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/storage/action#',
+                                      term='backup',
+                                      title='backup storage'
+
+      snapshot = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/storage/action#',
+                                        term='snapshot',
+                                        title='snapshot storage'
+
+      resize = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/storage/action#',
+                                      term='resize',
+                                      title='resize storage'
+      resize.attributes['size'] = {:type => 'number',
+                                   :mutable => true}
+
+      self.actions = Occi::Core::Actions.new << online << offline << backup << snapshot << resize
+
+      self.attributes = Occi::Core::Attributes.new
+      self.attributes['occi.storage.size'] = {:type => 'number',
+                                              :mutable => true}
+      self.attributes['occi.storage.state'] = {:pattern => 'online|offline|backup|snapshot|resize|degraded',
+                                               :default => 'offline'}
+
+      self.kind = Occi::Core::Kind.new scheme='http://schemas.ogf.org/occi/infrastructure#',
+                                       term='storage',
+                                       title = 'storage resource',
+                                       attributes = self.attributes,
+                                       related = Occi::Core::Related.new << Occi::Core::Resource.kind,
+                                       actions = self.actions,
+                                       location = '/storage/'
+
+      def size
+        @attributes.occi.storage.size if @attributes.occi.storage if @attributes.occi
+      end
+
+      def size=(size)
+        @attributes.occi!.storage!.size = size
+      end
+
+      def state
+        @attributes.occi.storage.state if @attributes.occi.storage if @attributes.occi
+      end
+
+      def state=(state)
+        @attributes.occi!.storage!.state = state
+      end
+
+    end
+  end
+end

data/lib/occi/infrastructure/storagelink.rb

@@ -0,0 +1,56 @@
+module Occi
+  module Infrastructure
+    class Storagelink < Occi::Core::Link
+
+      online = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/storagelink/action#',
+                                      term='online',
+                                      title='activate storagelink'
+
+      offline = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/infrastructure/storagelink/action#',
+                                       term='offline',
+                                       title='deactivate storagelink'
+
+      self.actions = Occi::Core::Actions.new << online << offline
+
+      self.attributes = Occi::Core::Attributes.new
+      self.attributes['occi.storagelink.deviceid'] = {:mutable => true}
+      self.attributes['occi.storagelink.mountpoint'] = {:mutable => true}
+      self.attributes['occi.storagelink.state'] = {:pattern => 'active|inactive|error',
+                                                   :default => 'inactive'}
+
+      self.kind = Occi::Core::Kind.new scheme='http://schemas.ogf.org/occi/infrastructure#',
+                                       term='storagelink',
+                                       title = 'storage link',
+                                       attributes = self.attributes,
+                                       related = Occi::Core::Related.new << Occi::Core::Link.kind,
+                                       actions = self.actions,
+                                       location = '/storagelink/'
+
+
+      def deviceid
+        @attributes.occi.storagelink.deviceid if @attributes.occi.storagelink if @attributes.occi
+      end
+
+      def deviceid=(deviceid)
+        @attributes.occi!.storagelink!.deviceid = deviceid
+      end
+
+      def mountpoint
+        @attributes.occi.storagelink.mountpoint if @attributes.occi.storagelink if @attributes.occi
+      end
+
+      def mountpoint=(mountpoint)
+        @attributes.occi!.storagelink!.mountpoint = mountpoint
+      end
+
+      def state
+        @attributes.occi.storagelink.state if @attributes.occi.storagelink if @attributes.occi
+      end
+
+      def state=(state)
+        @attributes.occi!.storagelink!.state = state
+      end
+
+    end
+  end
+end

data/lib/occi/infrastructure.rb

@@ -0,0 +1,25 @@
+require 'occi/infrastructure/compute'
+require 'occi/infrastructure/storage'
+require 'occi/infrastructure/storagelink'
+require 'occi/infrastructure/network'
+require 'occi/infrastructure/networkinterface'
+
+module Occi
+  module Infrastructure
+
+    extend Occi
+
+    def self.kinds
+      Occi::Core::Kinds.new << Occi::Infrastructure::Compute.kind << Occi::Infrastructure::Storage.kind << Occi::Infrastructure::Network.kind << Occi::Infrastructure::Networkinterface.kind << Occi::Infrastructure::Storagelink.kind
+    end
+
+    def self.mixins
+      Occi::Infrastructure::Compute.mixins + Occi::Infrastructure::Storage.mixins + Occi::Infrastructure::Network.mixins + Occi::Infrastructure::Networkinterface.mixins + Occi::Infrastructure::Storagelink.mixins
+    end
+
+    def self.actions
+      Occi::Infrastructure::Compute.actions + Occi::Infrastructure::Storage.actions + Occi::Infrastructure::Network.actions + Occi::Infrastructure::Networkinterface.actions + Occi::Infrastructure::Storagelink.actions
+    end
+
+  end
+end