occi-api 4.1.1 → 4.2.0.beta.2

data/lib/occi/api/client/client_http.rb

@@ -145,11 +145,11 @@ module Occi
             end
           end
 
-          descriptions = []
+          descriptions = Occi::Collection.new
 
           if resource_type_identifier.nil?
             # no filters, describe all available resources
-            descriptions << get('/')
+            descriptions.merge! get('/')
           elsif @model.get_by_id(resource_type_identifier)
             # we got type identifier
             # get all available resources of this type
@@ -157,16 +157,16 @@ module Occi
 
             # make the requests
             locations.each do |location|
-              descriptions << get(sanitize_resource_link(location))
+              descriptions.merge! get(sanitize_resource_link(location))
             end
           elsif resource_type_identifier.start_with?(@endpoint) || resource_type_identifier.start_with?('/')
             # this is a link of a specific resource (obsolute or relative)
-            descriptions << get(sanitize_resource_link(resource_type_identifier))
+            descriptions.merge! get(sanitize_resource_link(resource_type_identifier))
           else
             raise "Unkown resource type identifier! [#{resource_type_identifier}]"
           end
 
-          descriptions
+          descriptions.resources
         end
 
         # @see Occi::Api::Client::ClientBase
@@ -267,7 +267,7 @@ module Occi
 
           # encapsulate the acion in a collection
           collection = Occi::Collection.new
-          scheme, term = action.split(' #')
+          scheme, term = action.split('#')
           collection.actions << Occi::Core::Action.new(scheme + '#', term)
 
           # make the request

data/lib/occi/api/client/http/authn_plugins/keystone.rb

@@ -4,6 +4,8 @@ module Occi::Api::Client
 
       class Keystone < Base
 
+        KEYSTONE_URI_REGEXP = /^(Keystone|snf-auth) uri='(.+)'$/
+
         def setup(options = {})
           # get Keystone URL if possible, get unscoped token
           set_keystone_base_url
@@ -17,7 +19,8 @@ module Occi::Api::Client
         def authenticate(options = {})
           # OCCI-OS doesn't support HEAD method!
           response = @env_ref.class.get "#{@env_ref.endpoint}-/"
-          raise ::Occi::Api::Client::Errors::AuthnError, "Authentication failed with code #{response.code.to_s}!" unless response.success?
+          raise ::Occi::Api::Client::Errors::AuthnError,
+                "Authentication failed with code #{response.code.to_s}!" unless response.success?
         end
 
         private
@@ -27,16 +30,25 @@ module Occi::Api::Client
           Occi::Log.debug response.inspect
 
           return if response.success?
-          raise ::Occi::Api::Client::Errors::AuthnError, "Keystone AuthN failed with #{response.code.to_s}!" unless response.code == 401
+          raise ::Occi::Api::Client::Errors::AuthnError,
+                "Keystone AuthN failed with #{response.code.to_s}!" unless response.code == 401
+
+          process_headers(response)
+        end
+
+        def process_headers(response)
+          authN_header = response.headers['www-authenticate']
 
-          unless response.headers['www-authenticate'] && response.headers['www-authenticate'].start_with?('Keystone')
-            raise ::Occi::Api::Client::Errors::AuthnError, "Target endpoint is probably not OpenStack, fallback failed!"
+          if authN_header.blank?
+            raise ::Occi::Api::Client::Errors::AuthnError,
+                  "Response does not contain the www-authenticate header, fallback failed!"
           end
 
-          @keystone_url = /^Keystone uri='(.+)'$/.match(response.headers['www-authenticate'])[1]
-          raise ::Occi::Api::Client::Errors::AuthnError, "Unable to get Keystone's URL from the response!" unless @keystone_url
+          match = KEYSTONE_URI_REGEXP.match(authN_header)
+          raise ::Occi::Api::Client::Errors::AuthnError,
+                "Unable to get Keystone's URL from the response!" unless match && match[2]
 
-          @keystone_url = @keystone_url.chomp('/').chomp('/v2.0')
+          @keystone_url = match[2].chomp('/')
         end
 
         def set_auth_token(tenant = nil)
