RubyGems - omf_sfa - Versions diffs - 0.2.5 → 0.2.6 - Mend

omf_sfa 0.2.5 → 0.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

data/{examples → bin}/brite2rspec.rb +0 -0
data/lib/omf-sfa/am/am-rest/api_template.html +1 -0
data/lib/omf-sfa/am/am-rest/rest_handler.rb +143 -48
data/lib/omf-sfa/resource/channel.rb +1 -1
data/lib/omf-sfa/resource/link.rb +17 -2
data/lib/omf-sfa/resource/node.rb +4 -1
data/lib/omf-sfa/resource/oproperty.rb +127 -65
data/lib/omf-sfa/resource/oresource.rb +2 -1
data/lib/omf-sfa/resource/sfa_base.rb +14 -0
data/lib/omf-sfa/util/brite_parser.rb +160 -0
data/lib/omf-sfa/util/graph_json.rb +277 -0
data/lib/omf-sfa/version.rb +1 -1
data/omf_sfa.gemspec +4 -0
metadata +38 -3

data/{examples → bin}/brite2rspec.rb RENAMED Viewed

File without changes

data/lib/omf-sfa/am/am-rest/api_template.html CHANGED Viewed

@@ -25,6 +25,7 @@
       }
     </style>
     <link href="/assets/css/rest_api.css" rel="stylesheet">
+    ##HEADER##
   </head>
   <body>
     <div class="navbar navbar-inverse navbar-fixed-top">

data/lib/omf-sfa/am/am-rest/rest_handler.rb CHANGED Viewed

@@ -5,6 +5,7 @@ require 'uuid'
 require 'set'
 require 'json'
 require 'thin/async'
+require 'cgi'
 require 'omf_base/lobject'
@@ -57,8 +58,8 @@ module OMF::SFA::AM::Rest
   end
   class UnsupportedMethodException < RackException
-    def initialize()
-      super 403, "Unsupported Method"
+    def initialize(method_name = nil, class_name = nil)
+      super 403, "Unsupported Method '#{class_name || 'Unknown'}::#{method_name || 'Unknown'}'"
     end
   end
@@ -82,6 +83,18 @@ module OMF::SFA::AM::Rest
     end
   end
+  # Raised when a request triggers an async call whose
+  # result we need before answering the request
+  #
+  class RetryLaterException < Exception
+    attr_reader :delay
+    def initialize(delay = 3)
+      @delay = delay
+    end
+  end
   class RestHandler < OMF::Base::LObject
     @@service_name = nil
@@ -103,6 +116,19 @@ module OMF::SFA::AM::Rest
       self.new().render_html(parts)
     end
+    # Parse format of 'resource_uri' and (re)turn into a
+    # description hash (optionally provided).
+    #
+    def self.parse_resource_uri(resource_uri, description = {})
+      if UUID.validate(resource_uri)
+        description[:uuid] = resource_uri
+      elsif resource_uri.start_with? 'urn:'
+        description[:urn] = resource_uri
+      else
+        description[:name] = resource_uri
+      end
+      description
+    end
     def initialize(opts = {})
       @opts = opts
@@ -112,12 +138,13 @@ module OMF::SFA::AM::Rest
       begin
         Thread.current[:http_host] = env["HTTP_HOST"]
         req = ::Rack::Request.new(env)
+        headers = {
+          'Access-Control-Allow-Origin' => '*',
+          'Access-Control-Allow-Methods' => 'GET, POST, OPTIONS',
+          'Access-Control-Allow-Headers' => 'origin, x-csrftoken, content-type, accept'
+        }
         if req.request_method == 'OPTIONS'
-          return [200 ,{
-            'Access-Control-Allow-Origin' => '*' ,
-            'Access-Control-Allow-Methods' => 'GET, POST, OPTIONS',
-            'Access-Control-Allow-Headers' => 'origin, x-csrftoken, content-type, accept'
-          }, ""]
+          return [200 , headers, ""]
         end
         content_type, body = dispatch(req)
         if body.is_a? Thin::AsyncResponse
@@ -131,7 +158,8 @@ module OMF::SFA::AM::Rest
           body = JSON.pretty_generate(body)
         end
         #return [200 ,{'Content-Type' => content_type}, body + "\n"]
-        return [200 ,{'Content-Type' => content_type, 'Access-Control-Allow-Origin' => '*' , 'Access-Control-Allow-Methods' => 'GET, POST, OPTIONS' }, body + "\n"]
+        headers['Content-Type'] = content_type
+        return [200 , headers, body + "\n"]
       rescue RackException => rex
         return rex.reply
       rescue RedirectException => rex
@@ -139,16 +167,33 @@ module OMF::SFA::AM::Rest
         return [301, {'Location' => rex.path, "Content-Type" => ""}, ['Next window!']]
       # rescue OMF::SFA::AM::AMManagerException => aex
         # return RackException.new(400, aex.to_s).reply
