occi 1.1.0 → 1.2.0

data/.autotest

@@ -0,0 +1,21 @@
+Autotest.add_hook(:initialize) do |at|
+  at.testlib = 'minitest/spec'
+  %w{.git .svn .hg .swp .DS_Store ._* tmp}.each do |exception|
+    at.add_exception(exception)
+  end
+
+  at.clear_mappings
+  tests = %r%^test/lib/.*_test\.rb$%
+
+  at.add_mapping(%r%^lib/(.*)\.rb$%) do |_, m|
+    ["test/lib/#{m[1]}_test.rb"]
+  end
+
+  at.add_mapping(tests) do |filename, _|
+    filename
+  end
+
+  at.add_mapping(%r%^test/.*\.rb$%) do
+    at.files_matching tests
+  end
+end

data/Gemfile

@@ -5,10 +5,11 @@ gem "hugs", "~> 2.2.0"
 gem "multipart-post", "~> 1.0.1"
 gem "nokogiri", "~> 1.4.4"
 
-group :development do
+group :development, :test do
   gem "rake"
   gem "jeweler", "~> 1.5.1"
   gem "webmock", "~> 1.6.1"
   gem "vcr", "~> 1.4.0"
   gem "minitest", "~> 2.0.0"
+  gem "ZenTest", "~> 4.4.2"
 end

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    ZenTest (4.4.2)
     addressable (2.2.2)
     crack (0.1.8)
     git (1.2.5)
@@ -9,11 +10,11 @@ GEM
       net-http-persistent (~> 1.4.1)
       nokogiri (~> 1.4.4)
       yajl-ruby (~> 0.7.8)
-    jeweler (1.5.1)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    minitest (2.0.0)
+    minitest (2.0.2)
     multipart-post (1.0.1)
     net-http-persistent (1.4.1)
     nokogiri (1.4.4)
@@ -28,6 +29,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  ZenTest (~> 4.4.2)
   hugs (~> 2.2.0)
   jeweler (~> 1.5.1)
   minitest (~> 2.0.0)

data/README.md

@@ -33,8 +33,4 @@ Tests can run offline thanks to [VCR](https://github.com/myronmarston/vcr).
     $ export ONE_USER=$user
     $ export ONE_PASSWORD=$password
 
-    $ bundle exec rake
-
-## TODO
-
-* Should we raise when we do not have expected HTTP code or body?
+    $ rake

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/occi/client.rb

@@ -1,16 +1,7 @@
-require "hugs"
-require "digest/sha1"
+%w(hugs digest/sha1 occi/resource occi/network occi/storage occi/compute).each { |r| require r }
 
 module Occi
   class Client
-    ##
-    # Include endpoints.
-
-    %w(pool entity).each do |mixin|
-      require "occi/#{mixin}"
-      include eval "Occi::#{mixin.capitalize}"
-    end
-
     ##
     # Required:
     # +user+: A String containing the username for use in HTTP Basic auth.
@@ -26,10 +17,20 @@ module Occi
         :port     => options[:port] || 4567,
         :type     => options[:type] || :xml,
       )
+      @connection.raise_4xx = true
+      @connection.raise_5xx = true
+    end
+
+    def network
+      @network ||= Occi::Network.new @connection
+    end
+
+    def storage
+      @storage ||= Occi::Storage.new @connection
     end
 
-    def request
-      @connection
+    def compute
+      @compute ||= Occi::Compute.new @connection
     end
   end
 end

data/lib/occi/compute.rb

@@ -0,0 +1,4 @@
+module Occi
+  class Compute < Resource
+  end
+end

data/lib/occi/network.rb

@@ -0,0 +1,4 @@
+module Occi
+  class Network < Resource
+  end
+end

data/lib/occi/resource.rb

