omf_web 0.9.7 → 0.9.8

data/example/openflow-gec15/repository/of-exp.rb

@@ -1,12 +1,117 @@
-defProperty('wired', 'omf.nicta.node2', "Wired node (endpoint)") # baseline.ndz
-defGroup('ap', property.ap) do |node|
  
  # wlan0 is not part of OVS
  # the IP address is the GRE tunnel endpoint
  node.net.w0.mode = "adhoc"
  node.net.w0.type = 'g'
  node.net.w0.channel = "6"
  node.net.w0.essid = "adhoc"
  node.net.w0.ip = "172.16.2.1"
-  # wlan1 is part of OVS
  node.net.w1.mode = "master"
  node.net.w1.type = 'g'
  node.net.w1.channel = "10"
  node.net.w1.essid = "ap"
  
  onNodeUp do |n|
    n.exec("ifconfig br-int up; ovs-vsctl set controller br-int connection-mode=out-of-band; ifconfig eth0 0")
    n.exec("ovs-vsctl add-port br-int gre1 -- set interface gre1 type=gre options:remote_ip=172.16.2.2")
    n.exec("ovs-vsctl add-port br-int eth0")
    n.exec("ovs-vsctl add-port br-int wlan1")
    n.exec("while true; do timeout 10 nmetrics-oml2 -s 2 -i eth0 --oml-server tcp:10.0.0.200:5000 --oml-exp-id 1 --oml-id 1 --oml-text; done")
    #n.exec("/root/monitor_ovs_ports.rb --oml-id ap --oml-server tcp:norbit.npc.nicta.com.au:5000")
  end
  
-defGroup('adhoc', property.adhoc) do |node|
  
  # wlan0 is not part of OVS
  # the IP address is the GRE tunnel endpoint
  node.net.w0.mode = "adhoc"
  node.net.w0.type = 'g'
  node.net.w0.channel = "6"
  node.net.w0.essid = "adhoc"
  node.net.w0.ip = "172.16.2.2"
  
  onNodeUp do |n|
    n.exec("ifconfig br-int up; ovs-vsctl set controller br-int connection-mode=out-of-band; ifconfig eth0 0")
    n.exec("ovs-vsctl add-port br-int gre1 -- set interface gre1 type=gre options:remote_ip=172.16.2.1")
    n.exec("ovs-vsctl add-port br-int eth0")
    #n.exec("/root/monitor_ovs_ports.rb --oml-id adhoc --oml-server tcp:norbit.npc.nicta.com.au:5000")
  end
-defGroup('wireless', property.wireless) do |node|
  # no OVS on this node
  node.net.w0.mode = "managed"
  node.net.w0.type = 'g'
  node.net.w0.channel = "10"
  node.net.w0.essid = "ap"
  node.net.w0.ip = "172.16.1.4"
  node.addApplication("test:app:otg2", :id => 'flow1') do |app|
    app.setProperty('cbr:rate', 800000)
    app.setProperty('udp:local_host', '172.16.1.4')
    app.setProperty('udp:dst_host', '172.16.1.1')
    app.setProperty('udp:dst_port', 3000)
    app.measure('udp_out', :samples => 1)
  end
  
  node.addApplication("test:app:otg2", :id => 'flow2') do |app|
    app.setProperty('cbr:rate', 800000)
    app.setProperty('udp:local_host', '172.16.1.4')
    app.setProperty('udp:dst_host', '172.16.1.1')
    app.setProperty('udp:dst_port', 3000)
    app.measure('udp_out', :samples => 1)
  end
-defGroup('wired', property.wired) do |node|
  node.addApplication("test:app:otr2") do |app|
    app.setProperty('udp:local_host', '172.16.1.1')
    app.setProperty('udp:local_port', 3000)
    app.measure('udp_in', :samples => 1)
  end
-  # no OVS on this node
  node.net.e0.ip = "172.16.1.1"
-onEvent(:ALL_UP) do |event|
  allGroups.exec("sysctl -w net.ipv6.conf.all.disable_ipv6=1")
-  group("wired").startApplications
  info "Start your OpenFlow controller now!"