@@ -54,7 +66,8 @@ module Occi::Api::Client
           if response.success?
             @env_ref.class.headers['X-Auth-Token'] = response['access']['token']['id']
           else
-            raise ::Occi::Api::Client::Errors::AuthnError, "Unable to get a token from Keystone!"
+            raise ::Occi::Api::Client::Errors::AuthnError,
+                  "Unable to get a token from Keystone!"
           end
         end
 
@@ -71,7 +84,8 @@ module Occi::Api::Client
               }
             }
           else
-            raise ::Occi::Api::Client::Errors::AuthnError, "Unable to request a token from Keystone! Chosen AuthN not supported."
+            raise ::Occi::Api::Client::Errors::AuthnError,
+                  "Unable to request a token from Keystone! Chosen AuthN not supported."
           end
 
           body['auth']['tenantName'] = tenant if tenant && !tenant.empty?
@@ -90,9 +104,11 @@ module Occi::Api::Client
           Occi::Log.debug response.inspect
 
           # TODO: impl match with regexp in case of multiple tenants?
-          raise ::Occi::Api::Client::Errors::AuthnError, "Keystone didn't return any tenants!" unless response['tenants'] && response['tenants'].first
+          raise ::Occi::Api::Client::Errors::AuthnError,
+                "Keystone didn't return any tenants!" unless response['tenants'] && response['tenants'].first
           tenant = response['tenants'].first['name'] if response.success?
-          raise ::Occi::Api::Client::Errors::AuthnError, "Unable to get a tenant from Keystone!" unless tenant
+          raise ::Occi::Api::Client::Errors::AuthnError,
+                "Unable to get a tenant from Keystone!" unless tenant
 
           tenant
         end

data/lib/occi/api/dsl.rb

@@ -7,8 +7,6 @@ module Occi
         case protocol
         when :http 
           @client = Occi::Api::Client::ClientHttp.new(*args)
-        when :amqp
-          @client = Occi::Api::Client::ClientAmqp.new(*args)
         else
           raise "Protocol #{protocol.to_s} is not supported!"
         end
@@ -122,6 +120,12 @@ module Occi
         @client.get_mixins(*args)
       end
 
+      def mixin_list(*args)
+        check
+
+        @client.list_mixins(*args)
+      end
+
       def resource(*args)
         check
 
@@ -131,7 +135,7 @@ module Occi
       def mixin(*args)
         check
 
-        @client.find_mixin(*args)
+        @client.get_mixin(*args)
       end
 
       private

data/lib/occi/api/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Api
-    VERSION = "4.1.1" unless defined?(::Occi::Api::VERSION)
+    VERSION = "4.2.0.beta.2" unless defined?(::Occi::Api::VERSION)
   end
 end

data/occi-api.gemspec

@@ -15,24 +15,12 @@ Gem::Specification.new do |gem|
   gem.license       = 'Apache License, Version 2.0'
 
   gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'occi-core', '~> 4.1.0'
+  gem.add_dependency 'occi-core', '~> 4.2.0'
   gem.add_dependency 'httparty'
-  gem.add_dependency 'amqp'
   gem.add_dependency 'json'
 
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "builder"
-  gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "yard"
-  gem.add_development_dependency "yard-sinatra"
-  gem.add_development_dependency "yard-rspec"
-  gem.add_development_dependency "yard-cucumber"
-  gem.add_development_dependency "rspec-http"
-  gem.add_development_dependency "webmock", "~> 1.9.3"
-
   gem.required_ruby_version     = ">= 1.9.3"
 end

data/{features/cassettes/Create_an_OCCI_Resource/_http_http___141_5_99_69__text_plain_201_.yml → spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/describes_all_available_mixins.yml}

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: head
-    uri: http://141.5.99.69/
+    uri: https://localhost:3300/
     body:
       encoding: US-ASCII
       string: ''
@@ -15,11 +15,11 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Thu, 10 Jan 2013 13:52:01 GMT
+      - Thu, 10 Jan 2013 17:44:39 GMT
       Server:
