occi 1.1.0 → 1.2.0

data/test/fixtures/cassettes/{storages_get.yml → storage_all.yml}

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :get
-    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/storage
+    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/network
     body: 
     headers: 
       accept: 
@@ -19,10 +19,10 @@
       content-type: 
       - text/html;charset=utf-8
       content-length: 
-      - "425"
+      - "313"
       connection: 
       - keep-alive
       server: 
       - thin 1.2.7 codename No Hup
-    body: "<STORAGE_COLLECTION><STORAGE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/storage/1\" name=\"Ubuntu 10.10 x86_64\"/><STORAGE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/storage/2\" name=\"Ubuntu 10.04.1 x86_64\"/><STORAGE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/storage/7\" name=\"Centos 5.4 i686\"/><STORAGE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/storage/11\" name=\"Centos 5.4 x86_64\"/></STORAGE_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/26\" name=\"Test Framework\"/></NETWORK_COLLECTION>       "
     http_version: "1.1"

data/test/fixtures/cassettes/{storages_post.yml → storage_create.yml}

@@ -46,5 +46,5 @@
       - keep-alive
       server: 
       - thin 1.2.7 codename No Hup
-    body: <STORAGE href="http://cm-01.cloud.int.ev1.atti.com:4567/storage/30"><ID>30</ID><NAME>Test Framework</NAME><TYPE>OS</TYPE><DESCRIPTION>Test Framework Image.</DESCRIPTION><SIZE>0</SIZE></STORAGE>
+    body: <STORAGE href="http://cm-01.cloud.int.ev1.atti.com:4567/storage/39"><ID>39</ID><NAME>Test Framework</NAME><TYPE>OS</TYPE><DESCRIPTION>Test Framework Image.</DESCRIPTION><SIZE>0</SIZE></STORAGE>
     http_version: "1.1"

data/test/fixtures/cassettes/storage_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/storage/23
-    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/storage/30
+    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/storage/39
     body: 
     headers: 
       accept: 

data/test/fixtures/cassettes/storage_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/storage/39
+    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: 
+      - "193"
+      connection: 
+      - keep-alive
+      server: 
+      - thin 1.2.7 codename No Hup
+    body: <STORAGE href="http://cm-01.cloud.int.ev1.atti.com:4567/storage/39"><ID>39</ID><NAME>Test Framework</NAME><TYPE>OS</TYPE><DESCRIPTION>Test Framework Image.</DESCRIPTION><SIZE>0</SIZE></STORAGE>
+    http_version: "1.1"

data/test/lib/occi/compute_test.rb

@@ -0,0 +1,91 @@
+require "test_helper"
+
+describe Occi::Compute do
+  describe "#all" do
+    #it "returns a parsed XML document" do
+    #  VCR.use_cassette "compute_all" do
+    #    response = Connection.compute.all
+
+    #    is_okay response
+    #  end
+    #end
+  end
+
+  describe "#create" do
+    before do
+      ##
+      # Adding NETWORK_NAME to the CONTEXT should be reworked.
+      # We want the vm to divine it's IP from its MAC Address on
+      # boot.  Then we no longer need the coupling in the XML.
+      # CLOUD-35 open to address this.
+
+      @builder = Nokogiri::XML::Builder.new do
+        COMPUTE {
+          NAME "Test Framework"
+          INSTANCE_TYPE "small"
+          DISK {
+            STORAGE(:href => "http://www.opennebula.org/storage/11")
+          }
+          NIC {
+            NETWORK(:href => "http://www.opennebula.org/network/25")
+          }
+          CONTEXT {
+            NETWORK_NAME "10.3.172.0"
+          }
+        }
+      end.to_xml
+    end
+
+    it "returns a parsed XML document" do
+      VCR.use_cassette "compute_create" do
+        response = Connection.compute.create @builder
+
+        is_created response
+      end
+    end
+  end
+
+  describe "#find" do
+    it "returns a parsed XML document" do
+      id = cassette_for("compute_create").xpath('//ID').text
+
+      VCR.use_cassette "compute_find" do
+        response = Connection.compute.find id
+
+        is_okay response
+      end
+    end
+  end
+
+  describe "#delete" do
+    it "returns a parsed XML document" do
+      id = cassette_for("compute_create").xpath('//ID').text
+
+      VCR.use_cassette "compute_delete" do
+        response = Connection.compute.delete id
+
+        is_no_content response
+      end
+    end
+  end
+
+  describe "#update" do
+    before do
+      @builder = Nokogiri::XML::Builder.new do
+        COMPUTE {
+          STATE "shutdown"
+        }
+      end.to_xml
+    end
+
+    it "returns a parsed XML document" do
+      id = cassette_for("compute_create").xpath('//ID').text
+
+      VCR.use_cassette "compute_update" do
+        response = Connection.compute.update id, @builder
+
+        is_accepted response
+      end
+    end
+  end
+end

data/test/lib/occi/network_test.rb

