omf_sfa 0.2.6 → 0.2.7

data/lib/omf-sfa/resource.rb

@@ -1,7 +1,9 @@
 
 require 'omf_sfa'
 module OMF::SFA
-  module Resource; end
+  module Resource
+    class ResourceException < Exception; end
+  end
 end
 
 require 'omf-sfa/resource/gurn'

data/lib/omf-sfa/resource/gurn.rb

@@ -3,6 +3,8 @@ require 'omf_base/lobject'
 
 module OMF::SFA::Resource
 #
+  class GurnMalformedException < ResourceException; end
+
   class GURN #< OMF::Base::MObject
 
     @@def_domain = "urn:publicid:IDN+acme.org"
@@ -19,7 +21,7 @@ module OMF::SFA::Resource
     def self.create(name, opts = {})
       return name if name.kind_of? self
       unless name
-        raise "No name given"
+        raise GurnMalformedException.new "No name given"
       end
       #puts "GUID: #{name}###{opts}"
 
@@ -58,11 +60,11 @@ module OMF::SFA::Resource
           prefix, name = a
           type = nil
         else
-          raise "unknown format '#{urn_str}' for GURN (#{a.inspect})."
+          raise GurnMalformedException.new "unknown format '#{urn_str}' for GURN (#{a.inspect})."
         end
         @@name2obj[urn_str] = self.new(name, type, prefix)
       else
-        raise "unknown format '#{urn_str}' for GURN - expected it to start with 'urn:publicid:IDN'."
+        raise GurnMalformedException.new "unknown format '#{urn_str}' for GURN - expected it to start with 'urn:publicid:IDN'."
       end
     end
 

data/lib/omf-sfa/resource/node.rb

@@ -14,7 +14,7 @@ module OMF::SFA::Resource
     oproperty :available, Boolean, :default => true
     oproperty :sliver_type, SliverType, :required => false # Is this required?
     oproperty :interfaces, :interface, :functional => false, :inverse => :node
-    oproperty :exclusive, Boolean, :default => true
+    oproperty :exclusive, Boolean, :default => false
     oproperty :services, OMF::SFA::Resource::AbstractService, functional: false
 
     #belongs_to :sliver

data/lib/omf-sfa/resource/oproperty.rb

@@ -62,7 +62,7 @@ module OMF::SFA::Resource
       if l = opts[:limit]
         q += " LIMIT #{l} OFFSET #{opts[:offset] || 0}"
       end
-      #debug "prop_all q: #{q}"
+      debug "prop_all q: #{q}"
       res = repository(:default).adapter.select(q)
       ores = res.map do |qr|
         if resource_class
@@ -93,7 +93,9 @@ module OMF::SFA::Resource
     # TODO: THIS IS REALLY BROKEN! Need to define what a query is in this context
     #
     def self._build_query(query, resource_class = nil)
+      #puts ">>>QUERY>>> #{query}"
       i = 0
+      resource = nil
       where = query.map do |pn, v|
         tbl = "p#{i}"
         case pn.to_sym
@@ -101,34 +103,31 @@ module OMF::SFA::Resource
           unless v.is_a? OResource
             raise "Expected type OResource for :resource, but got '#{v}::#{v.class}'"
           end
-          "#{tbl}.o_resource_id = #{v.id}"
-        when :name
-          "#{tbl}.name = '#{v}'"
+          resource = v
+          "r.id = #{resource.id}"
+          #"#{tbl}.o_resource_id = #{v.id}"
+        # resource property 'name' is not stored as a property but as a column in the resource
+        # when :name
+        #   "r.name = '#{v}'"
         else
           h = _analyse_value(v)
           i += 1
           if (val = h[:v]).is_a? String
             val = "'#{val}'"
           end
-          "#{tbl}.#{h[:f]} #{h[:t] == 's' ? 'LIKE' : '='} #{val}"
+          op = (h[:t] == 's' ? 'LIKE' : '=')
+          # TODO: Would also need to add a where clause "#{tbl}.name = #{pn} "
+          "#{tbl}.#{h[:f]} #{op} #{val}"
         end
       end
 
-      # TODO: Hack!!!
-      unless i <= 1
-        raise "Are you using the query facility on OProperties correctly? (#{i})"
-      else
-        i = 1
-      end
-
       i.times do |j|
         where << "r.id = p#{j}.o_resource_id"
       end
       where << "r.type = '#{resource_class}'" if resource_class
-
       table = storage_names[:default]
       from = i.times.map {|j| "#{table} AS p#{j}" }
-      from << "omf_sfa_resource_o_resources AS r" # TODO: Shouldn't hard-code that
+      from << "omf_sfa_resource_o_resources AS r" # TODO: Shouldn't hard-code that (why not?)
       [from, where]
     end
 

data/lib/omf-sfa/resource/oresource.rb

@@ -177,7 +177,7 @@ module OMF::SFA::Resource
               elsif v.respond_to?(m = "#{rev_m}=".to_sym)
                 v.send(m, self)
               else
-                raise "Can't find any setter '#{rev_m}' on '#{v}'"
+                raise "Can't find any setter '#{rev_m}' on '#{v}:#{v.class}'"
               end
             else
               # TODO: should remove this one form the reverse side
@@ -489,6 +489,9 @@ module OMF::SFA::Resource
           op.each do |k, v|
             k = k.to_sym
             unless (value = send(k)).nil?
+              if value.is_a?(OMF::SFA::Util::Promise) && value.resolved?
+                value = value.value
+              end
               #puts "OPROPS_TO_HAHS(#{k}): #{value}::#{value.class}--#{oproperty_get(k)}"
               #puts "OPROPS_TO_HAHS(#{k}): #{opts[:level]} >= #{opts[:max_level]}"
               if value.is_a? OResource
@@ -501,13 +504,19 @@ module OMF::SFA::Resource
               end
               if value.kind_of? Array
                 next if value.empty?
-                opts = opts.merge(level: opts[:level] + 1)
                 value = value.collect do |e|
-                  #(e.kind_of? OResource) ? (href_only ? e.href : e.to_hash(objs, opts)) : e
-                  (e.kind_of? OResource) ? e.to_hash(objs, opts) : e
+                  #puts "LEVLE: #{opts[:level]} - #{opts[:max_level]}"
+                  if e.kind_of? OResource
+                    if opts[:level] >= opts[:max_level]
+                      e.href
+                    else
+                      e.to_hash(objs, opts.merge(level: opts[:level] + 2))
+                    end
+                  else
+                    e
+                  end
                 end
               end
-
               h[k] = value
             end
           end

data/lib/omf-sfa/resource/sfa_base.rb

@@ -14,6 +14,7 @@ module OMF::SFA
     module Base
 
       SFA_NAMESPACE_URI = "http://www.geni.net/resources/rspec/3"
+      OMF_NAMESPACE_URI = "http://schema.mytestbed.net/rspec/3"
 
       module ClassMethods
 
@@ -62,6 +63,7 @@ module OMF::SFA
         def sfa_add_namespaces_to_document(doc)
           root = doc.root
           root.add_namespace(nil, SFA_NAMESPACE_URI)
+          root.add_namespace('omf', OMF_NAMESPACE_URI)
           @@sfa_namespaces.each do |name, opts|
             root.add_namespace(name.to_s, opts[:urn]) #'omf', 'http://tenderlovemaking.com')
           end
@@ -478,7 +480,7 @@ module OMF::SFA
           end
 
           unless opts[:suppress_uuid] || self.class.sfa_suppress_uuid?
-            new_element.set_attribute('uuid', self.uuid) #if detail_level > 0
+            new_element.set_attribute('omf:uuid', self.uuid) #if detail_level > 0
           end
 
           #if href = self.href(opts)

data/lib/omf-sfa/util/graph_json.rb

@@ -12,7 +12,7 @@ module OMF::SFA::Util
   end
 
 
-  # This class handles the convertion between GraphJson
+  # This class handles the conversion between GraphJson
   # and a set of resources.
   #
   # Usage:
@@ -25,6 +25,17 @@ module OMF::SFA::Util
       self.new.parse(JSON.parse(content, symbolize_names: true), opts)
     end
 
+    # Parse a hash following the GraphJSON format and return a
+    # list od resources.
+    #
+    # * opts
+    #   - :node_services Services to add to each node (default: [])
+    #   - :create_new_uuids Don't use '_id' for UUID, create new ones
+    #
+    def self.parse(descr_hash, opts = {})
+      self.new.parse(descr_hash, opts)
+    end
+
     # Parse a hash following the GraphJSON format and return a
     # list od resources.
     #
@@ -68,12 +79,17 @@ module OMF::SFA::Util
       @defaults = {node: {}, interface: {}, network: {}}
       (graph[:defaults] || {}).each do |type, h|
         type_def = @defaults[type.to_sym] ||= {}
-        h.each do |name, id|
-          unless ref = @id2descr[id]
-            raise GraphJSONException.new "Defaults refer to unknown id '#{id}'"
-          end
-          unless val = ref[name]
-            raise GraphJSONException.new "Defaults refer to unspecified property '#{name}' in '#{id}' - #{ref}"
+        h.each do |name, vh|
+          puts "DEFAULTS>>> #{type} - #{name} => #{vh}"
+          if ref_id = vh[:ref]
+            unless ref = @id2descr[ref_id]
+              raise GraphJSONException.new "Defaults refer to unknown id '#{id}' - #{@id2descr.keys}"
+            end
+            unless val = ref[name]
+              raise GraphJSONException.new "Defaults refer to unspecified property '#{name}' in '#{ref_id}' - #{ref}"
+            end
+          elsif (val = vh[:value]).nil?
+            raise GraphJSONException.new "Default '#{name}' for '#{type}' has no value defined - #{vh}"
           end
           type_def[name] = val
           #puts "#{type}::#{name} ===> #{val}"
@@ -105,7 +121,7 @@ module OMF::SFA::Util
       end
       opts[:uuid] = id unless @create_new_uuids
       opts[:name] = node[:name]
-      parse_value(node, :component_manager, el_defaults, opts, false)
+      parse_value(node, :am_urn, el_defaults, opts, true, :component_manager)
       parse_value(node, :urn, el_defaults, opts, false)
       opts[:sliver_type] = parse_sliver_type(node, el_defaults)
 
@@ -145,6 +161,7 @@ module OMF::SFA::Util
         next unless n_descr[:_type] == "node"
         node_id = n_descr[:_id]
         if_a = n_descr[:__ifs]
+        next unless if_a
 
         # Add names to all interfaces
         names = if_a.map {|ifd| ifd[:name] }.compact
@@ -226,23 +243,26 @@ module OMF::SFA::Util
 
     def parse_sliver_type(node, el_defaults)
       sliver_type = parse_value(node, :sliver_type, el_defaults, nil, true)
-      disk_image_url = parse_value(node, :disk_image, el_defaults, nil, true)
-      id = "#{sliver_type}-#{disk_image_url}"
+      disk_image_url = parse_value(node, :disk_image, el_defaults, nil, false)
+      id = "#{sliver_type}-#{disk_image_url || '__none'}"
       unless st_res = @sliver_types[id]
-        di = DiskImage.create(url: disk_image_url)
-        st_res = @sliver_types[id] = SliverType.create(name: sliver_type, disk_image: di)
+        opts = {name: sliver_type}
+        if disk_image_url
+          opts[:disk_image] = DiskImage.create(url: disk_image_url)
+        end
+        st_res = @sliver_types[id] = SliverType.create(opts)
       end
       st_res
     end
 
 
-    def parse_value(el, name, defaults, opts, is_mandatory = false)
+    def parse_value(el, name, defaults, opts, is_mandatory = false, opts_name = nil)
       val = el[name] || defaults[name]
       if is_mandatory && val.nil?
         raise GraphJSONException.new "Can't find value for mandatory property '#{name}' in '#{el}'"
       end
       if opts && !val.nil?
-        opts[name.to_sym] = val
+        opts[(opts_name || name).to_sym] = val
       end
       val
     end

data/lib/omf-sfa/util/promise.rb

@@ -0,0 +1,325 @@
+
+
+
+module OMF::SFA
+  module Util
+    class UtilException < Exception; end
+  end
+end
+
+module OMF::SFA::Util
+
+  class PromiseException < UtilException
+    attr_reader :promise
+
+    def initialize(promise)
+      @promise = promise
+    end
+  end
+
+  class PromiseUnresolvedException < PromiseException
+    attr_reader :promise, :uuid
+
+    def initialize(promise)
+      @promise = promise
+    end
+
+    def uuid
+      @uuid ||= UUIDTools::UUID.random_create
+    end
+  end
+
+  class PromiseAlreadySetException < PromiseException; end
+
+  class Promise < OMF::Base::LObject
+
+    # Returns a promise which fires when all dependencies
+    def self.all(*promises)
+      count = promises.length
+      results = []
+      new_promise = self.new()
+      if count == 0
+        new_promise.resolve(results)
+      else
+        already_rejected = false
+        promises.each_with_index do |p, i|
+          p.on_success do |v|
+            results[i] = v
+            if (count -= 1) <= 0
+              new_promise.resolve(results)
+            end
+          end
+          p.on_error do |err_code, msg|
+            unless already_rejected
+              already_rejected = true
+              new_promise.reject(err_code, msg)
+            end
+          end
+        end
+      end
+      new_promise
+    end
+
+    def value(exception_on_unresolved = PromiseUnresolvedException)
+      if @status == :resolved
+        @value
+      else
+        ex = exception_on_unresolved
+        raise ex.is_a?(PromiseException) ? ex.new(self) : ex
+      end
+    end
+
+    def error_msg(exception_on_unresolved = PromiseUnresolvedException)
+      if @status == :rejected
+        @value
+      else
+        ex = exception_on_unresolved
+        raise ex.is_a?(PromiseException) ? ex.new(self) : ex
+      end
+    end
+
+    def error_code(exception_on_unresolved = PromiseUnresolvedException)
+      if @status == :rejected
+        @err_code
+      else
+        ex = exception_on_unresolved
+        raise ex.is_a?(PromiseException) ? ex.new(self) : ex
+      end
+    end
+
+    # Resolve the promise.
+    #
+    # @param [Object] value of promise
+    #
+    def resolve(value)
+      raise PromiseAlreadySetException.new(self) unless @status == :pending
+
+      #puts "--------RESOLVE-#{@name}-#{@status}(#{@resolved_handlers.inspect}>>> "
+      if value.is_a? self.class
+        @status = :proxy
+        @proxy = value
+        @proxy.on_success {|v| _resolve(v)}
+        @proxy.on_error {|e, m| _reject(e, m)}
+      else
+        _resolve(value)
+      end
+      self
+    end
+
+    # Resolve the promise.
+    #
+    # @param [Object] Reject message
+    #
+    def reject(err_code, msg = nil)
+      unless msg
+        # no error code
+        msg = err_code
+        err_code = 999
+      end
+      unless @status == :pending
+        warn "No longer pending - #{self.inspect} - #{@value}"
+        raise PromiseAlreadySetException.new(self)
+      end
+      _reject(err_code, msg)
+      self
+    end
+
+    # Call block to allow modifications to the 'resolve' value
+    #
+    def filter(&block)
+      if @filter_block
+        raise "Can only define one filter block - previous #{@filter_block}"
+      end
+      @filter_block = block
+      if @status == :resolved
+        unless @resolved_handlers.empty?
+          warn "Attached filter after promise was already resolved and reported to 'on_success'"
+        end
+        _resolve(@value)
+      end
+      self
+    end
+
+    # To track the progress towards resolving or rejecting the promise
+    # the various tasks can report on their progress through this method.
+    # Calling it with an empty message will return an array of progress
+    # messages
+    #
+    def progress(msg = nil, timestamp = nil)
+      if msg
+        @progress << [timestamp ||= Time.now, msg]
+        if @progress_handlers
+          _call('on_progress', @progress_handlers, [timestamp, "  #{msg}"], false)
+        end
+      end
+      @progress
+    end
+
+    # Register block to call on success, or other promise to
+    # 'upcall' on success.
+    #
+    def on_success(other_promise = nil, &block)
+      if other_promise
+        raise "can't have block as well" if block
+        block = lambda {|v| other_promise.resolve(v) }
+      end
+      if @status == :resolved
+        _call('on_success', [block], [@value])
+      else
+        @resolved_handlers << block
+      end
+      self
+    end
+
+    # Register block to call on error, or other promise to
+    # 'upcall' on error.
+    #
+    def on_error(other_promise = nil, &block)
+      if other_promise
+        raise "can't have block as well" if block
+        block = lambda {|c, m| other_promise.reject(c, m) }
+      end
+      if @status == :rejected
+        _call('on_error', [block], [@err_code, @value])
+      else
+        @rejected_handlers << block
+      end
+      self
+    end
+
+    # Register block to call whenever this promise transitions
+    # out of 'pending'.
+    #
+    def on_always(&block)
+      if @status == :pending
+        @always_handlers << block
+      else
+        _call('on_always', [block], nil, false)
+      end
+      self
+    end
+
+    # Register block to call whenever a new progress message is being reported
+    #
+    def on_progress(other_promise = nil, prefix = nil, &block)
+      if other_promise
+        raise "can't have block as well" if block
+        block = lambda do |ts, m|
+          m = "  #{prefix ? "[#{prefix}]  " : ''}#{m}"
+          other_promise.progress(m, ts)
+        end
+      end
+      @progress.each do |ts, m|
+        #_call('on_progress', [block], [ts, "  #{prefix ? "#{prefix}: " : ''}#{m}"], false)
+        _call('on_progress', [block], [ts, m], false)
+      end
+      (@progress_handlers ||= []) << block
+      self
+    end
+
+    def resolved?
+      (@status == :proxy) ? @proxy.resolved? : (@status == :resolved)
+    end
+
+    def pending?
+      (@status == :proxy) ? @proxy.pending? : (@status == :pending)
+    end
+
+    def status
+      (@status == :proxy) ? @proxy.status : @status
+    end
+
+    def to_html
+      case @status
+      when :pending
+        '.... pending'
+      when :resolved
+        @value.to_s
+      else
+        "ERROR(#{@err_code}: #{@value}"
+      end
+    end
+
+    # def to_json(*a)
+    #   to_str().to_json(*a)
+    # end
+
+    def to_json(*a)
+      puts ">>> JSONIFY PROMISE - #{self.to_s} - #{@value}"
+      if @status == :resolved
+        @value.to_json(*a)
+      else
+        raise PromiseUnresolvedException.new(self)
+      end
+    end
+
+    def to_s
+      "#<#{self.class}:#{@name}-#{@status}>"
+    end
+
+
+    attr_reader :name
+
+    def initialize(name = nil)
+      @pretty_name = name
+      @name = "p#{hash()}"
+      @name += "-#{name}" if name
+      @status = :pending
+      @resolved_handlers = []
+      @rejected_handlers = []
+      @always_handlers = []
+      @progress = []
+      @progress_handlers = nil
+      progress "#{@pretty_name} started" if @pretty_name
+    end
+
+    private
+
+    def _resolve(value)
+      @status = :resolved
+      value = @filter_block.call(value) if @filter_block
+      @value = value
+      progress("#{@pretty_name} resolved") if @pretty_name
+      _call('on_success', @resolved_handlers, [value])
+      value
+    end
+
+    def _reject(err_code, msg)
+      @status = :rejected
+      #puts ">>>> REJECT MSG - #{msg.inspect} -- #{msg.respond_to? :pretty_print}"
+      if msg.respond_to? :pretty_print
+        msg = msg.pretty_print
+      end
+      @value = msg
+      @err_code = err_code
+      progress("#{@pretty_name} rejected") if @pretty_name
+      _call('on_error', @rejected_handlers, [err_code, msg])
+      nil
+    end
+
+    def _call(name, blocks, args, call_always_on_as_well = true)
+      blocks.each do |block|
+        begin
+          block.call(*args)
+        rescue Exception => ex
+          warn "(#{@name}) Exception while calling '#{name}' - #{ex} - #{block} - #{args}"
+          debug ex.backtrace.join("\n\t")
+          if name == 'on_success'
+            #return _call('on_error', @rejected_handlers, [-1, ex])
+            # TODO: Clarify this. Currently we could have multiple
+            # 'on_success' handlers, but the current logic will call
+            # all 'on_error' handles if one 'on_success' throws an
+            # exception and turns this promise into 'rejected'
+            return _reject(-1, ex)
+          end
+        end
+      end
+      if call_always_on_as_well
+        _call('on_always', @always_handlers, nil, false)
+      end
+    end
+
+
+
+  end
+end