-      - Apache/2.2.22 (Ubuntu)
+      - Apache/2.2.20 (Ubuntu)
       X-Powered-By:
-      - Phusion Passenger (mod_rails/mod_rack) 3.0.18
+      - Phusion Passenger (mod_rails/mod_rack) 3.0.12
       X-Frame-Options:
       - sameorigin
       X-Xss-Protection:
@@ -27,10 +27,12 @@ http_interactions:
       Accept:
       - application/occi+json,application/json,text/plain,text/uri-list,application/xml,text/xml,application/occi+xml,text/occi
       Set-Cookie:
-      - rack.session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFMDg3MzljYWY5NzIxY2VlOWE0NjI0%0AYTIxNWJlNjNmYzZmMTMxMzAxNDU2YzlkMGM1YjU0OWU1ZDFkNTZkYTE5Zkki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZGEzOWEz%0AZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGEzOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2%0AMDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--ddb37075ac62fd3bda55c7fc4c29d508530b1d5d;
+      - GRIDHTTP_PASSCODE=ec9b4b21351052e5aPTUJs; domain=localhost; path=/;
+        secure
+      - rack.session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFZTIyZmM5ZmI2OTliY2JiZWQyMjYz%0AN2IyNTQ3NjMyMDkxYTFkNWVhOGIwYjVkYTNhYTllMTYyYjdkZTZiMzhkY0ki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZGEzOWEz%0AZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGEzOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2%0AMDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--24c9906d0e0c02c6976b065151f161a7e299022a;
         path=/; HttpOnly
       Content-Length:
-      - '738'
+      - '294'
       Status:
       - '200'
       Vary:
@@ -41,27 +43,71 @@ http_interactions:
       encoding: US-ASCII
       string: ''
     http_version: 
-  recorded_at: Thu, 10 Jan 2013 13:52:41 GMT
+  recorded_at: Thu, 10 Jan 2013 17:44:39 GMT
+- request:
+    method: head
+    uri: https://localhost:3300/
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - text/plain,text/occi
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Thu, 10 Jan 2013 17:45:00 GMT
+      Server:
+      - Apache/2.2.20 (Ubuntu)
+      X-Powered-By:
+      - Phusion Passenger (mod_rails/mod_rack) 3.0.12
+      X-Frame-Options:
+      - sameorigin
+      X-Xss-Protection:
+      - 1; mode=block
+      Accept:
+      - application/occi+json,application/json,text/plain,text/uri-list,application/xml,text/xml,application/occi+xml,text/occi
+      Set-Cookie:
+      - GRIDHTTP_PASSCODE=e7c80271a9756b023j3EUq; domain=localhost; path=/;
+        secure
+      - rack.session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFZTI4MTVhNjc3ZTZlMmU4NWMzMzc0%0AOTljMDBjY2NhYzI0OWI1NzNmNGU0YzUwMzJjMzg2OTMyMzA5MDY1NmMwZEki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZGEzOWEz%0AZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGEzOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2%0AMDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--e366b080a1da7ae2f2d90e5b9dc777b7e656c47f;
+        path=/; HttpOnly
+      Content-Length:
+      - '294'
+      Status:
+      - '200'
+      Vary:
+      - Accept-Encoding
+      Content-Type:
+      - text/plain;charset=utf-8
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Thu, 10 Jan 2013 17:45:00 GMT
 - request:
     method: get
-    uri: http://141.5.99.69/-/
+    uri: https://localhost:3300/-/
     body:
       encoding: US-ASCII
       string: ''
     headers:
       Accept:
-      - text/plain
+      - text/plain,text/occi
   response:
     status:
       code: 200
       message: OK
     headers:
       Date:
-      - Thu, 10 Jan 2013 13:52:01 GMT
+      - Thu, 10 Jan 2013 17:45:00 GMT
       Server:
-      - Apache/2.2.22 (Ubuntu)
+      - Apache/2.2.20 (Ubuntu)
       X-Powered-By:
