occi-api 4.1.1 → 4.2.0.beta.2

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

@@ -132,7 +132,7 @@ module Occi
         end
 
         it "lists all available mixins" do
-          @client.get_mixins.should include(
+          @client.list_mixins.should include(
             "http://occi.localhost:3300/occi/infrastructure/resource_tpl#large",
             "http://occi.localhost:3300/occi/infrastructure/resource_tpl#extra_large",
             "http://occi.localhost:3300/occi/infrastructure/resource_tpl#medium",
@@ -142,78 +142,94 @@ module Occi
         end
 
         it "lists os_tpl mixins" do
-          @client.get_mixins("os_tpl").should eq ["http://occi.localhost:3300/occi/infrastructure/os_tpl#mytesttemplate"]
+          mixins = Occi::Core::Mixins.new
+          mixins << Occi::Core::Mixin.new("http://occi.localhost:3300/occi/infrastructure/os_tpl#", "mytesttemplate")
+
+          expect(@client.get_mixins("os_tpl")).to eq mixins
+          expect(@client.get_os_tpls).to eq mixins
         end
 
         it "lists resource_tpl mixins" do
-          @client.get_mixins("resource_tpl").should include(
-            "http://occi.localhost:3300/occi/infrastructure/resource_tpl#large",
-            "http://occi.localhost:3300/occi/infrastructure/resource_tpl#extra_large",
-            "http://occi.localhost:3300/occi/infrastructure/resource_tpl#medium",
-            "http://occi.localhost:3300/occi/infrastructure/resource_tpl#small"
-          )
+          mixins = Occi::Core::Mixins.new
+          mixins << Occi::Core::Mixin.new("http://occi.localhost:3300/occi/infrastructure/resource_tpl#", "large")
+          mixins << Occi::Core::Mixin.new("http://occi.localhost:3300/occi/infrastructure/resource_tpl#", "extra_large")
+          mixins << Occi::Core::Mixin.new("http://occi.localhost:3300/occi/infrastructure/resource_tpl#", "medium")
+          mixins << Occi::Core::Mixin.new("http://occi.localhost:3300/occi/infrastructure/resource_tpl#", "small")
+
+          expect(@client.get_mixins("resource_tpl")).to eq mixins
+          expect(@client.get_resource_tpls).to eq mixins
         end
 
         it "describes compute resources" do
           cmpts = @client.describe("compute")
 
           cmpts.length.should eq 1
-          cmpts.first.resources.first.attributes['occi.core.id'].should eq('c62fce01-0d8e-510c-ba07-973b0d6d5034')
-          cmpts.first.resources.first.attributes['occi.core.title'].should eq('one-3')
-          cmpts.first.resources.first.attributes['occi.compute.cores'].should eq(2)
-          cmpts.first.resources.first.attributes['org.opennebula.compute.cpu'].should eq(2.0)
-          cmpts.first.resources.first.attributes['occi.compute.memory'].should eq(1.564)
+          cmpts.first.attributes['occi.core.id'].should eq('c62fce01-0d8e-510c-ba07-973b0d6d5034')
+          cmpts.first.attributes['occi.core.title'].should eq('one-3')
+          cmpts.first.attributes['occi.compute.cores'].should eq(2)
+          cmpts.first.attributes['org.opennebula.compute.cpu'].should eq(2.0)
+          cmpts.first.attributes['occi.compute.memory'].should eq(1.564)
         end
 
         it "describes network resources" do
           nets = @client.describe "network"
 
           nets.length.should eq 1
-          nets.first.resources.first.attributes['occi.core.id'].should eq('1e8e0d63-e3c8-5be7-8a46-f4df226bca01')
-          nets.first.resources.first.attributes['occi.core.title'].should eq('private')
-          nets.first.resources.first.attributes['occi.network.allocation'].should eq('dynamic')
-          nets.first.resources.first.attributes['org.opennebula.network.id'].should eq("1")
+          nets.first.attributes['occi.core.id'].should eq('1e8e0d63-e3c8-5be7-8a46-f4df226bca01')
+          nets.first.attributes['occi.core.title'].should eq('private')
+          nets.first.attributes['occi.network.allocation'].should eq('dynamic')
+          nets.first.attributes['org.opennebula.network.id'].should eq("1")
         end
 
         it "describes storage resources" do
           stors = @client.describe "storage"
 
           stors.length.should eq 2
-          stors.last.resources.first.attributes['occi.core.id'].should eq('5c1a7099-859e-5c3d-9386-740edbb610b8')
-          stors.last.resources.first.attributes['occi.core.title'].should eq('ttylinux - VMware ')
-          stors.last.resources.first.attributes['occi.storage.state'].should eq('online')
-          stors.last.resources.first.attributes['org.opennebula.storage.id'].should eq("4")
+          stors.to_a.last.attributes['occi.core.id'].should eq('5c1a7099-859e-5c3d-9386-740edbb610b8')
+          stors.to_a.last.attributes['occi.core.title'].should eq('ttylinux - VMware ')
+          stors.to_a.last.attributes['occi.storage.state'].should eq('online')
+          stors.to_a.last.attributes['org.opennebula.storage.id'].should eq("4")
 
-          stors.first.resources.first.attributes['occi.core.id'].should eq('32fc6c92-88aa-54dc-b814-be0df741278e')
+          stors.first.attributes['occi.core.id'].should eq('32fc6c92-88aa-54dc-b814-be0df741278e')
+        end
+
+        it "describes all available mixins" do
+          @client.get_mixins.should include(
+            Occi::Core::Mixin.new("http://occi.localhost:3300/occi/infrastructure/resource_tpl#", "large"),
+            Occi::Core::Mixin.new("http://occi.localhost:3300/occi/infrastructure/resource_tpl#", "extra_large"),
+            Occi::Core::Mixin.new("http://occi.localhost:3300/occi/infrastructure/resource_tpl#", "medium"),
+            Occi::Core::Mixin.new("http://occi.localhost:3300/occi/infrastructure/resource_tpl#", "small"),
+            Occi::Core::Mixin.new("http://occi.localhost:3300/occi/infrastructure/os_tpl#", "mytesttemplate")
+          )
         end
 
         it "finds and describes unscoped mixin" do
-          mxn = @client.find_mixin('mytesttemplate', nil, true)
+          mxn = @client.get_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
-          mxn = @client.find_mixin('mytesttemplate', "os_tpl", true)
+          mxn = @client.get_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
-          mxn = @client.find_mixin('large', "resource_tpl", true)
+          mxn = @client.get_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 = @client.get_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 = @client.get_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
+          expect{ @client.get_mixin('blablabla', 'blabla', true) }.to raise_error
         end
 
         it "creates a new compute resource"
@@ -240,6 +256,14 @@ module Occi
           @client.refresh
         end
 
+        it 'looks up a mixin type identifier for os_tpl' do
+          expect(@client.get_mixin_type_identifier('os_tpl')).to eq "http://schemas.ogf.org/occi/infrastructure#os_tpl"
+        end
+
+        it 'looks up a mixin type identifier for resource_tpl' do
+          expect(@client.get_mixin_type_identifier('resource_tpl')).to eq "http://schemas.ogf.org/occi/infrastructure#resource_tpl"
+        end
+
       end
 
       context "using media type application/occi+json" do

data/spec/occi/api/dsl_spec.rb

@@ -10,12 +10,6 @@ module Occi
 
         end
 
-        context "using ClientAmqp" do
-
-          it "does something"
-
-        end
-
       end
   end
 end

data/spec/spec_helper.rb

@@ -1,13 +1,16 @@
 require 'rubygems'
-require 'occi-api'
 require 'vcr'
 
 # enable coverage reports
 if ENV['COVERAGE']
   require 'simplecov'
+
+  SimpleCov.add_filter "/spec/"
   SimpleCov.start
 end
 
+require 'occi-api'
+
 # enable VCR for HTTP/HTTPS connections
 # using RSPEC metadata integration;
 # this will automatically generate a named

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0.beta.2
+  prerelease: 6
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,204 +11,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: amqp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard-sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard-cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.9.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.9.3
 description: This gem provides ready-to-use client classes to simplify the integration
   of OCCI into your application
 email:
@@ -218,10 +71,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .rspec
+- .travis.yml
+- .yardopts
 - AUTHORS
 - Gemfile
 - LICENSE
@@ -229,33 +82,8 @@ files:
 - Rakefile
 - examples/dsl_example.rb
 - examples/x509auth_example.rb
-- features/cassettes/Create_an_OCCI_Resource/_http_http___141_5_99_69__text_plain_201_.yml
-- features/cassettes/Delete_an_OCCI_Resource/_http_http___141_5_99_69__text_plain_201_.yml
-- features/cassettes/Discovery_Interface/Retrieving_all_OCCI_Categories_supported_by_the_OCCI_Server/_http_http___141_5_99_69__application_json_200_.yml
-- features/cassettes/Discovery_Interface/Retrieving_all_OCCI_Categories_supported_by_the_OCCI_Server/_http_http___141_5_99_69__text_plain_200_.yml
-- features/cassettes/Discovery_Interface/Retrieving_all_OCCI_Categories_supported_by_the_OCCI_Server/_http_http___141_5_99_69__text_plain_200_action_.yml
-- features/cassettes/Miscellaneous_operation_on_an_OCCI_Resource/_http_http___141_5_99_69__text_plain_201_.yml
-- features/cassettes/Read_an_OCCI_Resource/_http_http___141_5_99_69__text_plain_201_.yml
-- features/cassettes/Update_an_OCCI_Resource/_http_http___141_5_99_69__text_plain_201_.yml
-- features/common/step_definitions/common_steps.rb
-- features/occi/core/create/create.feature
-- features/occi/core/create/step_definitions/create_steps.rb
-- features/occi/core/delete/delete.feature
-- features/occi/core/delete/step_definitions/delete_steps.rb
-- features/occi/core/discovery_interface/discovery_interface.feature
-- features/occi/core/discovery_interface/step_definitions/discovery_interface_steps.rb
-- features/occi/core/miscellaneous/miscellaneous.feature
-- features/occi/core/miscellaneous/step_definitions/miscellaneous_steps.rb
-- features/occi/core/read/read.feature
-- features/occi/core/read/step_definitions/read_steps.rb
-- features/occi/core/update/step_definitions/update_steps.rb
-- features/occi/core/update/update.feature
-- features/occi/infrastructure/create/create.feature
-- 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
 - lib/occi/api/client/errors.rb
@@ -279,6 +107,7 @@ files:
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/deletes_a_network_resource.yml
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/deletes_a_storage_resource.yml
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/deploys_an_instance_based_on_OVF_OVA_file.yml
+- spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/describes_all_available_mixins.yml
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/describes_compute_resources.yml
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/describes_network_resources.yml
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/describes_storage_resources.yml
@@ -306,6 +135,8 @@ 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/looks_up_a_mixin_type_identifier_for_os_tpl.yml
+- spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/looks_up_a_mixin_type_identifier_for_resource_tpl.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
@@ -314,7 +145,6 @@ files:
 - 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/httparty_fix_spec.rb
 - spec/occi/api/client/http/net_http_fix_spec.rb
@@ -327,25 +157,26 @@ files:
 homepage: https://github.com/gwdg/rOCCI-api
 licenses:
 - Apache License, Version 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: OCCI development library providing a high-level API
 test_files: []