@@ -0,0 +1,59 @@
+module Occi
+  class Resource
+    def initialize connection
+      @connection = connection
+    end
+
+    def self.inherited base
+      path = base.to_s.split('::').last.downcase
+      base.send(:define_method, :endpoint) do
+        "/#{path}"
+      end
+    end
+
+    def entity id
+      "#{endpoint}/#{id}"
+    end
+
+    ##
+    # Returns the contents of the pool.
+    # 200 OK: An XML representation of the pool in the http body.
+
+    def all
+      @connection.get endpoint
+    end
+
+    ##
+    # Request for the creation of an ER. An XML representation of a
+    # VM without the ID element should be passed in the http body.
+    # 201 Created: An XML representation of a ER of type COMPUTE with the ID.
+
+    def create body
+      @connection.post endpoint, :body => body
+    end
+
+    ##
+    # Update request for a Compute identified by +compute_id+.
+    # 202 Accepted : The update request is being process, polling required to confirm update.
+
+    def update id, body
+      @connection.put entity(id), :body => body
+    end
+
+    ##
+    # Returns the representation of the Compute resource identified by +compute_id+.
+    # 200 OK: An XML representation of the pool in the http body.
+
+    def find id
+      @connection.get entity(id)
+    end
+
+    ##
+    # Deletes the Compute resource identified by +compute_id+.
+    # 204 No Content : The Compute has been successfully deleted.
+
+    def delete id
+      @connection.delete entity(id)
+    end
+  end
+end

data/lib/occi/storage.rb

@@ -0,0 +1,7 @@
+module Occi
+  class Storage < Resource
+    def create upload
+      @connection.post endpoint, :upload => upload
+    end
+  end
+end

data/occi.gemspec

@@ -5,17 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{occi}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["retr0h"]
-  s.date = %q{2011-01-04}
+  s.date = %q{2011-01-06}
   s.email = %q{john@dewey.ws}
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
   ]
   s.files = [
+    ".autotest",
     ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
@@ -25,24 +26,26 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/occi.rb",
     "lib/occi/client.rb",
-    "lib/occi/entity.rb",
-    "lib/occi/pool.rb",
+    "lib/occi/compute.rb",
+    "lib/occi/network.rb",
+    "lib/occi/resource.rb",
+    "lib/occi/storage.rb",
     "occi.gemspec",
+    "test/fixtures/cassettes/compute_create.yml",
     "test/fixtures/cassettes/compute_delete.yml",
-    "test/fixtures/cassettes/compute_get.yml",
-    "test/fixtures/cassettes/compute_put.yml",
-    "test/fixtures/cassettes/computes_get.yml",
-    "test/fixtures/cassettes/computes_post.yml",
+    "test/fixtures/cassettes/compute_find.yml",
+    "test/fixtures/cassettes/compute_update.yml",
+    "test/fixtures/cassettes/network_all.yml",
+    "test/fixtures/cassettes/network_create.yml",
     "test/fixtures/cassettes/network_delete.yml",
-    "test/fixtures/cassettes/network_get.yml",
-    "test/fixtures/cassettes/networks_get.yml",
-    "test/fixtures/cassettes/networks_post.yml",
+    "test/fixtures/cassettes/network_find.yml",
+    "test/fixtures/cassettes/storage_all.yml",
+    "test/fixtures/cassettes/storage_create.yml",
     "test/fixtures/cassettes/storage_delete.yml",
-    "test/fixtures/cassettes/storage_get.yml",
-    "test/fixtures/cassettes/storages_get.yml",
-    "test/fixtures/cassettes/storages_post.yml",
-    "test/lib/occi/entity_test.rb",
-    "test/lib/occi/pool_test.rb",
+    "test/fixtures/cassettes/storage_find.yml",
+    "test/lib/occi/compute_test.rb",
+    "test/lib/occi/network_test.rb",
+    "test/lib/occi/storage_test.rb",
     "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/retr0h/occi}
@@ -50,8 +53,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby bindings to Open Cloud Computing Interface (OCCI).}
   s.test_files = [
-    "test/lib/occi/entity_test.rb",
-    "test/lib/occi/pool_test.rb",
+    "test/lib/occi/compute_test.rb",
+    "test/lib/occi/network_test.rb",
+    "test/lib/occi/storage_test.rb",
     "test/test_helper.rb"
   ]
 