-      - Phusion Passenger (mod_rails/mod_rack) 3.0.18
+      - Phusion Passenger (mod_rails/mod_rack) 3.0.12
       X-Frame-Options:
       - sameorigin
       X-Xss-Protection:
@@ -69,10 +115,12 @@ http_interactions:
       Accept:
       - application/occi+json,application/json,text/plain,text/uri-list,application/xml,text/xml,application/occi+xml,text/occi
       Set-Cookie:
-      - rack.session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFNDQ2ZGUwN2IwNzRiNjM0ZTIxNGFh%0AMGRhMjUzZDRmY2ZjMDgwMTc1MjkzNjc2MGFhYTlkNmUzOWE4N2QyYjJmMEki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZGEzOWEz%0AZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGEzOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2%0AMDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--af7a5b05f9640950c2dd6dcd66eb00a201915e4c;
+      - GRIDHTTP_PASSCODE=2fbf4bc478532395flYvJS; domain=localhost; path=/;
+        secure
+      - rack.session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFZjY0YTEwZGYyZmRjZGFhMjkyNzUz%0AYTBjYzU4MTQzZTk0NWIxYzZhOWE4ZGU5ZjAzNjUwNjJlMjljNzg0YzM3Mkki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZGEzOWEz%0AZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGEzOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2%0AMDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--f36990ae38f52eee308f6a26714253f76c147e5b;
         path=/; HttpOnly
       Content-Length:
-      - '6397'
+      - '8975'
       Status:
       - '200'
       Vary:
@@ -96,57 +144,89 @@ http_interactions:
         http://schemas.ogf.org/occi/infrastructure/compute/action#stop http://schemas.ogf.org/occi/infrastructure/compute/action#restart
         http://schemas.ogf.org/occi/infrastructure/compute/action#suspend"
 
-        Category: networkinterface;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="Networkinterface";rel="http://schemas.ogf.org/occi/core#link";location="/networkinterface/";attributes="occi.networkinterface.interface
-        occi.networkinterface.mac occi.networkinterface.state"
+        Category: storagelink;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="Storage
+        Link";rel="http://schemas.ogf.org/occi/core#link";location="/storagelink/";attributes="occi.storagelink.deviceid
+        occi.storagelink.mountpoint occi.storagelink.state"
+
+        Category: network;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="Network
+        Resource";rel="http://schemas.ogf.org/occi/core#resource";location="/network/";attributes="occi.network.vlan
+        occi.network.label occi.network.state org.opennebula.network.id org.opennebula.network.bridge
+        org.opennebula.network.vlan org.opennebula.network.phydev org.opennebula.network.ip_start
+        org.opennebula.network.ip_end";actions="http://schemas.ogf.org/occi/infrastructure/network/action#up
+        http://schemas.ogf.org/occi/infrastructure/network/action#down"
 
         Category: storage;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="Storage
         Resource";rel="http://schemas.ogf.org/occi/core#resource";location="/storage/";attributes="occi.storage.size
-        occi.storage.state";actions="http://schemas.ogf.org/occi/infrastructure/storage/action#online
+        occi.storage.state org.opennebula.storage.id org.opennebula.storage.type org.opennebula.storage.persistent
+        org.opennebula.storage.dev_prefix org.opennebula.storage.bus org.opennebula.storage.driver
+        org.opennebula.storage.fstype";actions="http://schemas.ogf.org/occi/infrastructure/storage/action#online
         http://schemas.ogf.org/occi/infrastructure/storage/action#offline http://schemas.ogf.org/occi/infrastructure/storage/action#backup
         http://schemas.ogf.org/occi/infrastructure/storage/action#snapshot http://schemas.ogf.org/occi/infrastructure/storage/action#resize"
 
-        Category: network;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="Network
-        Resource";rel="http://schemas.ogf.org/occi/core#resource";location="/network/";attributes="occi.network.vlan
-        occi.network.label occi.network.state";actions="http://schemas.ogf.org/occi/infrastructure/network/action#up
-        http://schemas.ogf.org/occi/infrastructure/network/action#down"
+        Category: networkinterface;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="Networkinterface";rel="http://schemas.ogf.org/occi/core#link";location="/networkinterface/";attributes="occi.networkinterface.interface
+        occi.networkinterface.mac occi.networkinterface.state"
 
