occi 3.1.0.beta.1 → 3.1.0.beta.3

data/features/cassettes/Update_an_OCCI_Resource/_http_http___141_5_99_69__text_plain_201_.yml

@@ -183,4 +183,106 @@ http_interactions:
 '
     http_version: 
   recorded_at: Thu, 10 Jan 2013 13:52:44 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:44 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=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFZjhhYWFiY2M4NzI1YmM5ZDAxOTM4%0AOTlkMmY1YzQwMzIwNzU4NGZkMGI2MGQ4NTdjNTE3NjhjNzVmYTAzZGY0NEki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZGEzOWEz%0AZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGEzOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2%0AMDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--ed98c412bd15e6cbf4678ae0539ff96b547ab216;
+        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:36 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:55 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=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiJFOWIxY2FkNmM0ODZkY2U5MzllYTZk%0ANDY3ZjgwNzRjNmI1NjA5NGRhNjBkNWZlYzg2MTA4NTk1OTIwZmIxNmRkMEki%0ADXRyYWNraW5nBjsARnsISSIUSFRUUF9VU0VSX0FHRU5UBjsARiItZGEzOWEz%0AZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUND%0ARVBUX0VOQ09ESU5HBjsARiItZGEzOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2%0AMDE4OTBhZmQ4MDcwOUkiGUhUVFBfQUNDRVBUX0xBTkdVQUdFBjsARiItZGEz%0AOWEzZWU1ZTZiNGIwZDMyNTViZmVmOTU2MDE4OTBhZmQ4MDcwOQ%3D%3D%0A--b576238584753a3c874e52e73b6bb06a34881845;
+        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:48 GMT
 recorded_with: VCR 2.4.0

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

@@ -421,7 +421,11 @@ module Occi
           headers = self.class.headers.clone
           headers['Accept'] = 'text/uri-list'
 