+      rescue RetryLaterException => rex
+        body = {
+          type: 'retry',
+          delay: rex.delay
+        }
+        debug "Retry later request"
+        if req['_format'] == 'html'
+          headers['Refresh'] = rex.delay.to_s
+          opts = {} #{html_header: "<META HTTP-EQUIV='refresh' CONTENT='#{rex.delay}'>"}
+          body = convert_to_html(body, env, opts)
+          return [200 , headers, body + "\n"]
+        end
+        headers['Content-Type'] = 'application/json'
+        return [504, headers, JSON.pretty_generate(body)]
       rescue Exception => ex
         body = {
-          :error => {
-            :reason => ex.to_s,
-            :bt => ex.backtrace #.select {|l| !l.start_with?('/') }
+          type: 'error',
+          error: {
+            reason: ex.to_s,
+            bt: ex.backtrace #.select {|l| !l.start_with?('/') }
           }
         }
         warn "ERROR: #{ex}"
         debug ex.backtrace.join("\n")
-        return [500, { "Content-Type" => 'application/json', 'Access-Control-Allow-Origin' => '*', 'Access-Control-Allow-Methods' => 'GET, POST, OPTIONS' }, JSON.pretty_generate(body)]
+        headers['Content-Type'] = 'application/json'
+        return [500, headers, JSON.pretty_generate(body)]
       end
     end
@@ -168,7 +213,7 @@ module OMF::SFA::AM::Rest
       #debug 'POST(', resource_uri, '): body(', format, '): "', description, '"'
       if resource = opts[:resource]
-        debug 'POST: Modify ', resource
+        debug 'POST: Modify ', resource, ' --- ', resource.class
         modify_resource(resource, description, opts)
       else
         if description.is_a? Array
@@ -179,13 +224,13 @@ module OMF::SFA::AM::Rest
           return show_resources(resources, nil, opts)
         else
           debug 'POST: Create ', resource_uri
-          if resource_uri
-            if UUID.validate(resource_uri)
-              description[:uuid] = resource_uri
-            else
-              description[:name] = resource_uri
-            end
-          end
+          # if resource_uri
+            # if UUID.validate(resource_uri)
+              # description[:uuid] = resource_uri
+            # else
+              # description[:name] = resource_uri
+            # end
+          # end
           resource = create_resource(description, opts, resource_uri)
         end
       end
@@ -200,6 +245,7 @@ module OMF::SFA::AM::Rest
     end
     def on_delete(resource_uri, opts)
+      res = ['application/json', {}]
       if resource = opts[:resource]
         if (context = opts[:context])
           remove_resource_from_context(resource, context)
@@ -210,17 +256,21 @@ module OMF::SFA::AM::Rest
           resource.destroy
         end
       else
-        # Delete ALL resources of this type
-        raise OMF::SFA::AM::Rest::BadRequestException.new "I'm sorry, Dave. I'm afraid I can't do that."
+        res = on_delete_all(opts) || res
       end
-      resource.reload
-      return res
+      res
     end
+    def on_delete_all(opts)
+      # Delete ALL resources of this type
+      raise OMF::SFA::AM::Rest::BadRequestException.new "I'm sorry, Dave. I'm afraid I can't do that."
+    end
     def find_handler(path, opts)
-      debug "find_handler: path; '#{path}' opts: #{opts}"
-      resource_id = opts[:resource_uri] = path.shift
+      #debug "find_handler: path; '#{path}' opts: #{opts}"
+      debug "find_handler: path; '#{path}'"
+      rid = path.shift
+      resource_id = opts[:resource_uri] = (rid ? URI.decode(rid) : nil) # make sure we get rid of any URI encoding
       opts[:resource] = nil
       if resource_id
         resource = opts[:resource] = find_resource(resource_id, {}, opts)
@@ -231,7 +281,8 @@ module OMF::SFA::AM::Rest
       opts[:context] = resource
       comp = path.shift
       if (handler = @coll_handlers[comp.to_sym])
-        opts[:resource_uri] = path.join('/')
+        opts[:context_name] = comp
+        opts[:resource_uri] = URI.decode(path.join('/'))
         if handler.is_a? Proc
           return handler.call(path, opts)
         end
@@ -250,30 +301,38 @@ module OMF::SFA::AM::Rest
       end
       description.delete(:href)
       resource.update(description) ? resource : nil
-      #raise UnsupportedMethodException.new
     end
     def create_resource(description, opts, resource_uri = nil)
-      #debug "Create: #{description.class}--#{description}"
+      debug "Create: uri: '#{resource_uri.inspect}' class: #{description.class}--#{description}"
-      if resource_uri
-        if UUID.validate(resource_uri)
-          description[:uuid] = resource_uri
-        else
-          description[:name] = resource_uri
+      query = {}
+      unless (resource_uri || '').empty?
+        query = self.class.parse_resource_uri(resource_uri, query)
+        description.merge!(query)
+      else
+        [:uuid, :urn, :name].each do |k|
+          if v = description[k]
+            query[k] = v
+          end
         end
       end
       # Let's find if the resource already exists. If yes, just modify it
-      if uuid = description[:uuid]
-        debug 'Trying to find resource ', uuid, "'"
-        resource = @resource_class.first(uuid: uuid)
+      # if description[:uuid] || descri
+        # debug 'Trying to find resource ', uuid, "'"
+        # resource = @resource_class.first(uuid: uuid)
+      # end
+      unless query.empty?
+        debug 'Trying to find "', @resource_class, '" ', query, "'"
+        resource = @resource_class.first(query)
       end
       if resource
         modify_resource(resource, description, opts)
       else
-        resource = @resource_class.create(description)
+        debug 'Trying to create resource ', @resource_class, ' - ', description
+        resource = _really_create_resource(description, opts)
         on_new_resource(resource)
       end
       if (context = opts[:context])
@@ -282,6 +341,25 @@ module OMF::SFA::AM::Rest
       return resource
     end
+    def _really_create_resource(description, opts)
+      @resource_class.create(description)
+    end
+    # Parse format of 'resource_uri' and (re)turn into a
+    # description hash (optionally provided).
+    #
+    def _parse_resource_uri(resource_uri, description = {})
+      if UUID.validate(resource_uri)
+        description[:uuid] = resource_uri
+      elsif resource_uri.start_with? 'urn:'
+        description[:urn] = resource_uri
+      else
+        description[:name] = resource_uri
+      end
+      description
+    end
     # Can be used to further customize a newly created
     # resource.
     #
@@ -289,12 +367,12 @@ module OMF::SFA::AM::Rest
       debug "Created: #{resource}"
     end
-    def add_resource_to_context(user, context)
-      raise UnsupportedMethodException.new
+    def add_resource_to_context(resource, context)
+      raise UnsupportedMethodException.new(:add_resource_to_context, self.class)
     end
-    def remove_resource_from_context(user, context)
-      raise UnsupportedMethodException.new
+    def remove_resource_from_context(resource, context)
+      raise UnsupportedMethodException.new(:remove_resource_from_context, self.class)
     end
@@ -305,6 +383,7 @@ module OMF::SFA::AM::Rest
     # store them in +opts+.
     #
     def populate_opts(req, opts)
+      opts[:req] = req
       path = req.path_info.split('/').select { |p| !p.empty? }
       opts[:target] = find_handler(path, opts)
       rl = req.params.delete('_level')
@@ -411,12 +490,12 @@ module OMF::SFA::AM::Rest
       descr.delete(:resource_uri)
       if UUID.validate(resource_uri)
         descr[:uuid] = resource_uri
+      elsif resource_uri.start_with?('urn')
+        descr[:urn] = resource_uri
       else
         descr[:name] = resource_uri
       end
-      if resource_uri.start_with?('urn')
-        descr[:urn] = resource_uri
-      end
       #authenticator = Thread.current["authenticator"]
       debug "Finding #{@resource_class}.first(#{descr})"
       @resource_class.first(descr)
@@ -424,7 +503,11 @@ module OMF::SFA::AM::Rest
     def show_resource_list(opts)
       # authenticator = Thread.current["authenticator"]
-      resources = @resource_class.all()
+      if (context = opts[:context])
+        resources = context.send(opts[:context_name].to_sym)
+      else
+        resources = @resource_class.all()
+      end
       show_resources(resources, nil, opts)
     end
@@ -433,9 +516,10 @@ module OMF::SFA::AM::Rest
       hopts = {max_level: opts[:max_level], level: 0}
       objs = {}
       res_hash = resources.map do |a|
+        next unless a # TODO: This seems to be a bug in OProperty (removing objects)
         a.to_hash(objs, hopts)
         #a.to_hash_brief(:href_use_class_prefix => true)
-      end
+      end.compact
       if resource_name
         prefix = about = opts[:req].path
         res = {
@@ -488,6 +572,7 @@ module OMF::SFA::AM::Rest
     # Render an HTML page using the resource's template. The
     # template is populated with information provided in 'parts'
     #
+    # * :header - HTML header additions
     # * :title - HTML title
     # * :service - Service path (usually a set of <a>)
     # * :content - Main content
@@ -497,6 +582,9 @@ module OMF::SFA::AM::Rest
     def render_html(parts = {})
       #puts "PP>> #{parts}"
       tmpl = html_template()
+      if (header = parts[:header])
+        tmpl = tmpl.gsub('##HEADER##', header)
+      end
       if (result = parts[:result])
         tmpl = tmpl.gsub('##JS##', JSON.pretty_generate(result))
       end
@@ -532,6 +620,7 @@ module OMF::SFA::AM::Rest
       _convert_obj_to_html(body, nil, res, opts)
       render_html(
+        header: opts[:html_header] || '',
         result: body,
         title: @@service_name || env["HTTP_HOST"],
         service: h2.join('/'),
@@ -546,7 +635,7 @@ module OMF::SFA::AM::Rest
     protected
     def _convert_obj_to_html(obj, ref_name, res, opts)
       klass = obj.class
-      #puts "CONVERT>>>> #{obj.class}::#{obj}"
+      #puts "CONVERT>>>> #{ref_name} ... #{obj.class}::#{obj.to_s[0 .. 80]}"
       if (obj.is_a? OMF::SFA::Resource::OPropertyArray) || obj.is_a?(Array)
         if obj.empty?
           res << '<span class="empty">empty</span>'
@@ -563,6 +652,9 @@ module OMF::SFA::AM::Rest
         if obj.to_s.start_with? 'http://'
           res << _convert_link_to_html(obj)
         else
+          if obj.is_a? String
+            obj = CGI.escapeHTML obj
+          end
           res << " <span class='value'>#{obj}</span> "
         end
       end
@@ -573,6 +665,9 @@ module OMF::SFA::AM::Rest
       array.each do |obj|
         #puts "AAA>>>> #{obj}::#{opts}"
         name = nil
+        if (obj.is_a? OMF::SFA::Resource::OResource)
+          obj = obj.to_hash()
+        end
         if obj.is_a? Hash
           if name = obj[:name] || obj[:uuid]
             res << "<li><span class='key'>#{_convert_link_to_html obj[:href], name}:</span>"

data/lib/omf-sfa/resource/channel.rb CHANGED Viewed

@@ -15,7 +15,7 @@ module OMF::SFA::Resource
     sfa_class 'channel', :namespace => :ol
     sfa :number, :attribute => true
     sfa :frequency, :attribute => true
-    sfa :interfaces, :inline => true, :has_many => true
+    sfa :interfaces, :inline => true, :has_many => true, :inverse => :channel
     def _from_sfa_interfaces_property_xml(resource_el, props, context)
       resource_el.children.each do |el|

data/lib/omf-sfa/resource/link.rb CHANGED Viewed

@@ -1,5 +1,5 @@
+require 'set'
 require 'omf-sfa/resource/channel'
 #require 'omf-sfa/resource/link_property'
@@ -21,10 +21,25 @@ module OMF::SFA::Resource
     oproperty :packet_loss, Float # 0 .. 1
     sfa_class 'link'
-    sfa :link_type, :content_attribute => :name
+    sfa :link_type, attr_value: 'name' #:content_attribute => :name
+    sfa :component_manager
     sfa :property # sets capacity, latency and packet_loss
     #sfa :properties, LinkProperty, :inline => true, :has_many => true
+    #Override xml serialization of 'component_manager'
+    def _to_sfa_xml_component_manager(res_el, pdef, obj2id, opts)
+      cms = Set.new
+      self.interfaces.each do |ifs|
+        cms << ifs.node.component_manager
+      end
+      cms.each do |cm|
+        next unless cm # not sure if 'nil' could show up her
+        el = res_el.add_child(Nokogiri::XML::Element.new('component_manager', res_el.document))
+        el.set_attribute('name', cm)
+      end
+    end
     #Override xml serialization of 'property'
     def _to_sfa_xml_property(res_el, pdef, obj2id, opts)
       capacity = self.capacity

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

@@ -9,16 +9,18 @@ module OMF::SFA::Resource
   class Node < OComponent
+    oproperty :component_manager, String, :required => false
     oproperty :hardware_type, String, :required => false
     oproperty :available, Boolean, :default => true
     oproperty :sliver_type, SliverType, :required => false # Is this required?
-    oproperty :interfaces, :interface, :functional => false
+    oproperty :interfaces, :interface, :functional => false, :inverse => :node
     oproperty :exclusive, Boolean, :default => true
     oproperty :services, OMF::SFA::Resource::AbstractService, functional: false
     #belongs_to :sliver
     sfa_class 'node'
+    sfa :component_manager, attr_value: 'name'
     sfa :hardware_type, :inline => true, :has_many => true
     sfa :available, attr_value: 'now', in_request: false  # <available now="true">
     #sfa :sliver_type, :attr_value => 'name'
@@ -28,6 +30,7 @@ module OMF::SFA::Resource
     sfa :services, :has_many => true
     # Override xml serialization of 'interface'
     def _to_sfa_property_xml(pname, value, res_el, pdef, obj2id, opts)
       if pname == 'interfaces'

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

@@ -8,26 +8,26 @@ require 'omf_base/lobject'
 # and overrides Time objects serialization. We want 'JSON.load' to return actual Time
 # objects instead of Strings.
 #
-class Time
-  def to_json(*args)
-    {
-      JSON.create_id => self.class.name,
-      's' => tv_sec,
-      'n' => respond_to?(:tv_nsec) ? tv_nsec : tv_usec * 1000
-    }.to_json(*args)
-  end
-  def self.json_create(object)
-    if usec = object.delete('u') # used to be tv_usec -> tv_nsec
-      object['n'] = usec * 1000
-    end
-    if instance_methods.include?(:tv_nsec)
-      at(object['s'], Rational(object['n'], 1000))
-    else
-      at(object['s'], object['n'] / 1000)
-    end
-  end
-end
+# class Time
+  # def to_json(*args)
+    # {
+      # JSON.create_id => self.class.name,
+      # 's' => tv_sec,
+      # 'n' => respond_to?(:tv_nsec) ? tv_nsec : tv_usec * 1000
+    # }.to_json(*args)
+  # end
+#
+  # def self.json_create(object)
+    # if usec = object.delete('u') # used to be tv_usec -> tv_nsec
+      # object['n'] = usec * 1000
+    # end
+    # if instance_methods.include?(:tv_nsec)
+      # at(object['s'], Rational(object['n'], 1000))
+    # else
+      # at(object['s'], object['n'] / 1000)
+    # end
+  # end
+# end
 #raise "JSON deserialisation no longer working - require 'json' early" unless JSON.load(Time.now.to_json).is_a? Time
@@ -42,35 +42,27 @@ module OMF::SFA::Resource
     property :name, String
     property :type, String, length: 2
-    property :s_value, String # actually serialized Object
+    property :s_value, Text, :lazy => false # actually serialized Object
     property :n_value, Float
     belongs_to :o_resource
-    def self.prop_all(query, opts = {}, resource_class = nil)
-      i = 0
-      where = query.map do |pn, v|
-        h = _analyse_value(v)
-        tbl = "p#{i}"
-        i += 1
-        if (val = h[:v]).is_a? String
-          val = "'#{val}'"
-        end
-        "#{tbl}.#{h[:f]} #{h[:t] == 's' ? 'LIKE' : '='} #{val}"
-      end
-      i.times do |j|
-        where << "r.id = p#{j}.o_resource_id"
+    def self.create(attr = {})
+      if (value = attr.delete(:value))
+        h = self._analyse_value(value)
+        attr[h[:f]] = h[:v]
+        attr[:type] = h[:t]
       end
-      where << "r.type = '#{resource_class}'" if resource_class
+      super
+    end
-      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
+    def self.prop_all(query, opts = {}, resource_class = nil)
+      from, where = self._build_query(query, resource_class)
       q = "SELECT DISTINCT r.id, r.type, r.uuid, r.name FROM #{from.join(', ')} WHERE #{where.join(' AND ')};"
       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
@@ -83,6 +75,63 @@ module OMF::SFA::Resource
       ores
     end
+    def self.count(query)
+      from, where = self._build_query(query)
+      q = "SELECT COUNT(r.id) FROM #{from.join(', ')} WHERE #{where.join(' AND ')};"
+      res = repository(:default).adapter.select(q)
+      #debug "count res: #{res} q: #{query} sql: #{q}"
+      res[0]
+    end
+    # Query:
+    #    resource: Resource to find properties for
+    #    name: Name of property
+    #    value: Value of property
+    #
+    # Return the FROM and WHERE elements for 'query'
+    #
+    # TODO: THIS IS REALLY BROKEN! Need to define what a query is in this context
+    #
+    def self._build_query(query, resource_class = nil)
+      i = 0
+      where = query.map do |pn, v|
+        tbl = "p#{i}"
+        case pn.to_sym
+        when :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}'"
+        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}"
+        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, where]
+    end
     @@name2class = {}
     def self._create_resource(query_result)
       qr = query_result
