occi 3.0.0.beta.1 → 3.0.0

data/lib/occi/api/client/http/net_http_fix.rb

@@ -2,49 +2,20 @@
 ## Net::HTTP hack allowing the use of X.509 proxy certificates.
 ##############################################################################
 
-# When running Ruby 1.8.x, RUBY_ENGINE is not defined
-RUBY_ENGINE = "ruby" unless defined? RUBY_ENGINE
-
-# detect jRuby
-if RUBY_ENGINE == 'jruby'
-  #TODO: add jRuby support, this doesn't work
-  module Net
-    class HTTP
+module Net
+  class HTTP
 
+    if defined? SSL_ATTRIBUTES
+      # For Rubies 1.9.x
       old_verbose, $VERBOSE = $VERBOSE, nil
       SSL_ATTRIBUTES = SSL_ATTRIBUTES.concat %w(extra_chain_cert)
       $VERBOSE = old_verbose
 
-      # An Array of certificates that will be sent to the client.
       attr_accessor :extra_chain_cert
-
-    end
-  end
-else
-  net_http_fix_rby_ver = RUBY_VERSION.split('.')
-
-  # detect old Rubies, tested with 1.8.7-p371
-  if net_http_fix_rby_ver[1] == "8"
-    module Net
-      class HTTP
-
-        # An Array of certificates that will be sent to the client.
-        ssl_context_accessor :extra_chain_cert
-
-      end
+    else
+      # For legacy Rubies 1.8.x
+      ssl_context_accessor :extra_chain_cert
     end
-  else
-    module Net
-      class HTTP
-
-        old_verbose, $VERBOSE = $VERBOSE, nil
-        SSL_ATTRIBUTES = SSL_ATTRIBUTES.concat %w(extra_chain_cert)
-        $VERBOSE = old_verbose
 
-        # An Array of certificates that will be sent to the client.
-        attr_accessor :extra_chain_cert
-
-      end
-    end
   end
 end

data/lib/occi/api/dsl.rb

@@ -84,14 +84,44 @@ module Occi
         @client.get_mixin_types
       end
 
-      def mixins(*args)
+      def entity_types
         check
 
-        @client.get_mixins(*args)
+        @client.get_entity_types
+      end
+
+      def entity_type_identifiers
+        check
+
+        @client.get_entity_type_identifiers
+      end
+
+      def entity_types_related_to(*args)
+        check
+
+        @client.get_entity_types_related_to(*args)
+      end
+
+      def link_types
+        check
+
+        @client.get_link_types
+      end
+
+      def link_type_identifiers
+        check
+
+        @client.get_link_type_identifiers
       end
 
       ###
 
+      def mixins(*args)
+        check
+
+        @client.get_mixins(*args)
+      end
+
       def resource(*args)
         check
 

data/lib/occi/bin/occi_opts.rb

@@ -23,6 +23,7 @@ module Occi
         options.log[:out] = STDERR
         options.log[:level] = Occi::Log::WARN
 
+        options.filter = nil
         options.dump_model = false
 
         options.interactive = false
@@ -35,6 +36,7 @@ module Occi
         options.auth[:ca_path] = "/etc/grid-security/certificates"
         options.auth[:username] = "anonymous"
         options.auth[:ca_file] = nil
+        options.auth[:proxy_ca] = nil
 
         options.output_format = :plain
         
@@ -94,6 +96,11 @@ module Occi
             options.auth[:ca_file] = ca_file
           end
 
+          opts.on("-F",
+                  "--filter CATEGORY", String, "Category type identifier to filter categories from model, must be used together with the -m option") do |filter|
+            options.filter = filter
+          end
+
           opts.on("-x",
                   "--user-cred PATH",
                   String,
@@ -170,7 +177,7 @@ module Occi
 
           opts.on_tail("-m",
                        "--dump-model",
-                       "Contact the endpoint and dump its model") do |dump_model|
+                       "Contact the endpoint and dump its model, cannot be used with the interactive mode") do |dump_model|
             options.dump_model = dump_model
           end
 
@@ -219,6 +226,13 @@ module Occi
           exit!
         end
 
+        if !options.dump_model && options.filter
+          puts "You cannot use '--filter' without '--dump-model'!"
+          puts opts
+
+          exit!
+        end
+
         if !(options.interactive or options.dump_model)
           mandatory = []
 

data/lib/occi/collection.rb

@@ -6,14 +6,14 @@ module Occi
     # Initialize a new OCCI Collection by initializing all supplied OCCI objects
     #
     # @param [Hash] collection including one or more of the keys kinds, mixins, actions, resources, links
-    def initialize(collection={ }, model = Occi::Model.new)
+    def initialize(collection={}, model = Occi::Model.new)
       collection = Hashie::Mash.new(collection) unless collection.kind_of? Occi::Collection
 
-      @kinds     = Occi::Core::Kinds.new
-      @mixins    = Occi::Core::Mixins.new
-      @actions   = Occi::Core::Actions.new
+      @kinds = Occi::Core::Kinds.new
+      @mixins = Occi::Core::Mixins.new
+      @actions = Occi::Core::Actions.new
       @resources = Occi::Core::Resources.new
-      @links     = Occi::Core::Links.new
+      @links = Occi::Core::Links.new
 
       self.model = model if model
 
@@ -29,25 +29,25 @@ module Occi
       not intersect(category).empty?
     end
 
-    # @return [Array] categories combined list of all kinds, mixins and actions
+    # @return [Occi::Core::Categories] categories combined list of all kinds, mixins and actions
     def categories
-      @kinds + @mixins + @actions
+      Occi::Core::Categories.new(@kinds + @mixins + @actions)
     end
 
-    # @return [Array] entities combined list of all resources and links
+    # @return [Occi::Core::Entities] entities combined list of all resources and links
     def entities
-      @resources + @links
+      Occi::Core::Entities.new(@resources + @links)
     end
 
     # @param [Occi::Core::Model] model
     # @return [Occi::Core::Model]
     def model=(model)
-      @model           = model
-      @kinds.model     = model
-      @mixins.model    = model
-      @actions.model   = model
+      @model = model
+      @kinds.model = model
+      @mixins.model = model
+      @actions.model = model
       @resources.model = model
-      @links.model     = model
+      @links.model = model
     end
 
     def check
@@ -122,8 +122,19 @@ module Occi
       @kinds.empty? && @mixins.empty? && @actions.empty? && @resources.empty? && @links.empty? && @action.nil?
     end
 
+    # Returns a collection with all categories related to the specified category
+    #
+    # @param [Occi::Core::Category] category
+    # @return [Occi::Core::Collection]
+    def get_related_to(category)
+      collection = self.class.new
+      collection.kinds = @kinds.get_related_to(category)
+      collection.mixins = @mixins.get_related_to(category)
+      collection
+    end
+
     # @return [Hashie::Mash] json representation
-    def as_json(options = { })
+    def as_json(options = {})
       collection = Hashie::Mash.new
       collection.kinds = @kinds.collect { |kind| kind.as_json } if @kinds.any?
       collection.mixins = @mixins.collect { |mixin| mixin.as_json } if @mixins.any?

data/lib/occi/core/categories.rb

@@ -17,6 +17,14 @@ module Occi
         self.to_a.join(separator)
       end
 
+      # Returns a Set with all categories related to the specified category
+      #
+      # @param [Occi::Core::Category] category
+      # @return [Occi::Core::Categories]
+      def get_related_to(category)
+        self.class.new select { |cat| cat.related_to? category }
+      end
+
       # @param [Occi::Model] model
       # @return [Occi::Model]
       def model=(model)
@@ -26,7 +34,7 @@ module Occi
 
       # @param [Hash] options
       # @return [Hashie::Mash] json representation
-      def as_json(options={ })
+      def as_json(options={})
         self.to_a.as_json
       end
 

data/lib/occi/core/category.rb

@@ -16,9 +16,9 @@ module Occi
           term='category',
           title=nil,
           attributes=Occi::Core::Attributes.new)
-        @scheme     = scheme
-        @term       = term
-        @title      = title
+        @scheme = scheme
+        @term = term
+        @title = title
         @attributes = Occi::Core::AttributeProperties.parse attributes
       end
 
@@ -32,11 +32,13 @@ module Occi
 
         if related.first.to_s == 'http://schemas.ogf.org/occi/core#entity' or related.first.nil?
           parent = Occi::Core::Entity
-        elsif related.first.kind_of? Occi::Core::Category
+        elsif related.first.kind_of? Occi::Core::Kind
+          parent = related.first.entity_type
+        elsif related.first.kind_of? Occi::Core::Mixin
           parent = related.first.class
         else
           related_scheme, related_term = related.first.to_s.split '#'
-          parent                       = self.get_class related_scheme, related_term
+          parent = self.get_class related_scheme, related_term
         end
 
         uri = URI.parse(scheme)
@@ -62,7 +64,7 @@ module Occi
           end
         else
           klass = namespace.const_set term.classify, Class.new(parent)
-          klass.kind = Occi::Core::Kind.new scheme, term, nil, { }, related unless parent.ancestors.include? Occi::Core::Category
+          klass.kind = Occi::Core::Kind.new scheme, term, nil, {}, related unless parent.ancestors.include? Occi::Core::Category
         end
 
         klass
@@ -79,18 +81,25 @@ module Occi
       end
 
       # check if category is related to another category
+      # a category is related to another category
+      # if it is included in @related or
+      # if it is the category itself
+      #
       # @param [String, Category] category Related Category or its type identifier
       # @return [true,false] true if category is related to category_id else false
       def related_to?(category)
-        self.related.each do |cat|
-          return true if cat.to_s == category.to_s
-        end if @related
+        if @related
+          self.related.each do |cat|
+            return true if cat.to_s == category.to_s
+          end
+          return true if self.to_s == category.to_s
+        end
         false
       end
 
       # @param [Hash] options
       # @return [Hashie::Mash] json representation
-      def as_json(options={ })
+      def as_json(options={})
         category = Hashie::Mash.new
         category.scheme = @scheme if @scheme
         category.term = @term if @term
@@ -118,7 +127,7 @@ module Occi
 
       # @return [Hash] hash containing the HTTP headers of the text/occi rendering
       def to_header
-        { :Category => self.to_string }
+        {:Category => self.to_string}
       end
 
       # @return [String] json representation

data/lib/occi/core/link.rb

@@ -28,7 +28,6 @@ module Occi
           scheme, term = rel.to_s.split('#')
           @rel         = Occi::Core::Category.get_class(scheme, term).kind if scheme && term
         end
-        @rel ||= Occi::Core::Resource.kind
         @source = source if source
         @target = target
       end
@@ -58,9 +57,9 @@ module Occi
       end
 
       # @param [Occi::Model] model
-      def check(model)
+      def check
         raise "rel must be provided" unless @rel
-        super(model)
+        super
       end
 
       # @param [Hash] options
@@ -68,7 +67,7 @@ module Occi
       def as_json(options={ })
         link = super
         link.rel = @rel.to_s if @rel
-        link.source = self.source.to_s if self.source.kind_of? String if self.source
+        link.source = self.source.to_s if self.source.to_s
         link.target = self.target.to_s if self.target
         link
       end
@@ -86,7 +85,7 @@ module Occi
           string << name + '=' + value + ';'
         end
         string << 'occi.core.target=' + self.target.to_s.inspect
-        string << 'occi.core.source=' + self.source.to_s.inspect if self.source.kind_of? String if self.source
+        string << 'occi.core.source=' + self.source.to_s.inspect if self.source.to_s
 
         string
       end

data/lib/occi/model.rb

@@ -76,10 +76,10 @@ module Occi
 
     # Return all categories from model. If filter is present, return only the categories specified by filter
     #
-    # @param [Occi::Collection] filter
+    # @param [Occi::Collection,Occi::Core::Category,String] filter
     # @return [Occi::Collection] collection
     def get(filter = nil)
-      filter ? intersect(filter) : self
+      filter ? self.get_related_to(filter) : self
     end
 
   end

data/lib/occi/parser.rb

@@ -2,11 +2,11 @@ module Occi
   class Parser
 
     # Declaring Class constants for OVF XML namespaces (defined in OVF specification ver.1.1)
-    OVF   ="http://schemas.dmtf.org/ovf/envelope/1"
-    RASD  ="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-    VSSD  ="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
+    OVF ="http://schemas.dmtf.org/ovf/envelope/1"
+    RASD ="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
+    VSSD ="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
     OVFENV="http://schemas.dmtf.org/ovf/environment/1"
-    CIM   ="http://schemas.dmtf.org/wbem/wscim/1/common"
+    CIM ="http://schemas.dmtf.org/wbem/wscim/1/common"
 
     # Parses an OCCI message and extracts OCCI relevant information
     # @param [String] media_type the media type of the OCCI message
@@ -15,12 +15,12 @@ module Occi
     # @param [Occi::Core::Resource,Occi::Core::Link] entity_type entity type to use for parsing of text plain entities
     # @param [Hash] header optional header of the OCCI message
     # @return [Occi::Collection] list consisting of an array of locations and the OCCI object collection
-    def self.parse(media_type, body, category=false, entity_type=Occi::Core::Resource, header={ })
+    def self.parse(media_type, body, category=false, entity_type=Occi::Core::Resource, header={})
       Occi::Log.debug '### Parsing request data to OCCI Collection ###'
       collection = Occi::Collection.new
 
       # remove trailing HTTP_ prefix if present
-      header = Hash[header.map {|k, v| [k.gsub('HTTP_','').upcase, v] }]
+      header = Hash[header.map { |k, v| [k.gsub('HTTP_', '').upcase, v] }]
 
       category ? collection = self.header_categories(header) : collection = self.header_entity(header, entity_type)
 
@@ -47,6 +47,7 @@ module Occi
 
     def self.locations(media_type, body, header)
       locations = self.header_locations(header)
+      locations << header['Location'] if !header['Location'].nil? && header['Location'].any?
       case media_type
         when 'text/uri-list'
           body.each_line { |line| locations << URI.parse(line.chomp) }
@@ -70,7 +71,7 @@ module Occi
     # @param [Hash] header
     # @return [Occi::Collection]
     def self.header_categories(header)
-      collection       = Occi::Collection.new
+      collection = Occi::Collection.new
       category_strings = header['CATEGORY'].to_s.split(',')
       category_strings.each do |cat|
         category = OCCIANTLR::Parser.new('Category: ' + cat).category
@@ -85,12 +86,12 @@ module Occi
     # @param [Class] entity_type
     # @return [Occi::Collection]
     def self.header_entity(header, entity_type)
-      collection       = Occi::Collection.new
-      entity           = Hashie::Mash.new
+      collection = Occi::Collection.new
+      entity = Hashie::Mash.new
       category_strings = header['CATEGORY'].to_s.split(',')
       return collection if category_strings.empty?
       attribute_strings = header['X_OCCI_ATTRIBUTE'].to_s.split(',')
-      categories        = Hashie::Mash.new({ :kinds => [], :mixins => [], :actions => [] })
+      categories = Hashie::Mash.new({:kinds => [], :mixins => [], :actions => []})
       category_strings.each do |category|
         cat = OCCIANTLR::Parser.new('Category: ' + category).category
         categories.kinds.concat cat.kinds
@@ -105,9 +106,9 @@ module Occi
       if entity_type == Occi::Core::Link
         entity.target = link.attributes!.occi!.core!.target
         entity.source = link.attributes!.occi!.core!.source
-        cats          = entity.categories.split(' ')
-        kind          = cats.reverse!.pop
-        mixins        = cats.categories
+        cats = entity.categories.split(' ')
+        kind = cats.reverse!.pop
+        mixins = cats.categories
         collection.links << Occi::Core::Link.new(kind, mixins, entity.attributes)
       elsif entity_type == Occi::Core::Resource
         link_strings = header['LINK'].to_s.split(',')
@@ -119,8 +120,8 @@ module Occi
             link.attributes!.occi!.core!.target = link.target
 
             link.categories = (link.categories.presence || %w'http://schemas.ogf.org/occi/core#link')
-            kind            = link.categories.reverse!.pop
-            mixins          = link.categories
+            kind = link.categories.reverse!.pop
+            mixins = link.categories
 
             collection.links << Occi::Core::Link.new(kind, mixins, link.attributes, link.actions, link.rel, link.target, link.source)
           end
@@ -155,9 +156,9 @@ module Occi
     # @return [Occi::Collection]
     def self.text_entity(text, entity_type)
       collection = Occi::Collection.new
-      entity     = Hashie::Mash.new
-      links      = []
-      categories = Hashie::Mash.new({ :kinds => [], :mixins => [], :actions => [] })
+      entity = Hashie::Mash.new
+      links = []
+      categories = Hashie::Mash.new({:kinds => [], :mixins => [], :actions => []})
       text.each_line do |line|
         if line.include? 'Category'
           cat = (OCCIANTLR::Parser.new(line.chomp).category)
@@ -173,9 +174,9 @@ module Occi
       if entity_type == Occi::Core::Link
         entity.target = links.first.attributes!.occi!.core!.target
         entity.source = links.first.attributes!.occi!.core!.source
-        cats          = entity.categories.split(' ')
-        kind          = cats.reverse!.pop
-        mixins        = cats
+        cats = entity.categories.split(' ')
+        kind = cats.reverse!.pop
+        mixins = cats
         collection.links << Occi::Core::Link.new(kind, mixins, entity.attributes)
       elsif entity_type == Occi::Core::Resource
         links.each do |link|
@@ -185,9 +186,9 @@ module Occi
             link.attributes!.occi!.core!.target = link.target
 
             link.categories = (link.categories.presence || %w'http://schemas.ogf.org/occi/core#link')
-            cats            = link.categories
-            kind            = link.categories.reverse!.pop
-            mixins          = link.categories
+            cats = link.categories
+            kind = link.categories.reverse!.pop
+            mixins = link.categories
 
             link = Occi::Core::Link.new(kind, mixins, link.attributes, link.actions, link.rel, link.target, link.source)
             collection.links << link
@@ -202,15 +203,16 @@ module Occi
     # @return [Occi::Collection]
     def self.json(json)
       collection = Occi::Collection.new
-      hash       = Hashie::Mash.new(JSON.parse(json))
+      hash = Hashie::Mash.new(JSON.parse(json))
       collection.kinds.merge hash.kinds.collect { |kind| Occi::Core::Kind.new(kind.scheme, kind.term, kind.title, kind.attributes, kind.related, kind.actions) } if hash.kinds
       collection.mixins.merge hash.mixins.collect { |mixin| Occi::Core::Mixin.new(mixin.scheme, mixin.term, mixin.title, mixin.attributes, mixin.related, mixin.actions) } if hash.mixins
       collection.actions.merge hash.actions.collect { |action| Occi::Core::Action.new(action.scheme, action.term, action.title, action.attributes) } if hash.actions
       collection.resources.merge hash.resources.collect { |resource| Occi::Core::Resource.new(resource.kind, resource.mixins, resource.attributes, resource.actions, resource.links) } if hash.resources
-      collection.links.merge hash.links.collect { |link| Occi::Core::Link.new(link.kind, link.mixins, link.attributes) } if hash.links
+      collection.links.merge hash.links.collect { |link| Occi::Core::Link.new(link.kind, link.mixins, link.attributes, [], nil, link.target) } if hash.links
 
-      if collection.resources.size == 1 & collection.links.size > 0
+      if collection.resources.size == 1 && collection.links.size > 0
         if collection.resources.first.links.empty?
+          collection.links.each { |link| link.source = collection.resources.first }
           collection.resources.first.links = collection.links
         end
       end
@@ -230,7 +232,7 @@ module Occi
     # @return [Occi::Collection]
     def self.xml(xml)
       collection = Occi::Collection.new
-      hash       = Hashie::Mash.new(Hash.from_xml(Nokogiri::XML(xml)))
+      hash = Hashie::Mash.new(Hash.from_xml(Nokogiri::XML(xml)))
       collection.kinds.merge hash.kinds.collect { |kind| Occi::Core::Kind.new(kind.scheme, kind.term, kind.title, kind.attributes, kind.related, kind.actions) } if hash.kinds
       collection.mixins.merge hash.mixins.collect { |mixin| Occi::Core::Mixin.new(mixin.scheme, mixin.term, mixin.title, mixin.attributes, mixin.related, mixin.actions) } if hash.mixins
       collection.actions.merge hash.actions.collect { |action| Occi::Core::Action.new(action.scheme, action.term, action.title, action.attributes) } if hash.actions
@@ -258,7 +260,7 @@ module Occi
       units = alloc_units.split('*')
       #check units[1] is nil??
       units[1].strip!
-      alloc_vars        = units[1].split('^')
+      alloc_vars = units[1].split('^')
       alloc_units_bytes = (alloc_vars[0].to_i**alloc_vars[1].to_i)
       alloc_units_bytes
     end
@@ -268,9 +270,9 @@ module Occi
     # @param [String] ova
     # @return [Occi::Collection]
     def self.ova(ova)
-      tar   = Gem::Package::TarReader.new(StringIO.new(ova))
-      ovf   = mf = cert = nil
-      files = { }
+      tar = Gem::Package::TarReader.new(StringIO.new(ova))
+      ovf = mf = cert = nil
+      files = {}
       tar.each do |entry|
         tempfile = Tempfile.new(entry.full_name)
         tempfile.write(entry.read)
@@ -295,10 +297,10 @@ module Occi
 
     # @param [String] ovf
     # @param [Hash] files key value pairs of file names and paths to the file
-    def self.ovf(ovf, files={ })
+    def self.ovf(ovf, files={})
       collection = Occi::Collection.new
-      doc        = Nokogiri::XML(ovf)
-      references = { }
+      doc = Nokogiri::XML(ovf)
+      references = {}
 
       doc.xpath('envelope:Envelope/envelope:References/envelope:File', 'envelope' => "#{Parser::OVF}").each do |file|
         href = URI.parse(file.attributes['href'].to_s)
@@ -316,10 +318,10 @@ module Occi
       doc.xpath('envelope:Envelope/envelope:DiskSection/envelope:Disk', 'envelope' => "#{Parser::OVF}").each do |disk|
         storage = Occi::Core::Resource.new('http://schemas.ogf.org/occi/infrastructure#storage')
         if disk.attributes['fileRef']
-          storagelink                               = Occi::Core::Link.new("http://schemas.ogf.org/occi/infrastructure#storagelink")
-          storagelink.attributes.occi!.core!.title  = disk.attributes['fileRef'].to_s
+          storagelink = Occi::Core::Link.new("http://schemas.ogf.org/occi/infrastructure#storagelink")
+          storagelink.attributes.occi!.core!.title = disk.attributes['fileRef'].to_s
           storagelink.attributes.occi!.core!.target = references[disk.attributes['fileRef'].to_s]
-          storage.attributes.occi!.core!.title      = disk.attributes['diskId'].to_s
+          storage.attributes.occi!.core!.title = disk.attributes['diskId'].to_s
           storage.links << storagelink
         else
           #OCCI accepts storage size in GB
@@ -333,7 +335,7 @@ module Occi
             capacity =capacity.to_i
           else
             alloc_unit_bytes = self.alloc_units_bytes(alloc_units)
-            capacity         = self.calculate_capacity_bytes(disk.attributes['capacity'].to_s, alloc_unit_bytes)
+            capacity = self.calculate_capacity_bytes(disk.attributes['capacity'].to_s, alloc_unit_bytes)
           end
           capacity_gb = self.calculate_capacity_gb(capacity)
           Occi::Log.debug('capacity in gb ' + capacity_gb.to_s)
@@ -344,7 +346,7 @@ module Occi
       end
 
       doc.xpath('envelope:Envelope/envelope:NetworkSection/envelope:Network', 'envelope' => "#{Parser::OVF}").each do |nw|
-        network                              = Occi::Core::Resource.new('http://schemas.ogf.org/occi/infrastructure#network')
+        network = Occi::Core::Resource.new('http://schemas.ogf.org/occi/infrastructure#network')
         network.attributes.occi!.core!.title = nw.attributes['name'].to_s
         collection.resources << network
       end
@@ -365,8 +367,8 @@ module Occi
                 alloc_units = resource_alloc.xpath("item:AllocationUnits/text()", 'item' => "#{Parser::RASD}").to_s
                 Occi::Log.debug('allocated units in ovf file: ' + alloc_units)
                 alloc_unit_bytes = self.alloc_units_bytes(alloc_units)
-                capacity         = self.calculate_capacity_bytes(resource_alloc.xpath("item:VirtualQuantity/text()", 'item' => "#{Parser::RASD}").to_s, alloc_unit_bytes)
-                capacity_gb      = self.calculate_capacity_gb(capacity)
+                capacity = self.calculate_capacity_bytes(resource_alloc.xpath("item:VirtualQuantity/text()", 'item' => "#{Parser::RASD}").to_s, alloc_unit_bytes)
+                capacity_gb = self.calculate_capacity_gb(capacity)
                 Occi::Log.debug('virtual quantity of memory configured in gb: ' + capacity_gb.to_s)
                 compute.attributes.occi!.compute!.memory = capacity_gb
               #  compute.attributes.occi!.compute!.memory = resource_alloc.xpath("item:VirtualQuantity/text()", 'item' => "#{Parser::RASD}").to_s.to_i
@@ -374,24 +376,24 @@ module Occi
               when "3" then
                 compute.attributes.occi!.compute!.cores = resource_alloc.xpath("item:VirtualQuantity/text()", 'item' => "#{Parser::RASD}").to_s.to_i
               when "10" then
-                networkinterface                              = Occi::Core::Link.new('http://schemas.ogf.org/occi/infrastructure#networkinterface')
+                networkinterface = Occi::Core::Link.new('http://schemas.ogf.org/occi/infrastructure#networkinterface')
                 networkinterface.attributes.occi!.core!.title = resource_alloc.xpath("item:ElementName/text()", 'item' => "#{Parser::RASD}").to_s
-                id                                            = resource_alloc.xpath("item:Connection/text()", 'item' => "#{Parser::RASD}").to_s
-                network                                       = collection.resources.select { |resource| resource.attributes.occi!.core!.title == id }.first
+                id = resource_alloc.xpath("item:Connection/text()", 'item' => "#{Parser::RASD}").to_s
+                network = collection.resources.select { |resource| resource.attributes.occi!.core!.title == id }.first
                 raise "Network with id #{id} not found" unless network
                 networkinterface.attributes.occi!.core!.target = network
               when "17" then
-                storagelink                              = Occi::Core::Link.new("http://schemas.ogf.org/occi/infrastructure#storagelink")
+                storagelink = Occi::Core::Link.new("http://schemas.ogf.org/occi/infrastructure#storagelink")
                 storagelink.attributes.occi!.core!.title = resource_alloc.xpath("item:ElementName/text()", 'item' => "#{Parser::RASD}").to_s
                 # extract the mountpoint
-                host_resource                            = resource_alloc.xpath("item:HostResource/text()", 'item' => "#{Parser::RASD}").to_s
+                host_resource = resource_alloc.xpath("item:HostResource/text()", 'item' => "#{Parser::RASD}").to_s
                 if host_resource.start_with? 'ovf:/disk/'
-                  id      = host_resource.gsub('ovf:/disk/', '')
+                  id = host_resource.gsub('ovf:/disk/', '')
                   storage = collection.resources.select { |resource| resource.attributes.occi!.core!.title == id }.first
                   raise "Disk with id #{id} not found" unless storage
                   storagelink.attributes.occi!.core!.target = storage
                 elsif host_resource.start_with? 'ovf:/file/'
-                  id                                        = host_resource.gsub('ovf:/file/', '')
+                  id = host_resource.gsub('ovf:/file/', '')
                   storagelink.attributes.occi!.core!.target = references[id]
                 end
                 compute.links << storagelink