occi-api 4.0.0.alpha.1 → 4.0.0.alpha.2

data/spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/returns_nil_when_looking_for_a_non-existent_mixin_of_a_specific_type.yml

@@ -0,0 +1,266 @@
+---
+http_interactions:
+- request:
+    method: head
+    uri: https://localhost:3300/
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - text/plain,text/occi;q=0.2
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Thu, 10 Jan 2013 17:44:39 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=ec9b4b21351052e5aPTUJs; domain=localhost; path=/;
+        secure
+      - rack.session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFZTIyZmM5ZmI2OTliY2JiZWQyMjYz%0AN2IyNTQ3NjMyMDkxYTFkNWVhOGIwYjVkYTNhYTllMTYyYjdkZTZiMzhkY0ki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZGEzOWEz%0AZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGEzOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2%0AMDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--24c9906d0e0c02c6976b065151f161a7e299022a;
+        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: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:23 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=d7c3abb1b0e7ed9fvhjCIQ; domain=localhost; path=/;
+        secure
+      - rack.session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFNmRmZGYwZjgwZTY0NDc5OGUyMjdm%0AMTM3MjlkNWMwOWIwNzhiNzU0YjAyYTg2YzE1M2EwNTUzNzk2OTA3ODg3Mkki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZGEzOWEz%0AZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGEzOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2%0AMDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--bcf3b29269a450e7b643e4d5405e53684c99e9f9;
+        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:23 GMT
+- request:
+    method: get
+    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:23 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=71a7332acbb36377l0DYiu; domain=localhost; path=/;
+        secure
+      - rack.session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFOGRmOGI1ODgwZTI2NzhkZWVjODFl%0AODAwOTMwZDkwMjc1NGNlN2MxZjg5NGI2YTZkNWVhOTE3Nzc1OTg1OTFiOUki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZGEzOWEz%0AZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGEzOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2%0AMDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--f141bb38b0aa273eea158df0b71202f4ecfa04cc;
+        path=/; HttpOnly
+      Content-Length:
+      - '8975'
+      Status:
+      - '200'
+      Vary:
+      - Accept-Encoding
+      Content-Type:
+      - text/plain;charset=utf-8
+    body:
+      encoding: US-ASCII
+      string: ! 'Category: entity;scheme="http://schemas.ogf.org/occi/core#";class="kind";title="Entity";location="/entity/";attributes="occi.core.id
+        occi.core.title"
+
+        Category: resource;scheme="http://schemas.ogf.org/occi/core#";class="kind";title="Resource";rel="http://schemas.ogf.org/occi/core#entity";location="/resource/";attributes="occi.core.summary"
+
+        Category: link;scheme="http://schemas.ogf.org/occi/core#";class="kind";title="Link";rel="http://schemas.ogf.org/occi/core#entity";location="/link/";attributes="occi.core.target
+        occi.core.source"
+
+        Category: compute;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="Compute
+        Resource";rel="http://schemas.ogf.org/occi/core#resource";location="/compute/";attributes="occi.compute.architecture
+        occi.compute.cores occi.compute.hostname occi.compute.speed occi.compute.memory
+        occi.compute.state";actions="http://schemas.ogf.org/occi/infrastructure/compute/action#start
+        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: 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 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: 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: 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: 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: resource_tpl;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin";title="Resource
+        Template";location="/mixins/resource_tpl/"
+
+        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: 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://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: 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"
+
+        Category: stop;scheme="http://schemas.ogf.org/occi/infrastructure/compute/action#";class="action";title="Stop
+        Compute instance";attributes="method"
+
+        Category: restart;scheme="http://schemas.ogf.org/occi/infrastructure/compute/action#";class="action";title="Restart
+        Compute instance";attributes="method"
+
+        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"
+
+        Category: offline;scheme="http://schemas.ogf.org/occi/infrastructure/storage/action#";class="action";title="Deactivate
+        Storage"
+
+        Category: backup;scheme="http://schemas.ogf.org/occi/infrastructure/storage/action#";class="action";title="Backup
+        Storage"
+
+        Category: snapshot;scheme="http://schemas.ogf.org/occi/infrastructure/storage/action#";class="action";title="Snapshot
+        Storage"
+
+        Category: resize;scheme="http://schemas.ogf.org/occi/infrastructure/storage/action#";class="action";title="Resize
+        Storage";attributes="size"
+
+'
+    http_version: 
+  recorded_at: Thu, 10 Jan 2013 17:45:24 GMT
+recorded_with: VCR 2.4.0

data/spec/occi/api/client/{http/authn_utils_spec.rb → authn_utils_spec.rb}