@@ -102,31 +151,12 @@ module OMF::SFA::Resource
     def value=(val)
       h = self.class._analyse_value(val)
+      #puts "VALUE>>> #{h}"
       attribute_set(h[:f], h[:v])
       attribute_set(:type, h[:t])
       save
     end
-      # if val.is_a? Numeric
-        # attribute_set(:n_value, val)
-        # attribute_set(:type, (val.is_a? Integer) ? 'i' : 'f')
-      # elsif val.is_a? String
-        # attribute_set(:s_value, val)
-        # attribute_set(:type, 's')
-      # elsif val.is_a? OResource
-        # attribute_set(:s_value, val.uuid.to_s)
-        # attribute_set(:type, 'r')
-      # elsif val.is_a? Time
-        # attribute_set(:n_value, val.to_i)
-        # attribute_set(:type, 't')
-      # else
-        # puts "OOOOO INSETRT (#{attribute_get(:name)})> #{val.class}"
-        # attribute_set(:s_value, JSON.generate([val]))
-        # attribute_set(:type, 'o')
-      # end
-      # save
-    # end
     def self._analyse_value(val)
       if val.is_a? Numeric
@@ -233,18 +263,41 @@ module OMF::SFA::Resource
   end # OProperty
   class OPropertyArray
     def <<(val)
-      #puts ">>> Adding #{val} to #{@name} - #{@on_set_block}"
-      p = OProperty.create(name: @name, o_resource: @resource)
+      #puts "------------------ Checking #{@resource.name} => #{@name}"
       if @on_set_block
         val = @on_set_block.call(val)
         return if val.nil? #
       end
-      p.value = val
+      if val.is_a? OResource
+        # Make sure we only have a single reference
+        return if OProperty.count(name: @name, resource: @resource, value: val) > 0
+      end
+      #puts ">>> Adding #{val} to #{@name} - #{@on_set_block}"
+      p = OProperty.create(name: @name, o_resource: @resource, value: val)
+      if @on_modified_block
+        @on_modified_block.call(val, true)
+      end
+      #p.value = val
       self
     end
+    def delete(val)
+      # this is rather inefficient
+      p = OProperty.all(name: @name, o_resource: @resource).find do |p|
+        p.value == val
+      end
+      return nil unless p
+      p.destroy
+      if @on_removed_block
+        @on_removed_block.call(val)
+      end
+      val
+    end
     # Delete all members
     def clear
       OProperty.all(name: @name, o_resource: @resource).destroy
@@ -268,7 +321,8 @@ module OMF::SFA::Resource
     end
     def length
-      OProperty.count(name: @name, o_resource: @resource)
+      #raise "LENGTH"
+      OProperty.count(name: @name, resource: @resource)
     end
     def empty?
@@ -277,8 +331,12 @@ module OMF::SFA::Resource
     # Callback to support 'reverse' operation
     def on_modified(&block)
-      raise "Not implemented"
-      #@on_modified_block = block
+      #raise "Not implemented"
+      @on_modified_block = block
+    end
+    def on_removed(&block)
+      @on_removed_block = block
     end
     def on_set(&block)
@@ -299,6 +357,10 @@ module OMF::SFA::Resource
       "<#{self.class}: name=#{@name} resource=#{@resource.name || @resource.uuid} >"
     end
+    def method_missing(m, *args, &block)
+      self.to_a().send(m, &block)
+    end
     def initialize(resource, name)
       @resource = resource
       @name = name

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

@@ -3,6 +3,7 @@ require 'dm-core'
 require 'dm-types'
 require 'dm-validations'
 require 'dm-aggregates'
+require 'dm_noisy_failures'
 require 'omf_base/lobject'
 require 'set'
@@ -271,7 +272,7 @@ module OMF::SFA::Resource
     alias_method :[], :oproperty_get
     def oproperty_set(pname, value, type = nil)
-      #puts "OPROPERTY_SET pname:'#{pname}', value:'#{value.class}'::#{type}, self:'#{self.inspect}'"
+      #puts "OPROPERTY_SET pname:'#{pname}', value:'#{value}'::#{value.class}::#{type}, self:'#{self.inspect}'"
       pname = pname.to_sym
       if pname == :name
         self.name = value

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

@@ -31,6 +31,7 @@ module OMF::SFA
         @@sfa_classes = {}
         @@sfa_name2class = {}
         @@sfa_suppress_id = {}
+        @@sfa_suppress_uuid = {}
         #
         # @opts
@@ -74,6 +75,14 @@ module OMF::SFA
           @@sfa_suppress_id[self] == true
         end
+        def sfa_suppress_uuid
+          @@sfa_suppress_uuid[self] = true
+        end
+        def sfa_suppress_uuid?
+          @@sfa_suppress_uuid[self] == true
+        end
         # Define a SFA property
         #
         # @param [Symbol] name name of resource in RSpec
@@ -467,6 +476,11 @@ module OMF::SFA
           unless opts[:suppress_id] || self.class.sfa_suppress_id?
             new_element.set_attribute('id', id) #if detail_level > 0
           end
+          unless opts[:suppress_uuid] || self.class.sfa_suppress_uuid?
+            new_element.set_attribute('uuid', self.uuid) #if detail_level > 0
+          end
           #if href = self.href(opts)
           #  new_element.set_attribute('omf:href', href)
           #end

data/lib/omf-sfa/util/brite_parser.rb ADDED Viewed

@@ -0,0 +1,160 @@
+#
+# Load topology from BRITE file
+#
+require 'omf_sfa'
+# BRITE format
+#
+# Topology: ( [numNodes] Nodes, [numEdges] Edges )
+# Model ( [ModelNum] ):  [Model.toString()]
+#
+# Nodes: ([numNodes]):
+# [NodeID]  [x-coord]  [y-coord]  [inDegree] [outDegree] [ASid]  [type]
+# [NodeID]  [x-coord]  [y-coord]  [inDegree] [outDegree] [ASid]  [type]
+# [NodeID]  [x-coord]  [y-coord]  [inDegree] [outDegree] [ASid]  [type]
+# ...
+#
+# Edges: ([numEdges]):
+# [EdgeID]  [fromNodeID]  [toNodeID]  [Length]  [Delay]  [Bandwidth]  [ASFromNodeID]  [ASToNodeID]  [EdgeType]  [Direction]
+# [EdgeID]  [fromNodeID]  [toNodeID]  [Length]  [Delay]  [Bandwidth]  [ASFromNodeID]  [ASToNodeID]  [EdgeType]  [Direction]
+# [EdgeID]  [fromNodeID]  [toNodeID]  [Length]  [Delay]  [Bandwidth]  [ASFromNodeID]  [ASToNodeID]  [EdgeType]  [Direction]
+#
+module OMF::SFA::Util
+  class BriteParser < OMF::Base::LObject
+    def initialize()
+      @nodes = {}
+      @edges = []
+      #@sliver = OMF::SFA::Resource::Sliver.def_sliver
+    end
+    def on_new_node(&block)
+      @on_new_node = block
+    end
+    def on_new_edge(&block)
+      @on_new_edge = block
+    end
+    def create_node(opts)
+      node = @on_new_node.call(opts)
+      @nodes[opts[:id]] = node if node
+    end
+    def create_edge(opts)
+      from = @nodes[opts[:from]]
+      to = @nodes[opts[:to]]
+      edge = @on_new_edge.call(opts, from, to)
+      @edges << edge if edge
+    end
+    def to_rspec()
+      OComponent.to_rspec(@nodes.values() + @edges, :request, suppress_id: true)
+    end
+    def parse_file(file_name)
+      f = File.open(File.absolute_path(file_name))
+      sp = [
+        lambda {|l, i| _parse_header(l, i)},
+        lambda {|l, i| _parse_nodes(l, i)},
+        lambda {|l, i| _parse_edges(l, i)},
+      ]
+      p = sp.shift
+      i = 0
+      f.each do |l|
+        if l.strip!.empty?
+          next if i == 0 # skip multiple consectutive empty lines
+          p = sp.shift
+          i = 0
+          next
+        end
+        p.call(l, i)
+        i += 1
+      end
+    end
+    def _parse_header(l, i)
+      case l
+      when /^Topology/
+        # ignore Topology: ( 111 Nodes, 111 Edges )
+      when /^Model/
+        unless m = l.match(/Model\W*([\d]*)\W*:*(.*)/)
+          fatal "Missing 'Model' declaration in header"
+          exit -1
+        end
+        @model_type = m[1]
+        @model_opts = m[2]
+      else
+        warn "Ignoring unexpected header line - #{l}"
+      end
+    end
+    def _parse_nodes(l, i)
+      return if i == 0
+      unless m = l.match(/([\d]+)\s+([\d\.]+)\s+([\d\.]+)\s+([\d]+)\s+([\d]+)\s+([\d\-]+)\s+(.*)/)
+        fatal "Can't parse node declaration - #{l}"
+        exit -1
+      end
+      if (pa = m.to_a[1 .. -1]).length != 7
+        fatal "Expected 7 parameters in node declaration, but got '#{pa.length}' - #{l}"
+        exit -1
+      end
+      # [NodeID]  [x-coord]  [y-coord]  [inDegree] [outDegree] [ASid]  [type]
+      n = {}
+      [[:id, :i], [:x, :f], [:y, :f], nil, nil, nil, [:type]].each_with_index do |k, i|
+        next if k.nil?
+        v = pa[i]
+        case k[1]
+        when :i
+          v = v.to_i
+        when :f
+          v = v.to_f
+        else
+          v.strip!
+        end
+        #puts "name: #{name} i: #{i}"
+        n[k[0]] = v
+      end
+      create_node(n)
+      #puts "NODES - #{n}"
+    end
+    def _parse_edges(l, i)
+      return if i == 0
+      unless m = l.match(/([\d]+)\s+([\d]+)\s+([\d]+)\s+([\d\.]+)\s+([\d\.]+)\s+([\d\.]+)\s+([\d\-]+)\s+([\d\-]+)\s+([^\s]+)\s+([^\s]+)/)
+        fatal "Can't parse edge declaration - #{l}"
+        exit -1
+      end
+      if (pa = m.to_a[1 .. -1]).length != 10
+        fatal "Expected 10 parameters in edge declaration, but got '#{pa.length}' - #{pa}"
+        exit -1
+      end
+      # [EdgeID]  [fromNodeID]  [toNodeID]  [Length]  [Delay]  [Bandwidth]  [ASFromNodeID]  [ASToNodeID]  [EdgeType]  [Direction]
+      e = {}
+      [[:id, :i], [:from, :i], [:to, :i], [:length, :f], [:delay, :f], [:bw, :f], nil, nil, [:type], [:direction]].each_with_index do |k, i|
+        next if k.nil?
+        v = pa[i]
+        case k[1]
+        when :i
+          v = v.to_i
+        when :f
+          v = v.to_f
+        else
+          v.strip!
+        end
+        #puts "name: #{name} i: #{i}"
+        e[k[0]] = v
+      end
+      create_edge(e)
+      #@edges << e
+      #puts "EDGES - #{e}"
+    end
+  end
+end

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

