occi-core 4.1.3 → 4.2.0

data/spec/occi/parser_spec.rb

@@ -1,116 +1,267 @@
 module Occi
   describe "Parser" do
 
-    it "parses an OCCI message with MIME type text/plain containing an OCCI resource" do
-      # create new collection
-      collection = Occi::Collection.new
-      # create new resource within collection
-      resource = collection.resources.create
-
-      # render collection to text/plain MIME type
-      rendered_collection = collection.to_text
-      # parse rendered collection and compare with original collection
-      Occi::Parser.parse('text/plain', rendered_collection).to_json.should == collection.to_json
-
-      # add attributes to resource
-      resource.id = UUIDTools::UUID.random_create.to_s
-      resource.title = 'title'
-
-      # render collection to text/plain MIME type
-      rendered_collection = collection.to_text
-      # parse rendered collection and compare with original collection
-      Occi::Parser.parse('text/plain', rendered_collection).to_json.should == collection.to_json
-
-      # add mixin to resource
-      resource.mixins << Occi::Core::Mixin.new
-
-      # render collection to text/plain MIME type
-      rendered_collection = collection.to_text
-      # parse rendered collection and compare with original collection
-      Occi::Parser.parse('text/plain', rendered_collection).to_json.should == collection.to_json
-
-      # add link to resource
-      link = resource.links.create
-      link.id = UUIDTools::UUID.random_create.to_s
-      link.target = 'http://example.com/resource/aee5acf5-71de-40b0-bd1c-2284658bfd0e'
-      link.source = resource
-      collection << link
-
-      # render collection to text/plain MIME type
-      rendered_collection = collection.to_text
-      # parse rendered collection and compare with original collection
-      Occi::Parser.parse('text/plain', rendered_collection).to_json.should == collection.to_json
+    context ".parse" do
+
+      context "render->parse tests" do
+        let(:collection){ Occi::Collection.new }
+        let(:resource){ collection.resources.create }
+        let(:link){ link = resource.links.create
+            link.id = UUIDTools::UUID.random_create.to_s
+            link.target = 'http://example.com/resource/aee5acf5-71de-40b0-bd1c-2284658bfd0e'
+            link.source = resource
+            link
+        }
+
+        context "resources from OCCI messages with text/plain MIME type" do
+          let(:rendered_collection){ collection.to_text }
+
+          it 'parses self-generated collection with resources' do
+            expect(Occi::Parser.parse('text/plain', rendered_collection).to_json).to eql collection.to_json
+          end
+
+          it 'parses self-generated collection with added attributes' do
+            resource.id = UUIDTools::UUID.random_create.to_s
+            resource.title = 'title'
+            expect(Occi::Parser.parse('text/plain', rendered_collection).to_json).to eql collection.to_json
+          end
+
+          it 'parses self-generated collection with added mixin' do
+            resource.mixins << Occi::Core::Mixin.new
+            expect(Occi::Parser.parse('text/plain', rendered_collection).to_json).to eql collection.to_json
+          end
+
+          it 'parses self-generated collection with added link' do
+            collection << link
+            expect(Occi::Parser.parse('text/plain', rendered_collection).to_json).to eql collection.to_json
+          end
+        end
+
+        context 'resources from OCCI messages with text/occi MIME type' do
+          let(:rendered_collection){ collection.to_header }
+
+          it 'parses self-generated collection with resources' do
+            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql collection.to_header
+          end
+
+          it 'parses self-generated collection with added attributes' do
+            resource.id = UUIDTools::UUID.random_create.to_s
+            resource.title = 'title'
+            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql collection.to_header
+          end
+
+          it 'parses self-generated collection with added mixin' do
+            resource.mixins << Occi::Core::Mixin.new
+            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql collection.to_header
+          end
+
+          it 'parses self-generated collection with added link' do
+            collection << link
+            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql collection.to_header
+          end
+        end
+
+        context 'resources from OCCI messages with application/occi+json MIME type' do
+          let(:rendered_collection){ collection.to_json }
+          it 'parses self-generated collection with resources' do
+            expect(Occi::Parser.parse('application/occi+json', rendered_collection)).to eql collection
+          end
+
+          it 'parses self-generated collection with added attributes' do
+            resource.id = UUIDTools::UUID.random_create.to_s
+            resource.title = 'title'
+            expect(Occi::Parser.parse('application/occi+json', rendered_collection)).to eql collection
+          end
+
+          it 'parses self-generated collection with added mixin' do
+            resource.mixins << Occi::Core::Mixin.new
+            expect(Occi::Parser.parse('application/occi+json', rendered_collection)).to eql collection
+          end
+
+          it 'parses self-generated collection with added link' #do #Already deactivated in previous version
+#            collection << link
+#            expect(Occi::Parser.parse('application/occi+json', rendered_collection)).to eql collection
+#          end
+
+        end
+      end
+
+      it "parses an OVF file" do
+        media_type = 'application/ovf+xml'
+        body = File.read('spec/occi/parser/ovf_samples/test.ovf')
+        collection = Occi::Parser.parse(media_type, body)
+
+        collection.resources.each { |res| res.id="noid" } #Equalize auto-generated IDs
+
+        expected = Marshal.load(File.open("spec/occi/parser/ovf_samples/test.dump", "rb"))
+        expect(collection).to eql expected
+      end
+
+      it 'copes with faulty OVF' #do
+#        expect{ Occi::Parser.parse('application/ovf', "{This is not an OVF}")}.to raise_error(Occi::Errors::ParserInputError)
+#      end
+
+      it "parses an OVA container" do
+        media_type = 'application/ova'
+        body = File.read('spec/occi/parser/ova_samples/test.ova')
+        collection = Occi::Parser.parse(media_type, body)
+
+        collection.resources.each { |res| res.id="noid" } #Equalize auto-generated IDs
+
+        expected = Marshal.load(File.open("spec/occi/parser/ova_samples/test.dump", "rb"))
+        expect(collection).to eql expected
+      end
+
+      it 'copes with faulty OVA' do
+        expect{ Occi::Parser.parse('application/ova', "{This is not an OVA}")}.to raise_error(Occi::Errors::ParserInputError)
+      end
+
+  #    ZS 11 Oct 2013: XML format not yet properly specified
+  #    it "parses a XML file" do
+  #      media_type = 'application/xml'
+  #      body = File.read('spec/occi/parser/xml_samples/test.xml')
+  #      collection = Occi::Parser.parse(media_type, body)
+  #      
+  #    end
+
+      it 'copes with faulty XML' do
+        expect{ collection = Occi::Parser.parse('application/xml', "{This is not a XML}") }.to raise_error(Occi::Errors::ParserInputError)
+      end
+
+      it 'copes with non-existent MIME-type' do
+        expect{ collection = Occi::Parser.parse('application/notexist', 'X-OCCI-Location: http://example.com:8090/a/b/vm1"') }.to raise_error(Occi::Errors::ParserTypeError)
+      end
+
+      it 'copes with type text/uri-list' do
+        expect{ collection = Occi::Parser.parse('text/uri-list', 'http://example.com:8090/a/b/vm1"') }.to raise_error(Occi::Errors::ParserTypeError)
+      end
+
+      it 'skips type text/occi in body' do
+        collection = Occi::Parser.parse('text/occi', 'Category: TERM;scheme="http://a.a/a#";class=kind')
+        expected = Occi::Collection.new
+        expect(collection).to eql expected
+      end
+
     end
 
-    it "parses an OCCI message with MIME type application/occi+json containing an OCCI resource" do
-      # create new collection
-      collection = Occi::Collection.new
-      # create new resource within collection
-      resource = collection.resources.create
-
-      # render collection to text/plain MIME type
-      rendered_collection = collection.to_json
-      # parse rendered collection and compare with original collection
-      Occi::Parser.parse('application/occi+json', rendered_collection).should == collection
-
-      # add attributes to resource
-      resource.id = UUIDTools::UUID.random_create.to_s
-      resource.title = 'title'
-
-      # render collection to text/plain MIME type
-      rendered_collection = collection.to_json
-      # parse rendered collection and compare with original collection
-      Occi::Parser.parse('application/occi+json', rendered_collection).should == collection
-
-      # add mixin to resource
-      resource.mixins << Occi::Core::Mixin.new
-
-      # render collection to text/plain MIME type
-      rendered_collection = collection.to_json
-      # parse rendered collection and compare with original collection
-      Occi::Parser.parse('application/occi+json', rendered_collection).should == collection
-
-      # add link to resource
-      link = resource.links.create
-      link.target = 'http://example.com/resource/aee5acf5-71de-40b0-bd1c-2284658bfd0e'
-
-      # render collection to text/plain MIME type
-      rendered_collection = collection.to_json
-      # parse rendered collection and compare with original collection
-      Occi::Parser.parse('application/occi+json', rendered_collection).should == collection
+    context '.parse_headers' do
+      it 'parses categories' do
+        categories_string = File.open("spec/occi/parser/text_samples/occi_categories.text", "rb").read
+        expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_categories.dump", "rb"))
+        categories = Occi::Parser.parse('text/plain', categories_string, true)
+        expect(categories).to eql expected
+      end
+
+      it 'parses resources' do
+        resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rb").read
+        expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_network_rocci_server.resource.dump", "rb"))
+        resource = Occi::Parser.parse('text/plain', resource_string, false, Occi::Core::Resource)
+        expect(resource).to eql expected
+      end
+
+      it 'parses link' do
+        link_string = File.open("spec/occi/parser/text_samples/occi_link_resource_instance.text", "rb").read
+        link = Occi::Parser.parse('text/plain', link_string, false, Occi::Core::Link)
+        expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_link_resource_instance.dump", "rb"))
+        expected.links.each { |exp| exp.id = 'emptied' }
+        link.links.each { |lnk| lnk.id = 'emptied' }
+        expect(link).to eql expected
+      end
+
+      it 'fails gracefully for unknown entity type' do
+        resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rb").read
+        expect{ Occi::Parser.parse('text/plain', resource_string, false, Occi::Core::ActionInstance) }.to raise_error(Occi::Errors::ParserTypeError)
+      end
     end
 
-    it "parses an OVF file" do
-      media_type = 'application/ovf+xml'
-      body = File.read('spec/occi/test.ovf')
-      collection = Occi::Parser.parse(media_type, body)
-      storage_resources = collection.resources.select { |resource| resource.kind.to_s == 'http://schemas.ogf.org/occi/infrastructure#storage' }
-      storage_resources.should have(1).storage_resource
-      storage_resources.first.title.should == 'lamp'
-      network_resources = collection.resources.select { |resource| resource.kind.to_s == 'http://schemas.ogf.org/occi/infrastructure#network' }
-      network_resources.should have(1).network_resource
-      network_resources.first.title.should == 'VM Network'
-      compute_resources = collection.resources.select { |resource| resource.kind.to_s == 'http://schemas.ogf.org/occi/infrastructure#compute' }
-      compute_resources.should have(1).compute_resource
-      compute_resources.first.attributes.occi!.compute!.cores.should == 1
-      compute_resources.first.attributes.occi!.compute!.memory.should == 0.25
+    context '.locations' do
+      let(:expected){ ["http://example.com:8090/a/b/vm1", "http://example.com:8090/a/b/vm2"] }
+      let(:single_expected){ ["http://example.com:8090/a/b/vm1"] }
+      it 'parses single location from headers' do
+        header = Hashie::Mash.new
+        header['X-OCCI-Location'] = 'http://example.com:8090/a/b/vm1'
+        location = Occi::Parser.locations("", "", header)
+        expect(location).to eql single_expected
+      end
+
+      it 'parses multiple locations from headers' do
+        header = Hashie::Mash.new
+        header['X-OCCI-Location'] = "http://example.com:8090/a/b/vm1,http://example.com:8090/a/b/vm2"
+        location = Occi::Parser.locations("", "", header)
+        expect(location).to eql expected
+      end
+
+      it 'parses locations from headers, skipping attributes' do
+        header = Hashie::Mash.new
+        header['X-OCCI-Location'] = "http://example.com:8090/a/b/vm1,http://example.com:8090/a/b/vm2"
+        header['X-OCCI-Attribute'] = "occi.core.title=\"test\""
+        location = Occi::Parser.locations("", "", header)
+        expect(location).to eql expected
+      end
+
+      it 'parses multiple locations from an URI list' do
+        locations_text = "http://example.com:8090/a/b/vm1\nhttp://example.com:8090/a/b/vm2"
+        location = Occi::Parser.locations("text/uri-list", locations_text, {})
+        expect(location).to eql expected
+      end      
+
+      it 'parses multiple locations from plain text' do
+        locations_text = "X-OCCI-Location: http://example.com:8090/a/b/vm1\nX-OCCI-Location: http://example.com:8090/a/b/vm2"
+        location = Occi::Parser.locations("text/plain", locations_text, {})
+        expect(location).to eql expected
+      end      
+
+      it 'copes with unmeaningful input' do
+        location = Occi::Parser.locations("nonexistent", "", {})
+        expect(location).to eql []
+      end
+
+      it 'parses "Location" hashes from header, solo' do
+        header = Hashie::Mash.new
+        header['Location'] = "http://example.com:8090/a/b/vm1"
+        location = Occi::Parser.locations("", "", header)
+        expect(location).to eql single_expected
+      end
+
+      it 'parses "Location" hashes from header in combination with X-OCCI-Location strings' do
+        header = Hashie::Mash.new
+        header['Location'] = "http://example.com:8090/a/b/vm1"
+        header['X-OCCI-Location'] = "http://example.com:8090/a/b/vm2"
+        locations_text = "X-OCCI-Location: http://example.com:8090/a/b/vm1\nX-OCCI-Location: http://example.com:8090/a/b/vm2"
+        location = Occi::Parser.locations("", "", header)
+        expect(location).to eql expected
+      end
     end
 
-    it "parses an OVA container" do
-      media_type = 'application/ova'
-      body = File.read('spec/occi/test.ova')
-      collection = Occi::Parser.parse(media_type, body)
-      storage_resources = collection.resources.select { |resource| resource.kind.to_s == 'http://schemas.ogf.org/occi/infrastructure#storage' }
-      storage_resources.should have(1).storage_resource
-      storage_resources.first.title.should == 'lamp'
-      network_resources = collection.resources.select { |resource| resource.kind.to_s == 'http://schemas.ogf.org/occi/infrastructure#network' }
-      network_resources.should have(1).network_resource
-      network_resources.first.title.should == 'VM Network'
-      compute_resources = collection.resources.select { |resource| resource.kind.to_s == 'http://schemas.ogf.org/occi/infrastructure#compute' }
-      compute_resources.should have(1).compute_resource
-      compute_resources.first.attributes.occi!.compute!.cores.should == 1
-      compute_resources.first.attributes.occi!.compute!.memory.should == 0.25
+    context '.parse_body_plain' do
+      it 'parses categories' do
+        categories_string = File.open("spec/occi/parser/text_samples/occi_categories.text", "rb").read
+        expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_categories.dump", "rb"))
+        categories = Occi::Parser.parse('text/plain', categories_string, true)
+        expect(categories).to eql expected
+      end
+
+      it 'parses resources' do
+        resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rb").read
+        expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_network_rocci_server.resource.dump", "rb"))
+        resource = Occi::Parser.parse('text/plain', resource_string, false, Occi::Core::Resource)
+        expect(resource).to eql expected
+      end
+
+      it 'parses links' do
+        link_string = File.open("spec/occi/parser/text_samples/occi_link_resource_instance.text", "rb").read
+        link = Occi::Parser.parse('text/plain', link_string, false, Occi::Core::Link)
+        expected = Marshal.load(File.open("spec/occi/parser/text_samples/occi_link_resource_instance.dump", "rb"))
+        expected.links.each { |exp| exp.id = 'emptied' }
+        link.links.each { |lnk| lnk.id = 'emptied' }
+        expect(link).to eql expected
+      end
+
+      it 'copes with unknown entity type' do
+        expect{Occi::Parser.parse('text/plain', 'Category: TERM;scheme="http://a.a/a#";class=kind', false, Occi::Core::Kind)}.to raise_exception(Occi::Errors::ParserTypeError)
+        # This test works but the exception is actually raised in parse_headers(). Execution never gets to this branch in parse_body_plain()
+      end
     end
 
   end
-end
+end

data/spec/occi-core_spec.rb

@@ -0,0 +1,31 @@
+describe Occi do
+  include Occi
+
+  context ".kinds" do
+    it 'initializes kinds' do
+      kind = kinds
+      expect(kind).to eql []
+    end
+  end
+
+  context ".mixins" do
+    it 'initializes mixins' do
+      mixin = mixins
+      expect(mixin).to eql []
+    end
+  end
+
+  context ".actions" do
+    it 'initializes actions' do
+      action = actions
+      expect(actions).to eql []
+    end
+  end
+
+  context ".categories" do
+    it 'returns lists of categories' do
+      cat = categories
+      expect(cat).to eql []
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,16 @@
 require 'rubygems'
 
-require 'occi-core'
-
 # enable coverage reports
 if ENV['COVERAGE']
   require 'simplecov'
+
+  SimpleCov.add_filter "/spec/"
   SimpleCov.start
 end
 
+require 'occi-core'
+require 'json_spec'
+
 # simplify the usage of VCR; this will allow us to use
 #
 #   it "does something", :vcr do
@@ -22,4 +25,5 @@ end
 RSpec.configure do |c|
   # in RSpec 3 this will no longer be necessary.
   c.treat_symbols_as_metadata_keys_with_true_values = true
+  c.include JsonSpec::Helpers
 end