@@ -1,5 +1,5 @@
 require 'rspec'
-require 'occi/api/client/http/authn_utils'
+require 'occi/api/client/authn_utils'
 
 module Occi
   module Api

data/spec/occi/api/client/client_http_spec.rb

@@ -188,15 +188,32 @@ module Occi
         end
 
         it "finds and describes unscoped mixin" do
-          @client.find_mixin('mytesttemplate', nil, true)
+          mxn = @client.find_mixin('mytesttemplate', nil, true)
+          mxn.type_identifier.should eq 'http://occi.localhost:3300/occi/infrastructure/os_tpl#mytesttemplate'
         end
 
         it "finds and describes scoped os_tpl mixin" do
-          @client.find_mixin('mytesttemplate', "os_tpl", true)
+          mxn = @client.find_mixin('mytesttemplate', "os_tpl", true)
+          mxn.type_identifier.should eq 'http://occi.localhost:3300/occi/infrastructure/os_tpl#mytesttemplate'
         end
 
         it "finds and describes scoped resource_tpl mixin" do
-          @client.find_mixin('large', "resource_tpl", true)
+          mxn = @client.find_mixin('large', "resource_tpl", true)
+          mxn.type_identifier.should eq 'http://occi.localhost:3300/occi/infrastructure/resource_tpl#large'
+        end
+
+        it "returns nil when looking for a non-existent mixin" do
+          mxn = @client.find_mixin('blablabla', nil, true)
+          mxn.should be_nil
+        end
+
+        it "returns nil when looking for a non-existent mixin of a specific type" do
+          mxn = @client.find_mixin('blablabla', 'os_tpl', true)
+          mxn.should be_nil
+        end
+
+        it "raises an error when looking for a non-existent mixin type" do
+          expect{ @client.find_mixin('blablabla', 'blabla', true) }.to raise_error
         end
 
         it "creates a new compute resource"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha.1
+  version: 4.0.0.alpha.2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-core
@@ -285,6 +285,7 @@ files:
 - features/occi/infrastructure/create/step_definitions/create_steps.rb
 - features/support/env.rb
 - lib/occi-api.rb
+- lib/occi/api/client/authn_utils.rb
 - lib/occi/api/client/client_amqp.rb
 - lib/occi/api/client/client_base.rb
 - lib/occi/api/client/client_http.rb
@@ -297,7 +298,6 @@ files:
 - lib/occi/api/client/http/authn_plugins/dummy.rb
 - lib/occi/api/client/http/authn_plugins/keystone.rb
 - lib/occi/api/client/http/authn_plugins/x509.rb
-- lib/occi/api/client/http/authn_utils.rb
 - lib/occi/api/client/http/httparty_fix.rb
 - lib/occi/api/client/http/net_http_fix.rb
 - lib/occi/api/dsl.rb
@@ -337,23 +337,27 @@ files:
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_os_tpl_mixins.yml
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_resource_tpl_mixins.yml
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_storage_resources.yml
+- spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/raises_an_error_when_looking_for_a_non-existent_mixin_type.yml
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/refreshes_its_model.yml
+- spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/returns_nil_when_looking_for_a_non-existent_mixin.yml
+- spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/returns_nil_when_looking_for_a_non-existent_mixin_of_a_specific_type.yml
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/triggers_an_action_on_a_compute_resource.yml
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/triggers_an_action_on_a_network_resource.yml
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/triggers_an_action_on_a_storage_resource.yml
+- spec/occi/api/client/authn_utils_spec.rb
 - spec/occi/api/client/client_amqp_spec.rb
 - spec/occi/api/client/client_http_spec.rb
-- spec/occi/api/client/http/authn_utils_spec.rb
 - spec/occi/api/client/http/httparty_fix_spec.rb
 - spec/occi/api/client/http/net_http_fix_spec.rb
-- spec/occi/api/client/http/rocci-cred-cert.pem
-- spec/occi/api/client/http/rocci-cred-key-jruby.pem
-- spec/occi/api/client/http/rocci-cred-key.pem
-- spec/occi/api/client/http/rocci-cred.p12
+- spec/occi/api/client/rocci-cred-cert.pem
+- spec/occi/api/client/rocci-cred-key-jruby.pem
+- spec/occi/api/client/rocci-cred-key.pem
+- spec/occi/api/client/rocci-cred.p12
 - spec/occi/api/dsl_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/gwdg/rOCCI-api
-licenses: []
+licenses:
+- Apache License, Version 2.0
 post_install_message: 
 rdoc_options: []
 require_paths: