occi 2.5.19 → 3.0.0.beta.0

data/spec/occi/collection_spec.rb

@@ -1,19 +1,32 @@
 require 'rspec'
 require 'occi'
 
-module OCCI
+module Occi
   describe Collection do
-    describe "initialize" do
 
-      it "should create a new OCCI collection including the OCCI base objects" do
-        collection = Hashie::Mash.new(:kinds => [], :mixins => [], :actions => [], :resources => [], :links => [])
-        collection.kinds << { :term => "compute", :scheme => "http://schemas.ogf.org/occi/infrastructure#" }
-        collection.mixins << { :term => "my_mixin", :scheme => "http://example.com/occi/tags#" }
-        collection.actions << { :term => "start", :scheme => "http://schemas.ogf.org/occi/infrastructure/compute/action#" }
-        collection.resources << { :kind => "http://schemas.ogf.org/occi/infrastructure#compute" }
-        collection.links << { :kind => "http://schemas.ogf.org/occi/infrastructure#storagelink" }
-      end
+    it "should create a new Occi collection including the Occi base objects" do
+      collection = Occi::Collection.new
+      collection.kinds << "http://schemas.ogf.org/occi/infrastructure#compute"
+      collection.mixins << "http://example.com/occi/tags#my_mixin"
+      collection.actions << "http://schemas.ogf.org/occi/infrastructure/compute/action#start"
+      collection.action = Occi::Core::Action_instance.new
+      collection.resources << Occi::Core::Resource.new
+      collection.links << Occi::Core::Link.new
+      collection.kinds.first.should be_kind_of Occi::Core::Kind
+      collection.mixins.first.should be_kind_of Occi::Core::Mixin
+      collection.actions.first.should be_kind_of Occi::Core::Action
+      collection.resources.first.should be_kind_of Occi::Core::Resource
+      collection.links.first.should be_kind_of Occi::Core::Link
+      collection.action.should be_kind_of Occi::Core::Action_instance
+    end
 
+    it "registers a model, creates a new OCCI Resource and checks it against the model" do
+      collection = Occi::Collection.new
+      collection.model.should be_kind_of Occi::Model
+      collection.resources.create 'http://schemas.ogf.org/occi/core#resource'
+      collection.resources.first.should be_kind_of Occi::Core::Resource
+      expect { collection.check }.to_not raise_error
     end
+
   end
 end

data/spec/occi/core/categories_spec.rb

@@ -0,0 +1,30 @@
+require 'rspec'
+require 'occi'
+
+module Occi
+  module Core
+    describe Categories do
+
+      it "replaces an existing category instance when a model is added with the instance from the model"  do
+        categories = Occi::Core::Categories.new
+        categories << Occi::Core::Resource.kind
+        model = Occi::Model.new
+        resource = model.get_by_id Occi::Core::Resource.type_identifier
+        resource.location = '/new_location/'
+        categories.model = model
+        categories.first.location.should == '/new_location/'
+      end
+
+      it "replaces a category string when a model is added with the instance from the model"  do
+        categories = Occi::Core::Categories.new
+        categories << Occi::Core::Resource.type_identifier
+        model = Occi::Model.new
+        resource = model.get_by_id Occi::Core::Resource.type_identifier
+        resource.location = '/new_location/'
+        categories.model = model
+        categories.first.location.should == '/new_location/'
+      end
+
+    end
+  end
+end

data/spec/occi/core/category_spec.rb

@@ -0,0 +1,41 @@
+require "rspec"
+require 'occi'
+
+module Occi
+  module Core
+    describe Category do
+
+      it "gets OCCI Resource class by term and scheme" do
+        scheme = 'http://schemas.ogf.org/occi/core'
+        term   = 'resource'
+        klass  = Occi::Core::Category.get_class scheme, term
+        klass.should be Occi::Core::Resource
+        klass.superclass.should be Occi::Core::Entity
+      end
+
+      it "gets non predefined OCCI class by term, scheme and related class" do
+        scheme  = 'http://example.com/occi'
+        term    = 'test'
+        related = ['http://schemas.ogf.org/occi/core#resource']
+        klass   = Occi::Core::Category.get_class scheme, term, related
+        klass.should be Com::Example::Occi::Test
+        klass.superclass.should be Occi::Core::Resource
+      end
+
+      it "does not get OCCI class by term and scheme if it relates to existing class not derived from OCCI Entity" do
+        scheme  = 'http://hashie/'
+        term    = 'mash'
+        related = ['http://schemas.ogf.org/occi/core#resource']
+        expect { Occi::Core::Category.get_class scheme, term, related }.to raise_error
+      end
+
+      it "checks if the category is related to another category" do
+        category = Occi::Core::Resource.kind
+        category.related_to?(Occi::Core::Entity.kind).should be true
+      end
+
+      # rendering
+
+    end
+  end
+end

data/spec/occi/core/entity_spec.rb

@@ -0,0 +1,52 @@
+require "rspec"
+require 'occi'
+
+module Occi
+  module Core
+    describe Entity do
+
+      it "initializes itself successfully" do
+        entity = Occi::Core::Entity.new
+        entity.should be_kind_of Occi::Core::Entity
+      end
+
+      it "initializes a subclass successfully using a type identifier" do
+        type_identifier = 'http://example.com/testnamespace#test'
+        entity          = Occi::Core::Entity.new type_identifier
+        entity.should be_kind_of 'Com::Example::Testnamespace::Test'.constantize
+        entity.kind.type_identifier.should == type_identifier
+        entity.kind.related.first.should == Occi::Core::Entity.kind
+      end
+
+      it "initializes a subclass successfully using an OCCI Kind" do
+        kind   = Occi::Core::Resource.kind
+        entity = Occi::Core::Entity.new kind
+        entity.should be_kind_of Occi::Core::Resource
+        entity.kind.type_identifier.should == Occi::Core::Resource.type_identifier
+        entity.kind.related.first.should == Occi::Core::Entity.kind
+      end
+
+      it "converts mixin type identifiers to objects if a mixin is added to the entities mixins" do
+        mixin  = 'http://example.com/mynamespace#mymixin'
+        entity = Occi::Core::Entity.new
+        entity.mixins << mixin
+        entity.mixins.first.to_s.should == mixin
+      end
+
+      # TODO: check adding of model
+      it "checks the attributes against their definition in its kind and associated mixins" do
+        entity = Occi::Core::Entity.new
+        expect { entity.check }.to raise_error
+        entity.model = Occi::Model.new
+        entity.title = 'test'
+        uuid         = UUIDTools::UUID.random_create.to_s
+        entity.id    = uuid
+        expect { entity.check }.to_not raise_error
+        entity.id = 0
+        expect { entity.check }.to raise_error
+      end
+
+
+    end
+  end
+end

data/spec/occi/core/resource_spec.rb

@@ -0,0 +1,21 @@
+require "rspec"
+require 'occi'
+
+module Occi
+  module Core
+    describe Resource do
+
+      it "should link another resource succesfully" do
+        resource = Occi::Core::Resource.new
+        target = Occi::Core::Resource.new
+        # create a random ID as the resource must already exist and therefore must have an ID assigned
+        target.id = UUIDTools::UUID.random_create.to_s
+        resource.link target
+        resource.links.should have(1).link
+        resource.links.first.should be_kind_of Occi::Core::Link
+        resource.links.first.target.should be target
+      end
+
+    end
+  end
+end

data/spec/occi/infrastructure/compute_spec.rb

@@ -0,0 +1,32 @@
+require 'rspec'
+require 'occi'
+
+module Occi
+  module Infrastructure
+    describe Compute do
+
+      it "should create a storagelink to an existing storage resource" do
+        compute = Occi::Infrastructure::Compute.new
+        target = Occi::Infrastructure::Storage.new
+        # create a random ID as the storage resource must already exist and therefore must have an ID assigned
+        target.id = UUIDTools::UUID.random_create.to_s
+        compute.storagelink target
+        compute.links.should have(1).link
+        compute.links.first.should be_kind_of Occi::Infrastructure::Storagelink
+        compute.links.first.target.should be target
+      end
+
+      it "should create a networkinterface to an existing network resource" do
+        compute = Occi::Infrastructure::Compute.new
+        target = Occi::Infrastructure::Network.new
+        # create a random ID as the network resource must already exist and therefore must have an ID assigned
+        target.id = UUIDTools::UUID.random_create.to_s
+        compute.networkinterface target
+        compute.links.should have(1).link
+        compute.links.first.should be_kind_of Occi::Infrastructure::Networkinterface
+        compute.links.first.target.should be target
+      end
+
+    end
+  end
+end

data/spec/occi/log_spec.rb

@@ -1,17 +1,17 @@
 require "rspec"
 require 'occi/log'
 
-module OCCI
+module Occi
   describe Log do
 
-    describe "log messages" do
-      it "should log a message to a pipe" do
-        r, w = IO.pipe
-        logger = OCCI::Log.new(w)
-        logger.level = OCCI::Log::INFO
-        OCCI::Log.info("Test")
-        r.readline.include?("Test")
-      end
+    it "should log a message to a pipe" do
+      r, w = IO.pipe
+      logger = Occi::Log.new(w)
+      logger.level = Occi::Log::INFO
+      Occi::Log.info("Test")
+      r.readline.include?("Test")
+      logger.close
     end
+
   end
-end
+end

data/spec/occi/model_spec.rb

@@ -1,33 +1,33 @@
 require "rspec"
-require 'occi/model'
+require 'occi'
 
 describe "Model" do
 
   it "initializes Core Model successfully" do
-    model = OCCI::Model.new
-    model.get_by_id('http://schemas.ogf.org/occi/core#entity').should be_kind_of OCCI::Core::Kind
-    model.get_by_id('http://schemas.ogf.org/occi/core#resource').should be_kind_of OCCI::Core::Kind
-    model.get_by_id('http://schemas.ogf.org/occi/core#link').should be_kind_of OCCI::Core::Kind
+    model = Occi::Model.new
+    model.get_by_id('http://schemas.ogf.org/occi/core#entity').should be_kind_of Occi::Core::Kind
+    model.get_by_id('http://schemas.ogf.org/occi/core#resource').should be_kind_of Occi::Core::Kind
+    model.get_by_id('http://schemas.ogf.org/occi/core#link').should be_kind_of Occi::Core::Kind
   end
 
   it "initializes Infrastructure Model successfully" do
-    model = OCCI::Model.new
+    model = Occi::Model.new
     model.register_infrastructure
-    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#compute').should be_kind_of OCCI::Core::Kind
-    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#os_tpl').should be_kind_of OCCI::Core::Mixin
-    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#resource_tpl').should be_kind_of OCCI::Core::Mixin
-    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#network').should be_kind_of OCCI::Core::Kind
-    model.get_by_id('http://schemas.ogf.org/occi/infrastructure/network#ipnetwork').should be_kind_of OCCI::Core::Mixin
-    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#networkinterface').should be_kind_of OCCI::Core::Kind
-    model.get_by_id('http://schemas.ogf.org/occi/infrastructure/networkinterface#ipnetworkinterface').should be_kind_of OCCI::Core::Mixin
-    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#storage').should be_kind_of OCCI::Core::Kind
-    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#storagelink').should be_kind_of OCCI::Core::Kind
+    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#compute').should be_kind_of Occi::Core::Kind
+    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#os_tpl').should be_kind_of Occi::Core::Mixin
+    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#resource_tpl').should be_kind_of Occi::Core::Mixin
+    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#network').should be_kind_of Occi::Core::Kind
+    model.get_by_id('http://schemas.ogf.org/occi/infrastructure/network#ipnetwork').should be_kind_of Occi::Core::Mixin
+    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#networkinterface').should be_kind_of Occi::Core::Kind
+    model.get_by_id('http://schemas.ogf.org/occi/infrastructure/networkinterface#ipnetworkinterface').should be_kind_of Occi::Core::Mixin
+    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#storage').should be_kind_of Occi::Core::Kind
+    model.get_by_id('http://schemas.ogf.org/occi/infrastructure#storagelink').should be_kind_of Occi::Core::Kind
   end
 
   it "returns all registered categories" do
-    model = OCCI::Model.new
+    model = Occi::Model.new
     collection = model.get
-    collection.kind_of? OCCI::Collection
+    collection.kind_of? Occi::Collection
     collection.kinds.should have(3).kinds
     collection.mixins.should be_empty
     collection.actions.should be_empty
@@ -36,17 +36,17 @@ describe "Model" do
   end
 
   it "returns categories with filter" do
-    model = OCCI::Model.new
+    model = Occi::Model.new
     model.register_infrastructure
-    compute = OCCI::Core::Kind.new('http://schemas.ogf.org/occi/infrastructure#','compute')
-    ipnetwork = OCCI::Core::Mixin.new('http://schemas.ogf.org/occi/infrastructure/network#','ipnetwork')
-    filter = OCCI::Collection.new
+    compute = Occi::Core::Kind.new('http://schemas.ogf.org/occi/infrastructure#','compute')
+    ipnetwork = Occi::Core::Mixin.new('http://schemas.ogf.org/occi/infrastructure/network#','ipnetwork')
+    filter = Occi::Collection.new
     filter.kinds << compute
     filter.mixins << ipnetwork
     collection = model.get(filter)
-    collection.kind_of? OCCI::Collection
-    collection.kinds.first.attributes.should be_kind_of OCCI::Core::AttributeProperties
-    collection.mixins.first.attributes.should be_kind_of OCCI::Core::AttributeProperties
+    collection.kind_of? Occi::Collection
+    collection.kinds.first.attributes.should be_kind_of Occi::Core::Attributes
+    collection.mixins.first.attributes.should be_kind_of Occi::Core::Attributes
     collection.actions.should be_empty
     collection.resources.should be_empty
     collection.links.should be_empty

data/spec/occi/parser_spec.rb

@@ -1,64 +1,114 @@
 require "rspec"
-require 'occi/parser'
+require 'occi'
 
 describe "Parser" do
 
-  it "should parse OCCI message with entity in text plain format" do
-    media_type    = 'text/plain'
-    body          = %Q|Category: compute; scheme="http://schemas.ogf.org/occi/infrastructure#"; class="kind"\nX-OCCI-Attribute: occi.compute.cores=2|
-    _, collection = OCCI::Parser.parse(media_type, body)
-    collection.should be_kind_of OCCI::Collection
-    jj collection
-    compute_resources = collection.resources.select { |resource| resource.kind =='http://schemas.ogf.org/occi/infrastructure#compute' }
-    compute_resources.should have(1).compute_resource
-    compute_resources.first.attributes.occi!.compute!.cores.should == 2
+  it "should parse 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).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_text
+    # parse rendered collection and compare with original collection
+    Occi::Parser.parse('text/plain',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_text
+    # parse rendered collection and compare with original collection
+    Occi::Parser.parse('text/plain',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_text
+    # parse rendered collection and compare with original collection
+    Occi::Parser.parse('text/plain',rendered_collection).should == collection
   end
 
-  it "should parse OCCI message with entity in JSON format" do
-    media_type    = 'application/occi+json'
-    body          = File.read('spec/occi/test.json')
-    _, collection = OCCI::Parser.parse(media_type, body)
-    storage_resources = collection.resources.select { |resource| resource.kind == 'http://schemas.ogf.org/occi/infrastructure#storage' }
-    storage_resources.should have(1).storage_resource
-    storage_resources.first.attributes.occi!.core!.title.should == 'lamp'
-    network_resources = collection.resources.select { |resource| resource.kind == 'http://schemas.ogf.org/occi/infrastructure#network' }
-    network_resources.should have(1).network_resource
-    network_resources.first.attributes.occi!.core!.title.should == 'VM Network'
-    compute_resources = collection.resources.select { |resource| resource.kind == '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 == 256
+  it "should parse 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
   end
 
   it "should parse 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 == 'http://schemas.ogf.org/occi/infrastructure#storage' }
+    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.attributes.occi!.core!.title.should == 'lamp'
-    network_resources = collection.resources.select { |resource| resource.kind == 'http://schemas.ogf.org/occi/infrastructure#network' }
+    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.attributes.occi!.core!.title.should == 'VM Network'
-    compute_resources = collection.resources.select { |resource| resource.kind == 'http://schemas.ogf.org/occi/infrastructure#compute' }
+    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 == 256
+    compute_resources.first.attributes.occi!.compute!.memory.should == 0.25
   end
 
   it "should parse an OVA container" do
     media_type            = 'application/ova'
     body                  = File.read('spec/occi/test.ova')
-    locations, collection = OCCI::Parser.parse(media_type, body)
-    storage_resources     = collection.resources.select { |resource| resource.kind == 'http://schemas.ogf.org/occi/infrastructure#storage' }
+    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.attributes.occi!.core!.title.should == 'lamp'
-    network_resources = collection.resources.select { |resource| resource.kind == 'http://schemas.ogf.org/occi/infrastructure#network' }
+    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.attributes.occi!.core!.title.should == 'VM Network'
-    compute_resources = collection.resources.select { |resource| resource.kind == 'http://schemas.ogf.org/occi/infrastructure#compute' }
+    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 == 256
+    compute_resources.first.attributes.occi!.compute!.memory.should == 0.25
   end
-end
+
+end