-  while true
    info "Starting flow 1"
    group("wireless").startApplication('flow1')
    sleep 10
    info "Starting flow 2"
    group("wireless").startApplication('flow2')
    sleep 10
    info "Stopping flow 1. Flow 2 should now re-route over flow 1's path"    
    group("wireless").stopApplication('flow1')
    sleep 20
    info "Starting flow 1. Should use secondary path now."
    group("wireless").startApplication('flow1')
    sleep 20
    info "Stopping flow 2"
    group("wireless").stopApplication('flow2')
    info "Stopping flow 1"
    group("wireless").stopApplication('flow1')
    sleep 10
    info "Restarting experiment cycle"
  end
-
-
+defProperty('wired', 'omf.nicta.node2', "Wired node (endpoint)") # baseline.ndz
+defProperty('ap', 'omf.nicta.node3', "Access Point") # ovs-5.4.2-precise.ndz
+defProperty('adhoc', 'omf.nicta.node4', "Secondary path node with ad-hoc link to AP") # ovs-5.4.2-precise.ndz
+defProperty('wireless', 'omf.nicta.node5', "Wireless node (endpoint)") # baseline.ndz
+
+defGroup('ap', property.ap) do |node|
+  # wlan0 is not part of OVS
+  # the IP address is the GRE tunnel endpoint
+  node.net.w0.mode = "adhoc"
+  node.net.w0.type = 'g'
+  node.net.w0.channel = "6"
+  node.net.w0.essid = "adhoc"
+  node.net.w0.ip = "172.16.2.1"
+  
+  # wlan1 is part of OVS
+  node.net.w1.mode = "master"
+  node.net.w1.type = 'g'
+  node.net.w1.channel = "10"
+  node.net.w1.essid = "ap"
+end
+
+defGroup('adhoc', property.adhoc) do |node|
+  # wlan0 is not part of OVS
+  # the IP address is the GRE tunnel endpoint
+  node.net.w0.mode = "adhoc"
+  node.net.w0.type = 'g'
+  node.net.w0.channel = "6"
+  node.net.w0.essid = "adhoc"
+  node.net.w0.ip = "172.16.2.2"
+end
+
+defGroup('wireless', property.wireless) do |node|
+  # no OVS on this node
+  node.net.w0.mode = "managed"
+  node.net.w0.type = 'g'
+  node.net.w0.channel = "10"
+  node.net.w0.essid = "ap"
+  node.net.w0.ip = "172.16.1.4"
+
+  node.addApplication("test:app:otg2", :id => 'flow1') do |app|
+    app.setProperty('cbr:rate', 800000)
+    app.setProperty('udp:local_host', '172.16.1.4')
+    app.setProperty('udp:dst_host', '172.16.1.1')
+    app.setProperty('udp:dst_port', 3000)
+    app.measure('udp_out', :samples => 1)
+  end
+  node.addApplication("test:app:otg2", :id => 'flow2') do |app|
+    app.setProperty('cbr:rate', 800000)
+    app.setProperty('udp:local_host', '172.16.1.4')
+    app.setProperty('udp:dst_host', '172.16.1.1')
+    app.setProperty('udp:dst_port', 3000)
+    app.measure('udp_out', :samples => 1)
+  end
+end
+
+defGroup('wired', property.wired) do |node|
+  node.addApplication("test:app:otr2") do |app|
+    app.setProperty('udp:local_host', '172.16.1.1')
+    app.setProperty('udp:local_port', 3000)
+    app.measure('udp_in', :samples => 1)
+  end
+
+  # no OVS on this node
+  node.net.e0.ip = "172.16.1.1"
+end
+
+onEvent(:ALL_UP) do |event|
+  allGroups.exec("sysctl -w net.ipv6.conf.all.disable_ipv6=1")
+  
+  ovs_init="ovs-vsctl del-br br-int; ovs-vsctl add-br br-int;
+ovs-vsctl set-controller br-int tcp:10.0.0.200:6633;
+ovs-vsctl set controller br-int connection-mode=out-of-band; ifconfig eth0 0"
+  
+  group("ap").exec(ovs_init)
+  group("adhoc").exec(ovs_init)
+  
+  group("ap").exec("ovs-vsctl add-port br-int gre1 -- set interface gre1 type=gre options:remote_ip=172.16.2.2")
+  group("adhoc").exec("ovs-vsctl add-port br-int gre1 -- set interface gre1 type=gre options:remote_ip=172.16.2.1")
+  
+  group("ap").exec("ovs-vsctl add-port br-int eth0")
+  group("ap").exec("ovs-vsctl add-port br-int wlan1")
+  group("adhoc").exec("ovs-vsctl add-port br-int eth0")
+  
+  group("ap").exec("echo \"<omlc id='AP' exp_id='openflow-demo'><collect url='tcp:10.0.0.200:3004'><stream mp='net_if' name='net_if' samples='1'/></collect><collect url='tcp:10.0.0.200:5000' encoding='text'><stream mp='net_if' name='net_if1' samples='1'/></collect></omlc>\" > /tmp/oml.xml")
+  group("ap").exec("nmetrics-oml2 -s 1 -i eth0 -i wlan0 -i wlan1 --oml-config /tmp/oml.xml")
+
+  #group("ap").exec("/root/monitor_ovs_ports.rb --oml-id ap --oml-server tcp:norbit.npc.nicta.com.au:5000")
+  #group("adhoc").exec("/root/monitor_ovs_ports.rb --oml-id adhoc --oml-server tcp:norbit.npc.nicta.com.au:5000")
+
+  group("wired").startApplications
+  
+  info "Start your OpenFlow controller now!"
+  sleep 10
+
+  while true
+    info "Starting flow 1"
+    group("wireless").startApplication('flow1')
+    sleep 10
+    info "Starting flow 2"
+    group("wireless").startApplication('flow2')
+    sleep 10
+    info "Stopping flow 1. Flow 2 should now re-route over flow 1's path"    
+    group("wireless").stopApplication('flow1')
+    sleep 20
+    info "Starting flow 1. Should use secondary path now."
+    group("wireless").startApplication('flow1')
+    sleep 20
+    info "Stopping flow 2"
+    group("wireless").stopApplication('flow2')
+    sleep 10
+    info "Stopping flow 1"
+    group("wireless").stopApplication('flow1')
+    sleep 10
+    info "Restarting experiment cycle"
+  end
+
+end