-          self.class.get(@endpoint + path, :headers => headers).body.split("\n").compact
+          # TODO: remove the gsub OCCI-OS hack
+          response = self.class.get(
+            @endpoint + path,
+            :headers => headers
+          ).body.gsub(/\# uri:\/(compute|storage|network)\/[\n]?/, '').split("\n").compact
         end
 
         # Retrieves descriptions for available resources specified by a type
@@ -676,6 +680,7 @@ module Occi
             self.class.ssl_ca_file @auth_options[:ca_file] unless @auth_options[:ca_file].nil?
             self.class.ssl_extra_chain_cert AuthnUtils.certs_to_file_ary(@auth_options[:proxy_ca]) unless @auth_options[:proxy_ca].nil?
           when "keystone"
+            Occi::Log.warn "AuthN method 'keystone' is deprecated and you should use it only as a fall-back option!"
             # set up OpenStack Keystone token based auth
             raise ArgumentError, "Missing required option 'token' for OpenStack Keystone auth!" unless @auth_options[:token]
             self.class.headers['X-Auth-Token'] = @auth_options[:token]
@@ -942,8 +947,14 @@ module Occi
         #
         # @example
         #    set_model
+        #
+        # @return [Occi::Model]
         def set_model
 
+          # check credentials and handle OpenStack Keystone
+          # TODO: check expiration dates on Keystone tokens
+          raise "You are not authorized to use this endpoint!" unless check_authn
+
           #
           model = get('/-/')
           @model = Occi::Model.new(model)
@@ -955,13 +966,69 @@ module Occi
 
           #
           get_os_templates.each do |os_tpl|
-            @mixins[:os_tpl] << os_tpl.type_identifier unless os_tpl.nil? or os_tpl.type_identifier.nil?
+            unless os_tpl.nil? || os_tpl.type_identifier.nil?
+              tid = os_tpl.type_identifier.strip
+              @mixins[:os_tpl] << tid unless tid.empty?
+            end
           end
 
           #
           get_resource_templates.each do |res_tpl|
-            @mixins[:resource_tpl] << res_tpl.type_identifier unless res_tpl.nil? or res_tpl.type_identifier.nil?
+            unless res_tpl.nil? || res_tpl.type_identifier.nil?
+              tid = res_tpl.type_identifier.strip
+              @mixins[:resource_tpl] << tid unless tid.empty?
+            end
           end
+
+          model
+        end
+
+        # Checks provided credentials and attempts transparent
+        # authentication with OS Keystone using the "www-authenticate"
+        # header.
+        #
+        # @example
+        #    check_authn
+        #
+        # @return [true, false]
+        def check_authn
+          response = self.class.head @endpoint
+
+          return true if response.success?
+
+          if response.code == 401 && response.headers["www-authenticate"]
+            if response.headers["www-authenticate"].start_with? "Keystone"
+              keystone_uri = /^Keystone uri='(.+)'$/.match(response.headers["www-authenticate"])[1]
+
+              if keystone_uri
+                if @auth_options[:type] == "x509"
+                  body = { "auth" => { "voms" => true } }
+                else
+                  body = {
+                    "auth" => {
+                      "passwordCredentials" => {
+                        "username" => @auth_options[:username],
+                        "password" => @auth_options[:password]
+                      }
+                    }
+                  }
+                end
+
+                headers = self.class.headers.clone
+                headers['Content-Type'] = "application/json"
+                headers['Accept'] = headers['Content-Type']
+
+                response = self.class.post(keystone_uri + "/v2.0/tokens", :body => body.to_json, :headers => headers)
+
+                if response.success?
+                  self.class.headers['X-Auth-Token'] = response['access']['token']['id']
+                  return true
+                end
+              end
+            end
+          end
+
+          false
         end
 
         # Retrieves available os_tpls from the model.

data/lib/occi/bin/resource_output_factory.rb

@@ -57,7 +57,14 @@ module Occi
         file = File.expand_path("..", __FILE__) + '/templates/' + resource_type.to_s + ".erb"
         template = ERB.new File.new(file).read
 
-        template.result(binding)
+        formatted_output = ""
+
+        occi_resources.each do |occi_resource|
+          json_resource = occi_resource.as_json
+          formatted_output << template.result(binding) unless json_resource.nil? || json_resource.empty?
+        end
+
+        formatted_output
       end
 
       def self.locations_to_json(url_locations, resource_type)

data/lib/occi/bin/templates/compute.erb

@@ -1,22 +1,18 @@
-<%# We always get an array of OCCI::Collections %>
-Available COMPUTE resources:
-<% occi_resources.each do |occi_compute| %>
-  <% compute = occi_compute.as_json %>
-  COMPUTE resource "<%= compute.resources.first.attributes.occi.core.title %>":
-    ID:       <%= compute.resources.first.attributes.occi.core.id %>
-    TITLE:    <%= compute.resources.first.attributes.occi.core.title %>
-    STATE:    <%= compute.resources.first.attributes.occi.compute.state %>
-    LINKS:
-    <% if compute.links %><% compute.links.each do |link| %>
-      LINK "<%= link.attributes.occi.core.target.split("/")[1] %>":
-        ID:          <%= link.attributes.occi.core.id %>
-        TITLE:       <%= link.attributes.occi.core.title %>
-        TARGET:      <%= link.attributes.occi.core.target %>
-        <% if link.attributes.occi.networkinterface %>
-        IP ADDRESS:  <%= link.attributes.occi.networkinterface.address %>
-        MAC ADDRESS: <%= link.attributes.occi.networkinterface.mac %>
-        <% elsif link.attributes.occi.storagelink %>
-        MOUNT POINT: <%= link.attributes.occi.storagelink.deviceid %>
-        <% end %>
-    <% end %><% end %>
-<% end %>
+<%# We always get a JSON %>
+COMPUTE:
+  ID:       <%= json_resource.resources.first.attributes.occi.core.id %>
+  TITLE:    <%= json_resource.resources.first.attributes.occi.core.title %>
+  STATE:    <%= json_resource.resources.first.attributes.occi.compute.state %>
+  LINKS:
+  <% if json_resource.links %><% json_resource.links.each do |link| %>
+    LINK "<%= link.attributes.occi.core.target.split("/")[1] %>":
+      ID:          <%= link.attributes.occi.core.id %>
+      TITLE:       <%= link.attributes.occi.core.title %>
+      TARGET:      <%= link.attributes.occi.core.target %>
+      <% if link.attributes.occi.networkinterface %>
+      IP ADDRESS:  <%= link.attributes.occi.networkinterface.address %>
+      MAC ADDRESS: <%= link.attributes.occi.networkinterface.mac %>
+      <% elsif link.attributes.occi.storagelink %>
+      MOUNT POINT: <%= link.attributes.occi.storagelink.deviceid %>
+      <% end %>
+  <% end %><% end %>

data/lib/occi/bin/templates/network.erb

@@ -1,11 +1,9 @@
-<%# We always get an array of OCCI::Collections %>
-Available NETWORK resources:
-<% occi_resources.each do |occi_network| %>
-  <% network = occi_network.as_json %>
-  NETWORK resource "<%= network.resources.first.attributes.occi.core.title %>":
-    ID:           <%= network.resources.first.attributes.occi.core.id %>
-    TITLE:        <%= network.resources.first.attributes.occi.core.title %>
-    STATE:        <%= network.resources.first.attributes.occi.network.state %>
-    ALLOCATION:   <%= network.resources.first.attributes.occi.network.allocation %>
-    ADDRESS:      <%= network.resources.first.attributes.occi.network.address %>
-<% end %>
+<%# We always get a JSON %>
+NETWORK:
+  ID:           <%= json_resource.resources.first.attributes.occi.core.id %>
+  TITLE:        <%= json_resource.resources.first.attributes.occi.core.title %>
+  STATE:        <%= json_resource.resources.first.attributes.occi.network.state %>
+  ALLOCATION:   <%= json_resource.resources.first.attributes.occi.network.allocation %>
+  ADDRESS:      <%= json_resource.resources.first.attributes.occi.network.address %>
+
+

data/lib/occi/bin/templates/os_tpl.erb

@@ -1,9 +1,7 @@
-<%# We always get an array of OCCI::Collections %>
-Available OS templates:
-<% occi_resources.each do |occi_os_tpl| %>
-  <% os_tpl = occi_os_tpl.as_json %>
-  OS template "os_tpl#<%= os_tpl.term %>":
-    TITLE:        <%= os_tpl.title %>
-    TERM:         <%= os_tpl.term %>
-    LOCATION:     <%= os_tpl.location %>
-<% end %>
+<%# We always get a JSON %>
+OS_TPL:
+  TITLE:        <%= json_resource.title %>
+  TERM:         <%= json_resource.term %>
+  LOCATION:     <%= json_resource.location %>
+
+

data/lib/occi/bin/templates/resource_tpl.erb

@@ -1,9 +1,7 @@
-<%# We always get an array of OCCI::Collections %>
-Available RESOURCE templates:
-<% occi_resources.each do |occi_res_tpl| %>
-  <% res_tpl = occi_res_tpl.as_json %>
-  RESOURCE template "resource_tpl#<%= res_tpl.term %>":
-    TITLE:        <%= res_tpl.title %>
-    TERM:         <%= res_tpl.term %>
-    LOCATION:     <%= res_tpl.location %>
-<% end %>
+<%# We always get a JSON %>
+RESOURCE_TPL:
+  TITLE:        <%= json_resource.title %>
+  TERM:         <%= json_resource.term %>
+  LOCATION:     <%= json_resource.location %>
+
+

data/lib/occi/bin/templates/storage.erb

@@ -1,10 +1,8 @@
-<%# We always get an array of OCCI::Collections %>
-Available STORAGE resources:
-<% occi_resources.each do |occi_storage| %>
-  <% storage = occi_storage.as_json %>
-  STORAGE resource "<%= storage.resources.first.attributes.occi.core.title %>":
-    ID:           <%= storage.resources.first.attributes.occi.core.id %>
-    TITLE:        <%= storage.resources.first.attributes.occi.core.title %>
-    STATE:        <%= storage.resources.first.attributes.occi.storage.state%>
-    DESCRIPTION:  <%= storage.resources.first.attributes.occi.core.summary %>
-<% end %>
+<%# We always get a JSON %>
+STORAGE:
+  ID:           <%= json_resource.resources.first.attributes.occi.core.id %>
+  TITLE:        <%= json_resource.resources.first.attributes.occi.core.title %>
+  STATE:        <%= json_resource.resources.first.attributes.occi.storage.state%>
+  DESCRIPTION:  <%= json_resource.resources.first.attributes.occi.core.summary %>
+
+

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module Occi
-  VERSION = "3.1.0.beta.1" unless defined?(::Occi::VERSION)
+  VERSION = "3.1.0.beta.3" unless defined?(::Occi::VERSION)
 end

data/occi.gemspec

@@ -39,8 +39,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "yard-rspec"
   gem.add_development_dependency "yard-cucumber"
   gem.add_development_dependency "rspec-http"
-  gem.add_development_dependency "rubygems-tasks"
-  gem.add_development_dependency "webmock"
+  gem.add_development_dependency "webmock", "~>1.9.3"
 
   gem.required_ruby_version     = ">= 1.8.7"
 end

data/spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/creates_a_new_compute_resource.yml

@@ -1,5 +1,49 @@
 ---
 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/

data/spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/creates_a_new_network_resource.yml

@@ -1,5 +1,49 @@
 ---
 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/