-        Category: storagelink;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="Storage
-        Link";rel="http://schemas.ogf.org/occi/core#link";location="/storagelink/";attributes="occi.storagelink.deviceid
-        occi.storagelink.mountpoint occi.storagelink.state"
+        Category: console;scheme="http://schemas.ogf.org/occi/infrastructure/compute#";class="kind";title="Link
+        to the VM''s console";rel="http://schemas.ogf.org/occi/core#link";location="/console/"
+
+        Category: os_tpl;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin";title="Operating
+        System Template";location="/mixins/os_tpl/"
 
         Category: ipnetwork;scheme="http://schemas.ogf.org/occi/infrastructure/network#";class="mixin";title="IP
         Network Mixin";location="/mixins/ipnetwork/";attributes="occi.network.address
         occi.network.gateway occi.network.allocation occi.network.state"
 
-        Category: resource_tpl;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin";title="Resource
-        Template";location="/mixins/resource_tpl/"
-
-        Category: os_tpl;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin";title="Operating
-        System Template";location="/mixins/os_tpl/"
-
         Category: ipnetworkinterface;scheme="http://schemas.ogf.org/occi/infrastructure/networkinterface#";class="mixin";title="IP
         Networkinterface Mixin";location="/mixins/ipnetworkinterface/";attributes="occi.networkinterface.address
         occi.networkinterface.gateway occi.networkinterface.allocation occi.networkinterface.state"
 
-        Category: my_os;scheme="http://my.occi.service/occi/infrastructure/os_tpl#";class="mixin";title="My
-        OS Template";rel="http://schemas.ogf.org/occi/infrastructure#os_tpl";location="/mixins/my_os/"
+        Category: resource_tpl;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin";title="Resource
+        Template";location="/mixins/resource_tpl/"
 
-        Category: large;scheme="http://my.occi.service/occi/infrastructure/resource_tpl#";class="mixin";title="Large
+        Category: compute;scheme="http://opennebula.org/occi/infrastructure#";class="mixin";title="OpenNebula
+        specific Compute attributes";location="/mixins/compute/";attributes="org.opennebula.compute.cpu
+        org.opennebula.compute.kernel org.opennebula.compute.initrd org.opennebula.compute.root
+        org.opennebula.compute.kernel_cmd org.opennebula.compute.bootloader org.opennebula.compute.boot"
+
+        Category: storagelink;scheme="http://opennebula.org/occi/infrastructure#";class="mixin";title="OpenNebula
+        specific Storagelink attributes";location="/mixins/storagelink/";attributes="org.opennebula.storagelink.bus
+        org.opennebula.storagelink.driver"
+
+        Category: network;scheme="http://opennebula.org/occi/infrastructure#";class="mixin";title="OpenNebula
+        specific Network attributes";location="/mixins/network/";attributes="org.opennebula.network.id
+        org.opennebula.network.bridge org.opennebula.network.vlan org.opennebula.network.phydev
+        org.opennebula.network.ip_start org.opennebula.network.ip_end"
+
+        Category: storage;scheme="http://opennebula.org/occi/infrastructure#";class="mixin";title="OpenNebula
+        specific Storage attributes";location="/mixins/storage/";attributes="org.opennebula.storage.id
+        org.opennebula.storage.type org.opennebula.storage.persistent org.opennebula.storage.dev_prefix
+        org.opennebula.storage.bus org.opennebula.storage.driver org.opennebula.storage.fstype"
+
+        Category: networkinterface;scheme="http://opennebula.org/occi/infrastructure#";class="mixin";title="OpenNebula
+        specific Networkinterface attributes";location="/mixins/networkinterface/";attributes="org.opennebula.networkinterface.bridge
+        org.opennebula.networkinterface.script org.opennebula.networkinterface.model
+        org.opennebula.networkinterface.white_ports_tcp org.opennebula.networkinterface.black_ports_tcp
+        org.opennebula.networkinterface.white_ports_udp org.opennebula.networkinterface.black_ports_udp
+        org.opennebula.networkinterface.icmp"
+
+        Category: large;scheme="http://occi.localhost:3300/occi/infrastructure/resource_tpl#";class="mixin";title="Large
         Instance";rel="http://schemas.ogf.org/occi/infrastructure#resource_tpl";location="/mixins/large/";attributes="occi.compute.architecture
         occi.compute.cores occi.compute.speed occi.compute.memory"
 