@@ -68,6 +72,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webmock>, ["~> 1.6.1"])
       s.add_development_dependency(%q<vcr>, ["~> 1.4.0"])
       s.add_development_dependency(%q<minitest>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<ZenTest>, ["~> 4.4.2"])
     else
       s.add_dependency(%q<hugs>, ["~> 2.2.0"])
       s.add_dependency(%q<multipart-post>, ["~> 1.0.1"])
@@ -77,6 +82,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webmock>, ["~> 1.6.1"])
       s.add_dependency(%q<vcr>, ["~> 1.4.0"])
       s.add_dependency(%q<minitest>, ["~> 2.0.0"])
+      s.add_dependency(%q<ZenTest>, ["~> 4.4.2"])
     end
   else
     s.add_dependency(%q<hugs>, ["~> 2.2.0"])
@@ -87,6 +93,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<webmock>, ["~> 1.6.1"])
     s.add_dependency(%q<vcr>, ["~> 1.4.0"])
     s.add_dependency(%q<minitest>, ["~> 2.0.0"])
+    s.add_dependency(%q<ZenTest>, ["~> 4.4.2"])
   end
 end
 

data/test/fixtures/cassettes/{computes_post.yml → compute_create.yml}

@@ -12,7 +12,7 @@
           <STORAGE href="http://www.opennebula.org/storage/11"/>
         </DISK>
         <NIC>
-          <NETWORK href="http://www.opennebula.org/network/14"/>
+          <NETWORK href="http://www.opennebula.org/network/25"/>
         </NIC>
         <CONTEXT>
           <NETWORK_NAME>10.3.172.0</NETWORK_NAME>
@@ -41,5 +41,5 @@
       - keep-alive
       server: 
       - thin 1.2.7 codename No Hup
-    body: <COMPUTE href="http://cm-01.cloud.int.ev1.atti.com:4567/compute/143"><ID>143</ID><NAME>Test Framework</NAME><INSTANCE_TYPE>small</INSTANCE_TYPE><STATE>PENDING</STATE><DISK><STORAGE href="http://cm-01.cloud.int.ev1.atti.com:4567/storage/11" name="Centos 5.4 x86_64"/><TYPE>DISK</TYPE><TARGET>hda</TARGET></DISK><NIC><NETWORK href="http://cm-01.cloud.int.ev1.atti.com:4567/network/14" name="10.3.172.0"/><IP>10.3.172.33</IP><MAC>02:00:0a:03:ac:21</MAC></NIC><CONTEXT><FILES>/opt/tpkg/opennebula-2.0/../var/opennebula-2.0/templates/context/init.sh</FILES><GATEWAY>10.3.172.1</GATEWAY><HOSTNAME>02:00:0a:03:ac:21</HOSTNAME><IP_PUBLIC>10.3.172.33</IP_PUBLIC><NETMASK>/23</NETMASK><TARGET>hdc</TARGET></CONTEXT></COMPUTE>
+    body: <COMPUTE href="http://cm-01.cloud.int.ev1.atti.com:4567/compute/167"><ID>167</ID><NAME>Test Framework</NAME><INSTANCE_TYPE>small</INSTANCE_TYPE><STATE>PENDING</STATE><DISK><STORAGE href="http://cm-01.cloud.int.ev1.atti.com:4567/storage/11" name="Centos 5.4 x86_64"/><TYPE>DISK</TYPE><TARGET>hda</TARGET></DISK><NIC><NETWORK href="http://cm-01.cloud.int.ev1.atti.com:4567/network/25" name="10.3.172.0"/><IP>10.3.172.26</IP><MAC>02:00:0a:03:ac:1a</MAC></NIC><CONTEXT><FILES>/opt/tpkg/opennebula-2.0/../var/opennebula-2.0/templates/context/init.sh</FILES><GATEWAY>10.3.172.1</GATEWAY><HOSTNAME>02:00:0a:03:ac:1a</HOSTNAME><IP_PUBLIC>10.3.172.26</IP_PUBLIC><NETMASK>/24</NETMASK><TARGET>hdc</TARGET></CONTEXT></COMPUTE>
     http_version: "1.1"

data/test/fixtures/cassettes/compute_delete.yml

@@ -2,28 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :delete
-    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/compute/135
-    body: 
-    headers: 
-      accept: 
-      - application/xml
-      connection: 
-      - keep-alive
-      keep-alive: 
-      - 30
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
-      code: 204
-      message: No Content
-    headers: 
-      server: 
-      - thin 1.2.7 codename No Hup
-    body: 
-    http_version: "1.1"
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :delete
-    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/compute/143
+    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/compute/167
     body: 
     headers: 
       accept: 

data/test/fixtures/cassettes/compute_find.yml

@@ -0,0 +1,28 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/compute/167
+    body: 
+    headers: 
+      accept: 
+      - application/xml
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - text/html;charset=utf-8
+      content-length: 
+      - "714"
+      connection: 
+      - keep-alive
+      server: 
+      - thin 1.2.7 codename No Hup
+    body: <COMPUTE href="http://cm-01.cloud.int.ev1.atti.com:4567/compute/167"><ID>167</ID><NAME>Test Framework</NAME><INSTANCE_TYPE>small</INSTANCE_TYPE><STATE>ACTIVE</STATE><DISK><STORAGE href="http://cm-01.cloud.int.ev1.atti.com:4567/storage/11" name="Centos 5.4 x86_64"/><TYPE>DISK</TYPE><TARGET>hda</TARGET></DISK><NIC><NETWORK href="http://cm-01.cloud.int.ev1.atti.com:4567/network/25" name="10.3.172.0"/><IP>10.3.172.26</IP><MAC>02:00:0a:03:ac:1a</MAC></NIC><CONTEXT><FILES>/opt/tpkg/opennebula-2.0/../var/opennebula-2.0/templates/context/init.sh</FILES><GATEWAY>10.3.172.1</GATEWAY><HOSTNAME>02:00:0a:03:ac:1a</HOSTNAME><IP_PUBLIC>10.3.172.26</IP_PUBLIC><NETMASK>/24</NETMASK><TARGET>hdc</TARGET></CONTEXT></COMPUTE>
+    http_version: "1.1"

data/test/fixtures/cassettes/{compute_put.yml → compute_update.yml}

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/compute/134
+    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/compute/167
     body: |
       <?xml version="1.0"?>
       <COMPUTE>
@@ -26,10 +26,10 @@
       content-type: 
       - text/html;charset=utf-8
       content-length: 
-      - "809"
+      - "714"
       connection: 
       - keep-alive
       server: 
       - thin 1.2.7 codename No Hup
-    body: <COMPUTE href="http://cm-01.cloud.int.ev1.atti.com:4567/compute/134"><ID>134</ID><NAME>Centos-5-4_x86_64-Kevin</NAME><STATE>ACTIVE</STATE><DISK><STORAGE href="http://cm-01.cloud.int.ev1.atti.com:4567/storage/22" name="Centos 5.4 x86_64 Kevin"/><TYPE>DISK</TYPE><TARGET>hda</TARGET></DISK><DISK><STORAGE href="http://cm-01.cloud.int.ev1.atti.com:4567/storage/" name=""/><TYPE>swap</TYPE><TARGET>hdd</TARGET></DISK><NIC><NETWORK href="http://cm-01.cloud.int.ev1.atti.com:4567/network/15" name="10.3.174.0"/><IP>10.3.174.10</IP><MAC>02:00:0a:03:ae:0a</MAC></NIC><CONTEXT><FILES>/opt/tpkg/var/opennebula-2.0/templates/context/init.sh</FILES><GATEWAY>10.3.174.1</GATEWAY><HOSTNAME>02:00:0a:03:ae:0a</HOSTNAME><IP_PUBLIC>10.3.174.10</IP_PUBLIC><NETMASK>/23</NETMASK><NS></NS><TARGET>hdc</TARGET></CONTEXT></COMPUTE>
+    body: <COMPUTE href="http://cm-01.cloud.int.ev1.atti.com:4567/compute/167"><ID>167</ID><NAME>Test Framework</NAME><INSTANCE_TYPE>small</INSTANCE_TYPE><STATE>ACTIVE</STATE><DISK><STORAGE href="http://cm-01.cloud.int.ev1.atti.com:4567/storage/11" name="Centos 5.4 x86_64"/><TYPE>DISK</TYPE><TARGET>hda</TARGET></DISK><NIC><NETWORK href="http://cm-01.cloud.int.ev1.atti.com:4567/network/25" name="10.3.172.0"/><IP>10.3.172.26</IP><MAC>02:00:0a:03:ac:1a</MAC></NIC><CONTEXT><FILES>/opt/tpkg/opennebula-2.0/../var/opennebula-2.0/templates/context/init.sh</FILES><GATEWAY>10.3.172.1</GATEWAY><HOSTNAME>02:00:0a:03:ac:1a</HOSTNAME><IP_PUBLIC>10.3.172.26</IP_PUBLIC><NETMASK>/24</NETMASK><TARGET>hdc</TARGET></CONTEXT></COMPUTE>
     http_version: "1.1"

data/test/fixtures/cassettes/{networks_get.yml → network_all.yml}

@@ -19,10 +19,10 @@
       content-type: 
       - text/html;charset=utf-8
       content-length: 
-      - "222"
+      - "313"
       connection: 
       - keep-alive
       server: 
       - thin 1.2.7 codename No Hup
-    body: "<NETWORK_COLLECTION><NETWORK href=\"http://cm-01.cloud.int.ev1.atti.com:4567/network/14\" name=\"10.3.172.0\"/><NETWORK href=\"http://cm-01.cloud.int.ev1.atti.com:4567/network/15\" name=\"10.3.174.0\"/></NETWORK_COLLECTION>       "
+    body: "<NETWORK_COLLECTION><NETWORK href=\"http://cm-01.cloud.int.ev1.atti.com:4567/network/23\" name=\"10.3.174.0\"/><NETWORK href=\"http://cm-01.cloud.int.ev1.atti.com:4567/network/25\" name=\"10.3.172.0\"/><NETWORK href=\"http://cm-01.cloud.int.ev1.atti.com:4567/network/27\" name=\"Test Framework\"/></NETWORK_COLLECTION>       "
     http_version: "1.1"

data/test/fixtures/cassettes/{networks_post.yml → network_create.yml}

@@ -33,5 +33,5 @@
       - keep-alive
       server: 
       - thin 1.2.7 codename No Hup
-    body: <NETWORK href="http://cm-01.cloud.int.ev1.atti.com:4567/network/21"><ID>21</ID><NAME>Test Framework</NAME><ADDRESS>192.168.1.1</ADDRESS><SIZE>200</SIZE></NETWORK>
+    body: <NETWORK href="http://cm-01.cloud.int.ev1.atti.com:4567/network/27"><ID>27</ID><NAME>Test Framework</NAME><ADDRESS>192.168.1.1</ADDRESS><SIZE>200</SIZE></NETWORK>
     http_version: "1.1"

data/test/fixtures/cassettes/network_delete.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :delete
-    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/network/21
+    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/network/27
     body: 
     headers: 
       accept: 

data/test/fixtures/cassettes/{computes_get.yml → network_find.yml}

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :get
-    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/compute
+    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/network/27
     body: 
     headers: 
       accept: 
@@ -19,10 +19,10 @@
       content-type: 
       - text/html;charset=utf-8
       content-length: 
-      - "424"
+      - "162"
       connection: 
       - keep-alive
       server: 
       - thin 1.2.7 codename No Hup
-    body: "<COMPUTE_COLLECTION><COMPUTE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/compute/79\" name=\"Centos-5-4_x86_64\"/><COMPUTE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/compute/80\" name=\"Centos-5-4_x86_64\"/><COMPUTE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/compute/81\" name=\"Centos-5-4_x86_64\"/><COMPUTE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/compute/82\" name=\"Centos-5-4_x86_64\"/></COMPUTE_COLLECTION>       "
+    body: <NETWORK href="http://cm-01.cloud.int.ev1.atti.com:4567/network/27"><ID>27</ID><NAME>Test Framework</NAME><ADDRESS>192.168.1.1</ADDRESS><SIZE>200</SIZE></NETWORK>
     http_version: "1.1"