@@ -0,0 +1,277 @@
+require 'json'
+require 'omf_base'
+require 'omf-sfa/resource'
+include OMF::SFA::Resource
+module OMF::SFA::Util
+  class GraphJSONException < Exception
+  end
+  # This class handles the convertion between GraphJson
+  # and a set of resources.
+  #
+  # Usage:
+  #   GraphJson.parse_file(file_name) => Array of OResources
+  #
+  class GraphJSON < OMF::Base::LObject
+    def self.parse_file(file_name, opts = {})
+      content = File.open(file_name).read()
+      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 parse(descr_hash, opts = {})
+      @create_new_uuids = (opts[:create_new_uuids] == true)
+      unless graph = descr_hash[:graph]
+        raise GraphJSONException.new "Expected description 'graph' element at root - #{descr_hash}"
+      end
+      [:nodes, :edges].each do |type|
+        unless graph[type]
+          raise GraphJSONException.new "Missing '#{type}' declaration"
+        end
+        graph[type].each do |e|
+          unless id = e[:_id]
+            raise GraphJSONException.new "Missing '_id' for #{type} - #{e}"
+          end
+          if @id2descr.key? id
+            raise GraphJSONException.new "Duplicated id '#{id}' detected - #{e}"
+          end
+          @id2descr[id] = e
+        end
+      end
+      parse_defaults(graph, opts)
+      parse_nodes(graph[:nodes], opts)
+      parse_edges(graph, opts)
+      #puts ">>>>> #{@resources}"
+      @resources
+    end
+    def initialize()
+      @id2descr = {}
+      @resources = {}
+      @sliver_types = {}
+    end
+    def parse_defaults(graph, opts)
+      @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}"
+          end
+          type_def[name] = val
+          #puts "#{type}::#{name} ===> #{val}"
+        end
+      end
+    end
+    def parse_nodes(nodes, opts)
+      nodes.each do |n|
+        unless type = n[:_type]
+          raise GraphJSONException.new "Missing '_type' declaration - #{n}"
+        end
+        case type
+        when 'node'
+          parse_node(n, opts)
+        when 'network'
+          parse_network(n, opts)
+        else
+          raise GraphJSONException.new "Unknown node type '#{type}' - #{n}"
+        end
+      end
+    end
+    def parse_node(node, gopts)
+      el_defaults = @defaults[:node]
+      opts = {}
+      unless id = node[:_id]
+        raise GraphJSONException.new "Missing node ID '_id' - #{node}"
+      end
+      opts[:uuid] = id unless @create_new_uuids
+      opts[:name] = node[:name]
+      parse_value(node, :component_manager, el_defaults, opts, false)
+      parse_value(node, :urn, el_defaults, opts, false)
+      opts[:sliver_type] = parse_sliver_type(node, el_defaults)
+      @resources[id] = node_r = Node.create(opts)
+      (gopts[:node_services] || []).each do |s|
+        node_r.services << s
+      end
+      node_r
+    end
+    def parse_network(network, opts)
+      el_defaults = @defaults[:network]
+      # add defaults
+      parse_value(network, :netmask, el_defaults, network, false)
+      parse_value(network, :type, el_defaults, network, false)
+    end
+    def parse_edges(graph, gopts)
+      # First collect interfaces into node declaration
+      graph[:edges].each do |e|
+        [[:_source, :tail, :_target], [:_target, :head, :_source]].each do |n_id, if_id, opp_id|
+          n_descr = @id2descr[e[n_id]]
+          next unless n_descr[:_type] == "node"
+          if_a = (n_descr[:__ifs] ||= [])
+          if_a << (if_descr = e[if_id] || {})
+          opp_descr = @id2descr[e[opp_id]]
+          if  opp_descr[:_type] == "network"
+            if_descr[:__nw] = opp_descr
+            (opp_descr[:__ifs] ||= []) << if_descr
+          end
+          (e[:__ifs] ||= []) << if_descr
+        end
+      end
+      #
+      graph[:nodes].each do |n_descr|
+        next unless n_descr[:_type] == "node"
+        node_id = n_descr[:_id]
+        if_a = n_descr[:__ifs]
+        # Add names to all interfaces
+        names = if_a.map {|ifd| ifd[:name] }.compact
+        i = 0
+        if_a.each do |ifs|
+          next if ifs[:name] # ok, has one already
+          begin
+            name = "if#{i}"
+            i += 1
+          end while names.include?(name)
+          ifs[:name] = name
+        end
+        # Create interface resource
+        node_r = @resources[node_id]
+        if_a.each do |ifs|
+          opts = { name: (ifs[:__client_id] = "#{node_r.name}:#{ifs[:name]}") }
+          if ip_decl = ifs[:ip]
+            if ip_decl.key? :type
+              ip_decl[:ip_type] = ip_decl.delete(:type)
+            end
+            #puts "IP>>> #{ip_decl}"
+            opts[:ip] = Ip.create(ip_decl)
+          else
+            # TODO: Maybe create IP address if the other end is a network
+            if nw = ifs[:__nw]
+              idx = nw[:__ifs].index do |oifs|
+                ifs[:__client_id] == oifs[:__client_id]
+              end
+              #puts "\n#{idx}\n"
+            end
+          end
+          if_r = ifs[:__if_r] = Interface.create(opts)
+          node_r.interfaces << if_r
+        end
+      end
+      # Create Link resources
+      graph[:edges].each do |e|
+        source = @id2descr[e[:_source]]
+        target = @id2descr[e[:_target]]
+        unless source && target
+          raise GraphJSONException.new "Can't find source or target node - #{e}"
+        end
+        if source[:_type] == 'node' && target[:_type] == 'node'
+          # direct link
+          opts = {}
+          unless id = e[:_id]
+            raise GraphJSONException.new "Missing edge ID '_id' - #{e}"
+          end
+          opts[:uuid] = id unless @create_new_uuids
+          opts[:name] = e[:name] #|| id
+          link_r = Link.create(opts)
+          @resources[id] = link_r
+        elsif source[:_type] == 'network' && target[:_type] == 'network'
+          raise GraphJSONException.new "Can't connect two networks directly - #{e}"
+        else
+          # one side is a network
+          network = source[:_type] == 'network' ? source : target
+          unless link_r = @resources[nw_id = network[:_id]]
+            opts = {name: network[:name]}
+            opts[:uuid] = nw_id unless @create_new_uuids
+            link_r = Link.create(opts)
+            @resources[nw_id] = link_r
+          end
+        end
+        if link_r
+          link_r.link_type = e[:link_type] || "lan"
+          e[:__ifs].each do |ifs|
+            link_r.interfaces << ifs[:__if_r]
+          end
+        end
+      end
+    end
+    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}"
+      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)
+      end
+      st_res
+    end
+    def parse_value(el, name, defaults, opts, is_mandatory = false)
+      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
+      end
+      val
+    end
+  end
+end
+if $0 == __FILE__
+  OMF::Base::Loggable.init_log 'graph_json'
+  GURN.default_domain = "urn:publicid:IDN+acme.org"
+  OMF::SFA::Resource::OResource.init()
+  file = ARGV[0] || File.join(File.dirname(__FILE__), '/../../../examples/four_node_one_network.gjson')
+  begin
+    opts = {
+      node_services: [
+        InstallService.create(install_path: "/local", url: "http://emmy9.casa.umass.edu/InstaGENI_Images/install-script.tar.gz"),
+        ExecuteService.create(command: "sudo sh /local/postboot_script.sh", shell: "sh")
+      ],
+      create_new_uuids: false
+    }
+    resources = OMF::SFA::Util::GraphJSON.parse_file(file, opts)
+    #puts resources
+    rspec = OComponent.to_rspec(resources.values, :request, suppress_id: true)
+    puts rspec
+  rescue OMF::SFA::Util::GraphJSONException => ex
+    puts "ERROR: #{ex}"
+  end
+end