data/example/openflow-gec15/repository/trema-ctl6.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'omf-oml/endpoint'
-require 'omf-oml/table'
+require 'omf_oml/endpoint'
+require 'omf_oml/table'
 require 'omf_common/lobject'
 
 OMLPORT=5000

data/example/simple/README.md

@@ -1,2 +1,30 @@
 
-Essentially the 'Hello World' example of a viz server. Taking data out of a database and putting it into a graph.
+# Example/Simple
+
+Essentially the 'Hello World' example of a viz server. Taking data out of a database and putting it into a graph.
+
+Start the server through:
+
+    ruby -I$OMF_WEB_HOME/lib $OMF_WEB_HOME/example/simple/simple_viz_server.rb start
+
+where $OMF_WEB_HOME points to the directory containing the __omf_web__ code. You will also need to __omf_oml__ package. 
+You may either install the Gem, or download the source code from https://github.com/mytestbed/omf_oml. In the later case you
+will need to add a '-I$OMF_OML_HOME/lib' falg to the above command.
+
+After all that, the console putput should look like:
+
+    DEBUG OmlSqlSource: Opening DB (sqlite:///Users/max/src/omf_web/example/simple/data_sources/gimi31.sq3)
+    DEBUG OmlSqlSource: DB: #<Sequel::SQLite::Database: "sqlite:///Users/max/src/omf_web/example/simple/data_sources/gimi31.sq3">
+    DEBUG OmlSqlSource: Finding tables [:_senders, :_experiment_metadata, :pingmonitor_myping]
+    DEBUG OmlSqlSource: Found table: pingmonitor_myping
+    DEBUG OmlSchema: schema: '[{:name=>:oml_sender, :type=>:string, :title=>"Oml Sender"}, {:name=>:oml_sender_id, :type=>:integer, :title=>"Oml Sender Id"}, {:name=>:oml_seq, :type=>:integer, :title=>"Oml Seq"}, {:name=>:oml_ts_client, :type=>:float, :title=>"Oml Ts Client"}, {:name=>:oml_ts_server, :type=>:float, :title=>"Oml Ts Server"}, {:name=>:dest_addr, :type=>:string, :title=>"Dest Addr"}, {:name=>:ttl, :type=>:integer, :title=>"Ttl"}, {:name=>:rtt, :type=>:float, :title=>"Rtt"}, {:name=>:rtt_unit, :type=>:string, :title=>"Rtt Unit"}]'
+    INFO PingDB: Stream: pingmonitor_myping
+    DEBUG OmlSqlRow-pingmonitor_myping: Read 145/145 rows from 'pingmonitor_myping'
+    INFO Server: >> Thin web server (v1.3.1 codename Triple Espresso)
+    DEBUG Server: >> Debugging ON
+    DEBUG Server: >> Tracing ON
+    INFO Server: >> Maximum connections set to 1024
+    INFO Server: >> Listening on 0.0.0.0:3000, CTRL+C to stop
+
+This starts a web server on the local machine listening on port 3000. Now point your browser there and you should see the
+result of a  'ping' experiment.

data/example/simple/data_sources/ping_source.rb

@@ -27,7 +27,7 @@ class PingDB < OMF::Common::LObject
   def setup_table(stream)
     schema = stream.schema.clone
     schema.insert_column_at(0, :link)
-    puts stream.schema.names.inspect
+    #puts stream.schema.names.inspect
     
     t = OMF::OML::OmlTable.new(:ping, schema)
     stream.on_new_tuple() do |v|
@@ -53,4 +53,4 @@ class PingDB < OMF::Common::LObject
   end
   
 end
-wv = PingDB.new('sqlite://example/simple/data_sources/gimi31.sq3').run()
+wv = PingDB.new("sqlite://#{File.dirname(__FILE__)}/gimi31.sq3").run()

data/lib/irods4r/directory.rb

@@ -0,0 +1,49 @@
+
+require 'irods4r'
+
+module IRODS4r
+  
+  # This class proxies a directory in an iRODS environment
+  #
+  class Directory
+        
+    def list()
+      FileEnumerator.new(@dir_name)
+    end
+    
+    def file?
+      return false
+    end
+    
+    def directory?
+      return true
+    end
+    
+    def initialize(dir_name)
+      @dir_name = dir_name
+    end
+  end
+  
+  class FileEnumerator
+    include Enumerable
+    
+    def each()
+      while e = @entries.shift
+        e = e.strip
+        if e.start_with? 'C-'
+          # it's a directory
+          yield Directory.new(e[3 .. -1])
+        else
+          yield File.new(::File.join(@dir_name, e))
+        end
+      end
+    end
+
+    def initialize(dir_name)
+      r = `ils #{dir_name}`
+      @dir_name = dir_name
+      @entries = r.lines.to_a
+      @entries.shift # the first line is the directory name again
+    end
+  end
+end

data/lib/irods4r/file.rb

@@ -0,0 +1,53 @@
+
+require 'irods4r/directory'
+
+module IRODS4r
+  
+  #class NotFoundException < Exception; end
+  class NoFileException < Exception; end  
+  class FileExistsException < Exception; end    
+  
+  # This class proxies a file in an iRODS environment
+  #
+  class File
+    
+    # Create a file resource 'path'. If 'must_not_exist' is true,
+    # throw exception if resource already exists.
+    #
+    def self.create(path, must_not_exist = true, opts = {})
+      if must_not_exist
+        raise FileExistsException.new(path) if ICommands.exist?(path)
+      end
+      self.new(path, opts)
+    end
+    
+    
+    # Return the content of this file
+    def read()
+      ICommands.read(@path)
+    end
+    
+    # Write content to this file.
+    #
+    # WARN: This will overwrite any previous content
+    #
+    def write(content)
+      ICommands.write(@path, content)
+    end
+
+    def file?
+      return true
+    end
+    
+    def directory?
+      return false
+    end
+    
+    attr_reader :path
+    
+    private
+    def initialize(path, opts = {})
+      @path = path
+    end
+  end
+end

data/lib/irods4r/icommands.rb

@@ -0,0 +1,63 @@
+
+require 'irods4r'
+
+module IRODS4r
+  
+  # This module interfaces directly with the IRODS system
+  #
+  module ICommands
+    class ICommandException < IRODS4rException; end
+      
+    # Return the list of files found at 'path'. 
+    def self.ls(path)
+      r = `ils #{path}`
+      #raise ICommandException.new($?) unless $?.exitstatus == 0
+      if r.empty?
+        raise NotFoundException.new("Can't find resource '#{path}'")
+      end 
+      r.lines
+    end
+    
+    # Return content of resource at 'path'
+    #
+    def self.read(path)
+      f = Tempfile.new('irods4r')
+      `iget -f #{path} #{f.path}`
+      raise ICommandException.new($?) unless $?.exitstatus == 0
+      content = f.read
+      f.close
+      f.unlink
+      content
+    end
+    
+    # Return content of resource at 'path'
+    #
+    def self.write(path, content)
+      f = Tempfile.new('irods4r')
+      f.write(content)
+      f.close
+      `iput -f #{f.path} #{path}`
+      raise ICommandException.new($?) unless $?.exitstatus == 0
+      f.unlink
+    end
+
+    def self.exist?(path)
+      `ils #{path}`
+      $?.exitstatus == 0
+    end
+    
+    # Copy the resource at 'path' in iRODS to 'file_path'
+    # in the local file system.
+    #
+    def self.export(path, file_path, create_parent_path = true)
+      #puts ">>>> #{path} -> #{file_path}"
+      if create_parent_path
+        require 'fileutils'
+        FileUtils.mkpath ::File.dirname(file_path)
+      end
+      `iget -f #{path} #{file_path}`
+      raise ICommandException.new($?) unless $?.exitstatus == 0
+    end
+  end #module
+end # module
+      

data/lib/irods4r.rb

@@ -0,0 +1,34 @@
+
+
+module IRODS4r
+  
+  class IRODS4rException < Exception; end
+  class NotFoundException < IRODS4rException; end
+  class NoDirectoryException < IRODS4rException; end  
+
+  # Return a IRODS4r object for 'irodsPath' if it exists.
+  #
+  # @param [String] irodsPath Absolute path into iRODS
+  # @param [Hash] opts Options to use for establishing context
+  # @return [Directory|File]
+  #
+  def self.find(irodsPath = ".", opts = {})
+    r = ICommands.ls(irodsPath)
+    name = r.to_a[0].strip
+    if name.end_with? ':'
+      Directory.new(name[0 ... -1])
+    else
+      File.new(name)
+    end 
+  end
+  
+  # Return true if 'path' exists
+  def self.exists?(path)
+    ICommands.exist?(path)
+  end
+end
+
+require 'irods4r/directory'
+require 'irods4r/file'
+require 'irods4r/icommands'
+  

data/lib/omf-web/content/content_proxy.rb

@@ -39,10 +39,6 @@ module OMF::Web
     def on_post(req)
       data = req.POST
       write(data['content'], data['message'])
-      # if (content = data['content']) != @content
-        # @content = content
-        # @repository.add_and_commit(@content_handle, content, data['message'], req)
-      # end
       [true.to_json, "text/json"]
     end
     
@@ -62,6 +58,19 @@ module OMF::Web
     end
     alias :read :content 
     
+    # Return a new proxy for a url relative to this one
+    def create_proxy_for_url(url)
+      unless url.match ':'
+        unless url.start_with? '/'
+          # relative
+          ap = @repository.path(@content_descriptor)
+          url = File.join(File.dirname(ap), url)
+        end
+        url = @repository.get_url_for_path(url)
+      end
+      @repository.create_content_proxy_for(url)
+    end
+
     private
     
     def initialize(content_descriptor, repository)
@@ -72,7 +81,7 @@ module OMF::Web
       @content_id = content_descriptor[:url_key]
       @content_url = "/_content/#{@content_id}"  # That most likley should come from the content handler
       
-      @mime_type = @content_descriptor[:mime_type] ||= repository.mime_type_for_file(content_descriptor[:path])
+      @mime_type = @content_descriptor[:mime_type] ||= repository.mime_type_for_file(content_descriptor)
       @name = content_descriptor[:name]
 
       @@proxies[@content_id] = self

data/lib/omf-web/content/file_repository.rb

@@ -12,41 +12,39 @@ module OMF::Web
   #
   class FileContentRepository < ContentRepository  
     
-    @@file_repositories = {}
-    
-    # Return the repository which is referenced to by elements in 'opts'.
-    #
-    #
-    def self.[](name)
-      unless repo = @@file_repositories[name.to_sym]
-        raise "Unknown file repo '#{name}'"
-      end
-      repo
-    end
-      
-    # Register an existing directory to the system. It will be 
-    # consulted for all content url's strarting with
-    # 'file:_top_dir_:'. If 'is_primary' is set to true, it will
-    # become the default repo for all newly created content
-    # in this app.
-    #
-    def self.register_file_repo(name, top_dir, is_primary = false)
-      name = name.to_sym
-      if @@file_repositories[name]
-        warn "Ignoring repeated registration of file rep '#{name}'"
-        return
-      end
-      repo = @@file_repositories[name] = FileContentRepository.new(name, top_dir)
-      if is_primary
-        @@primary_repository = repo
-      end
-    end
+    # @@file_repositories = {}
+#     
+    # # Return the repository which is referenced to by elements in 'opts'.
+    # #
+    # #
+    # def self.[](name)
+      # unless repo = @@file_repositories[name.to_sym]
+        # raise "Unknown file repo '#{name}'"
+      # end
+      # repo
+    # end
+#       
+    # # Register an existing directory to the system. It will be 
+    # # consulted for all content url's strarting with
+    # # 'file:_top_dir_:'. If 'is_primary' is set to true, it will
+    # # become the default repo for all newly created content
+    # # in this app.
+    # #
+    # def self.register_file_repo(name, top_dir, is_primary = false)
+      # name = name.to_sym
+      # if @@file_repositories[name]
+        # warn "Ignoring repeated registration of file rep '#{name}'"
+        # return
+      # end
+      # repo = @@file_repositories[name] = FileContentRepository.new(name, top_dir)
+      # if is_primary
+        # @@primary_repository = repo
+      # end
+    # end
     
-    attr_reader :name, :top_dir
     
-    def initialize(name, top_dir)
-      @name = name
-      @top_dir = top_dir
+    def initialize(name, opts)
+      super
       @url_prefix = "file:#{name}:"
     end
     
@@ -100,48 +98,11 @@ module OMF::Web
       end
     end
     
-    
-    
-    #
-    # Return an array of file names which are in the repository and
-    # match 'search_pattern'
-    #
-    # def find_files(search_pattern, opts = {})
-      # search_pattern = Regexp.new(search_pattern)
-      # tree = @repo.tree
-      # res = []
-      # fs = _find_files(search_pattern, tree, nil, res)
-#       
-      # if (mt = opts[:mime_type])
-        # fs = fs.select { |f| f[:mime_type] == mt }
-      # end
-      # fs
-    # end
-#     
-    # def _find_files(search_pattern, tree, dir_path, res)
-      # tree.contents.each do |e|
-        # d = e.name
-        # long_name = dir_path ? "#{dir_path}/#{d}" : d
-# 
-        # if e.is_a? Grit::Tree
-          # _find_files(search_pattern, e, long_name, res)
-        # else
-          # if long_name.match(search_pattern)
-            # mt = mime_type_for_file(e.name)
-            # path = @url_prefix + long_name
-            # res << {:path => path, :name => e.name,
-                    # :mime_type => mt,
-                    # #:id => Base64.encode64(long_name).gsub("\n", ''), 
-                    # :size => e.size, :blob => e.id}
-          # end
-          # # name = e.name
-          # # if File.fnmatch(search_pattern, long_name)
-            # # res << long_name
-          # # end
-        # end
-      # end
-      # res
-    # end
+    # Return a URL for a path in this repo
+    # 
+    def get_url_for_path(path)
+      "file:#{path}"
+    end
     
     def _get_path(content_descr)
       if content_descr.is_a? String