-        Category: small;scheme="http://my.occi.service/occi/infrastructure/resource_tpl#";class="mixin";title="Small
-        Instance";rel="http://schemas.ogf.org/occi/infrastructure#resource_tpl";location="/mixins/small/";attributes="occi.compute.architecture
+        Category: extra_large;scheme="http://occi.localhost:3300/occi/infrastructure/resource_tpl#";class="mixin";title="Extra
+        Large Instance";rel="http://schemas.ogf.org/occi/infrastructure#resource_tpl";location="/mixins/extra_large/";attributes="occi.compute.architecture
         occi.compute.cores occi.compute.speed occi.compute.memory"
 
-        Category: medium;scheme="http://my.occi.service/occi/infrastructure/resource_tpl#";class="mixin";title="Medium
+        Category: medium;scheme="http://occi.localhost:3300/occi/infrastructure/resource_tpl#";class="mixin";title="Medium
         Instance";rel="http://schemas.ogf.org/occi/infrastructure#resource_tpl";location="/mixins/medium/";attributes="occi.compute.architecture
         occi.compute.cores occi.compute.speed occi.compute.memory"
 
-        Category: extra_large;scheme="http://my.occi.service/occi/infrastructure/resource_tpl#";class="mixin";title="Extra
-        Large Instance";rel="http://schemas.ogf.org/occi/infrastructure#resource_tpl";location="/mixins/extra_large/";attributes="occi.compute.architecture
+        Category: small;scheme="http://occi.localhost:3300/occi/infrastructure/resource_tpl#";class="mixin";title="Small
+        Instance";rel="http://schemas.ogf.org/occi/infrastructure#resource_tpl";location="/mixins/small/";attributes="occi.compute.architecture
         occi.compute.cores occi.compute.speed occi.compute.memory"
 
+        Category: mytesttemplate;scheme="http://occi.localhost:3300/occi/infrastructure/os_tpl#";class="mixin";title="MyTestTemplate";rel="http://schemas.ogf.org/occi/infrastructure#os_tpl";location="/mixins/mytesttemplate/"
+
         Category: start;scheme="http://schemas.ogf.org/occi/infrastructure/compute/action#";class="action";title="Start
         Compute instance"
 
@@ -159,6 +239,12 @@ http_interactions:
         Category: suspend;scheme="http://schemas.ogf.org/occi/infrastructure/compute/action#";class="action";title="Suspend
         Compute instance";attributes="method"
 
+        Category: up;scheme="http://schemas.ogf.org/occi/infrastructure/network/action#";class="action";title="Activate
+        network"
+
+        Category: down;scheme="http://schemas.ogf.org/occi/infrastructure/network/action#";class="action";title="Activate
+        network"
+
         Category: online;scheme="http://schemas.ogf.org/occi/infrastructure/storage/action#";class="action";title="Activate
         Storage"
 
@@ -174,115 +260,7 @@ http_interactions:
         Category: resize;scheme="http://schemas.ogf.org/occi/infrastructure/storage/action#";class="action";title="Resize
         Storage";attributes="size"
 
-        Category: up;scheme="http://schemas.ogf.org/occi/infrastructure/network/action#";class="action";title="Activate
-        network"
-
-        Category: down;scheme="http://schemas.ogf.org/occi/infrastructure/network/action#";class="action";title="Activate
-        network"
-
-'
-    http_version: 
-  recorded_at: Thu, 10 Jan 2013 13:52:41 GMT
-- request:
-    method: get
-    uri: http://141.5.99.69/
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - text/plain
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Date:
-      - Tue, 12 Mar 2013 13:29:42 GMT
-      Server:
-      - Apache/2.2.22 (Ubuntu)
-      X-Powered-By:
-      - Phusion Passenger (mod_rails/mod_rack) 3.0.18
-      X-Frame-Options:
-      - sameorigin
-      X-Xss-Protection:
-      - 1; mode=block
-      Accept:
-      - application/occi+json,application/json,text/plain,text/uri-list,application/xml,text/xml,application/occi+xml,text/occi
-      Set-Cookie:
-      - rack.session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFNjFhMGNmNzdmMDUyOWRmMTBlNWRj%0AOGM2NjE0YWZmMGJjZTYxNDliYjY1OTVhM2E0MjcwNmJiMzJiM2Y2MjY1N0ki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZGEzOWEz%0AZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGEzOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2%0AMDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--c0f98b65169ac2a7e9b2849d1315a7649a2c4e32;
-        path=/; HttpOnly
-      Content-Length:
-      - '738'
-      Status:
-      - '200'
-      Vary:
-      - Accept-Encoding
-      Content-Type:
-      - text/plain;charset=utf-8
-    body:
-      encoding: US-ASCII
-      string: ! 'X-OCCI-Location:  http://141.5.99.69/compute/48e7c51c-5a7d-11e2-a300-fa163e16d22f
-
-        X-OCCI-Location:  http://141.5.99.69/compute/6c706278-5a7d-11e2-a300-fa163e16d22f
-
-        X-OCCI-Location:  http://141.5.99.69/compute/7582ffc4-5a7d-11e2-a300-fa163e16d22f
-
-        X-OCCI-Location:  http://141.5.99.69/compute/8eb0deb2-5a7d-11e2-a300-fa163e16d22f
-
-        X-OCCI-Location:  http://141.5.99.69/compute/8efa93e0-5a7d-11e2-a300-fa163e16d22f
-
-        X-OCCI-Location:  http://141.5.99.69/compute/49cbeaee-5b1d-11e2-a300-fa163e16d22f
-
-        X-OCCI-Location:  http://141.5.99.69/compute/c87fa76c-5b1e-11e2-a300-fa163e16d22f
-
-        X-OCCI-Location:  http://141.5.99.69/compute/1cc544b2-5b1f-11e2-a300-fa163e16d22f
-
-        X-OCCI-Location:  http://141.5.99.69/compute/38e2a6b2-5b1f-11e2-a300-fa163e16d22f
-
 '
     http_version: 
-  recorded_at: Tue, 12 Mar 2013 13:29:35 GMT
-- request:
-    method: head
-    uri: http://141.5.99.69/
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - text/plain
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Date:
-      - Tue, 12 Mar 2013 15:27:53 GMT
-      Server:
-      - Apache/2.2.22 (Ubuntu)
-      X-Powered-By:
-      - Phusion Passenger (mod_rails/mod_rack) 3.0.18
-      X-Frame-Options:
-      - sameorigin
-      X-Xss-Protection:
-      - 1; mode=block
-      Accept:
-      - application/occi+json,application/json,text/plain,text/uri-list,application/xml,text/xml,application/occi+xml,text/occi
-      Set-Cookie:
-      - rack.session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFOTdkZDQ1N2ZiYjdmMjE4NDgzNjMy%0AMzE0ZGI3YjRjOGIwZjMyNTY4ODRkZGVhNjE3NWM4OWI2MDRkNzJiMmFjOUki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZGEzOWEz%0AZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGEzOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2%0AMDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--222744ef8a6fa387cf796b175ba56ec13ea1fa93;
-        path=/; HttpOnly
-      Content-Length:
-      - '738'
-      Status:
-      - '200'
-      Vary:
-      - Accept-Encoding
-      Content-Type:
-      - text/plain;charset=utf-8
-    body:
-      encoding: US-ASCII
-      string: ''
-    http_version: 
-  recorded_at: Tue, 12 Mar 2013 15:27:46 GMT
+  recorded_at: Thu, 10 Jan 2013 17:45:00 GMT
 recorded_with: VCR 2.4.0