data/lib/omf-sfa/version.rb CHANGED Viewed

@@ -1,4 +1,4 @@
 module OMF; module SFA
   #VERSION = "6.0.0.pre.1"
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end; end

data/omf_sfa.gemspec CHANGED Viewed

@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "dm-validations", "~> 1.2.0"
   s.add_runtime_dependency "dm-migrations", "~> 1.2.0"
   s.add_runtime_dependency "dm-sqlite-adapter", "~> 1.2.0"
+  s.add_runtime_dependency 'dm-noisy-failures'
   s.add_runtime_dependency "uuid", "~> 2.3.5"
   s.add_runtime_dependency "json", "~> 1.7.7"
 #
@@ -45,4 +46,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "omf_base", "~> 1.0.3"
   s.add_runtime_dependency "eventmachine", "~> 1.0.3"
   s.add_runtime_dependency "em-minitest-spec", "~> 1.1.1"
+  s.add_runtime_dependency "ruby-ip"
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_sfa
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -219,6 +219,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: dm-noisy-failures
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -395,10 +411,27 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: ruby-ip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OMF's Aggregate manager with SFA and new REST API.
 email:
 - omf-user@lists.nicta.com.au
 executables:
+- brite2rspec.rb
 - parse_rspec.rb
 extensions: []
 extra_rdoc_files: []
@@ -407,9 +440,9 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/brite2rspec.rb
 - bin/parse_rspec.rb
 - etc/omf-sfa/omf-sfa-am.yaml
-- examples/brite2rspec.rb
 - examples/exogeni5nodemanifest.rspec
 - examples/instageni5nodemanifest.rspec
 - examples/waxman_10.brite
@@ -472,7 +505,9 @@ files:
 - lib/omf-sfa/resource/sfa_base.rb
 - lib/omf-sfa/resource/sliver_type.rb
 - lib/omf-sfa/resource/user.rb
+- lib/omf-sfa/util/brite_parser.rb
 - lib/omf-sfa/util/create_sample_testbed.rb
+- lib/omf-sfa/util/graph_json.rb
 - lib/omf-sfa/util/load_from_sfa_xml.rb
 - lib/omf-sfa/version.rb
 - lib/omf_sfa.rb