@@ -0,0 +1,57 @@
+require "test_helper"
+
+describe Occi::Network do
+  describe "#all" do
+    it "returns a parsed XML document" do
+      VCR.use_cassette "network_all" do
+        response = Connection.network.all
+
+        is_okay response
+      end
+    end
+  end
+
+  describe "#create" do
+    before do
+      @builder = Nokogiri::XML::Builder.new do
+        NETWORK {
+          NAME "Test Framework"
+          ADDRESS "192.168.1.1"
+          SIZE "200"
+        }
+      end.to_xml
+    end
+
+    it "returns a parsed XML document" do
+      VCR.use_cassette "network_create" do
+        response = Connection.network.create @builder
+
+        is_created response
+      end
+    end
+  end
+
+  describe "#find" do
+    it "returns a parsed XML document" do
+      id = cassette_for("network_create").xpath('//ID').text
+
+      VCR.use_cassette "network_find" do
+        response = Connection.network.find id
+
+        is_okay response
+      end
+    end
+  end
+
+  describe "#delete" do
+    it "returns a parsed XML document" do
+      id = cassette_for("network_create").xpath('//ID').text
+
+      VCR.use_cassette "network_delete" do
+        response = Connection.network.delete id
+
+        is_no_content response
+      end
+    end
+  end
+end

data/test/lib/occi/storage_test.rb

@@ -0,0 +1,67 @@
+require "test_helper"
+
+describe Occi::Storage do
+  describe "#all" do
+    it "returns a parsed XML document" do
+      VCR.use_cassette "storage_all" do
+        response = Connection.network.all
+
+        is_okay response
+      end
+    end
+  end
+
+  describe "#create" do
+    before do
+      @builder = Nokogiri::XML::Builder.new do
+        STORAGE {
+          NAME "Test Framework"
+          DESCRIPTION "Test Framework Image."
+          TYPE "OS"
+          ### Not exactly sure what URL does.
+          URL "file:///dev/null"
+        }
+      end.to_xml
+
+      @upload = {
+        :parts => {
+          :file    => "/dev/null",
+          :occixml => @builder,
+        },
+        :content_type => "application/octet-stream"
+      }
+    end
+
+    it "returns a parsed XML document" do
+      VCR.use_cassette "storage_create" do
+        response = Connection.storage.create @upload
+
+        is_created response
+      end
+    end
+  end
+
+  describe "#find" do
+    it "returns a parsed XML document" do
+      id = cassette_for("storage_create").xpath('//ID').text
+
+      VCR.use_cassette "storage_find" do
+        response = Connection.storage.find id
+
+        is_okay response
+      end
+    end
+  end
+
+  describe "#delete" do
+    it "returns a parsed XML document" do
+      id = cassette_for("storage_create").xpath('//ID').text
+
+      VCR.use_cassette "storage_delete" do
+        response = Connection.storage.delete id
+
+        is_no_content response
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
+require "bundler"
 Bundler.setup :default, :test
 
-%w(minitest/spec nokogiri vcr webmock occi).each { |r| require r }
+%w(minitest/autorun minitest/spec nokogiri vcr webmock occi).each { |r| require r }
 
 class MiniTest::Unit::TestCase
   Connection = Occi::Client.new(
@@ -41,7 +42,7 @@ WebMock.disable_net_connect! :allow => "one.example.com"
 VCR.config do |c|
   c.stub_with :webmock
   c.cassette_library_dir     = "test/fixtures/cassettes"
-  c.default_cassette_options = { :record => :new_episodes }
+  c.default_cassette_options = { :record => :none }
 end
 
 MiniTest::Unit.autorun

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - retr0h
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -08:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,6 +135,21 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 4
+        - 2
+        version: 4.4.2
+  type: :development
+  prerelease: false
+  version_requirements: *id009
 description: 
 email: john@dewey.ws
 executables: []
@@ -145,6 +160,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- .autotest
 - .rvmrc
 - Gemfile
 - Gemfile.lock
@@ -154,24 +170,26 @@ files:
 - 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
 has_rdoc: true
 homepage: http://github.com/retr0h/occi
@@ -206,6 +224,7 @@ signing_key:
 specification_version: 3
 summary: Ruby bindings to Open Cloud Computing Interface (OCCI).
 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

data/lib/occi/entity.rb

@@ -1,63 +0,0 @@
-module Occi
-  module Entity
-    Gets = %w(
-      compute
-      network
-      storage
-    ).map { |v| "#{v}_get" }.freeze
-
-    Deletes = %w(
-      compute
-      network
-      storage
-    ).map { |v| "#{v}_delete" }.freeze
-
-    Puts = %w(
-      compute
-    ).map { |v| "#{v}_put" }.freeze
-
-    ##
-    # The _get methods:
-    #   Returns the representation of the Compute resource identified by +compute_id+.
-    #   200 OK: An XML representation of the pool in the http body.
-    #
-    # The _delete methods:
-    #   Deletes the Compute resource identified by +compute_id+.
-    #   204 No Content : The Compute has been successfully deleted.
-    #
-    # The _put methods:
-    #   Update request for a Compute identified by +compute_id+.
-    #   202 Accepted : The update request is being process, polling required to confirm update.
-
-    (Gets + Deletes + Puts).each do |method|
-      define_method method do |*args|
-        id         = args[0]
-        params     = args[1] || {}
-        path, verb = method.split("_")
-
-        request.send verb, "/#{path}/#{id}", params
-      end
-    end
-
-    ##
-    # :method: compute_get
-
-    ##
-    # :method: compute_delete
-
-    ##
-    # :method: compute_put
-
-    ##
-    # :method: network_get
-
-    ##
-    # :method: network_delete
-
-    ##
-    # :method: storage_get
-
-    ##
-    # :method: storage_delete
-  end
-end