omf_common 6.0.0 → 6.0.2.pre.1

data/Gemfile

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in omf_common.gemspec
 gemspec
+
+group :test do
+  gem 'rake'
+end

data/bin/file_broadcaster.rb

@@ -0,0 +1,56 @@
+#
+DESCR = %{
+Broadcast a file to a topic group
+}
+
+require 'omf_common'
+
+OP_MODE = :development
+$debug = false
+
+opts = {
+  communication: {
+    #url: 'xmpp://srv.mytestbed.net'
+  },
+  eventloop: { type: :em},
+  logging: {
+    level: 'info'
+  }  
+}
+
+file_path = nil
+resource_url = nil
+
+op = OptionParser.new
+op.banner = "Usage: #{op.program_name} [options]\n#{DESCR}\n"
+op.on '-r', '--resource-url URL', "URL of resource" do |url|
+  resource_url = url
+end
+op.on '-f', '--file FILE', "File to broadcast" do |path|
+  file_path = path
+end
+op.on '-d', '--debug', "Set logging to DEBUG level" do
+  opts[:logging][:level] = 'debug'
+  $debug = true
+end
+op.on_tail('-h', "--help", "Show this message") { $stderr.puts op; exit }
+rest = op.parse(ARGV) || []
+
+unless resource_url && file_path
+  $stderr.puts 'Missing --resource-url or --file'
+  $stderr.puts op
+  exit(-1)
+end
+
+r = resource_url.split('/')
+resource = r.pop
+opts[:communication][:url] = r.join('/')
+
+OmfCommon.init(OP_MODE, opts) do |el|
+  OmfCommon.comm.on_connected do |comm|
+    comm.broadcast_file(file_path, resource) do |state|
+      debug state.inspect
+      OmfCommon.eventloop.stop if state[:action] == :done
+    end
+  end
+end

data/bin/file_receiver.rb

@@ -0,0 +1,62 @@
+#
+DESCR = %{
+Receive a file sent to a topic group
+}
+
+require 'omf_common'
+
+OP_MODE = :development
+$debug = false
+
+opts = {
+  communication: {
+    #url: 'amqp://srv.mytestbed.net'
+  },
+  eventloop: { type: :em},
+  logging: {
+    level: 'info'
+  }  
+}
+
+file_path = nil
+resource_url = nil
+
+op = OptionParser.new
+op.banner = "Usage: #{op.program_name} [options]\n#{DESCR}\n"
+op.on '-r', '--resource-url URL', "URL of resource" do |url|
+  resource_url = url
+end
+op.on '-f', '--file FILE', "Path to store received file" do |path|
+  file_path = path
+end
+op.on '-d', '--debug', "Set logging to DEBUG level" do
+  opts[:logging][:level] = 'debug'
+  $debug = true
+end
+op.on_tail('-h', "--help", "Show this message") { $stderr.puts op; exit }
+rest = op.parse(ARGV) || []
+
+unless resource_url && file_path
+  $stderr.puts 'Missing --resource-url or --file'
+  $stderr.puts op
+  exit(-1)
+end
+
+r = resource_url.split('/')
+resource = r.pop
+opts[:communication][:url] = r.join('/')
+
+OmfCommon.init(OP_MODE, opts) do |el|
+  OmfCommon.comm.on_connected do |comm|
+    comm.receive_file(resource_url, file_path) do |state|
+      debug state
+      case state[:action]
+      when :progress
+        puts "Progress: #{(state[:progress] * 100).to_i}%"
+      when :done
+        puts "Fully received '#{file_path}' (#{state[:mime_type]})"
+        OmfCommon.eventloop.stop
+      end
+    end
+  end
+end

data/bin/omf_keygen

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require 'omf_common'
+
+OmfCommon::Auth::CertificateStore.init
+
+root = OmfCommon::Auth::Certificate.create(nil, 'omf_ca', 'ca', 'omf')
+
+ec_key = OpenSSL::PKey::RSA.new(2048)
+rc_key = OpenSSL::PKey::RSA.new(2048)
+
+ec_pub = ec_key.public_key
+rc_pub = rc_key.public_key
+
+ec = root.create_for('ec', 'ec', 'controller', 'omf', 365, ec_pub)
+rc = root.create_for('rc', 'rc', 'controller', 'omf', 365, rc_pub)
+
+%w(root ec_key rc_key ec_pub rc_pub ec rc).each do |n|
+  File.write("#{n}.pem", eval(n).to_pem)
+  info "Generated #{n}.pem"
+end

data/bin/{monitor_topic.rb → omf_monitor_topic}

@@ -1,4 +1,7 @@
-require 'optparse'
+#!/usr/bin/env ruby
+BIN_DIR = File.dirname(File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__)
+TOP_DIR = File.join(BIN_DIR, '..')
+$: << File.join(TOP_DIR, 'lib')
 
 DESCR = %{
 Monitor a set of resources (topics) and print all observed messages.
@@ -9,13 +12,16 @@ that there will be a delay until the new monitors are in place which
 can result in missed messages.
 }
 
+require 'optparse'
 require 'omf_common'
 
 OP_MODE = :development
 
 opts = {
   communication: {
-    url: 'amqp://srv.mytestbed.net'
+    #url: 'xmpp://srv.mytestbed.net',
+    auth: {}
+
   },
   eventloop: { type: :em},
   logging: {
@@ -25,23 +31,25 @@ opts = {
 
 observed_topic = nil
 $follow_children = true
+$debug = false
 
 op = OptionParser.new
 op.banner = "Usage: #{op.program_name} [options] topic1 topic2 ...\n#{DESCR}\n"
-op.on '-c', '--comms-url URL', "URL to communication layer [#{opts[:communication][:url]}]" do |url|
+op.on '-c', '--comms-url URL', "URL of communication server (e.g. xmpp://my.server.com)" do |url|
   opts[:communication][:url] = url
 end
 op.on '-f', "--[no-]follow-children", "Follow all newly created resources [#{$follow_children}]" do |flag|
   $follow_children = flag
 end
-op.on '-d', '--debug', "Set logging to DEBUG level" do
+op.on '-d', '--debug', "Set log level to DEBUG" do
   opts[:logging][:level] = 'debug'
+  $debug = true
 end
 op.on_tail('-h', "--help", "Show this message") { $stderr.puts op; exit }
 observed_topics = op.parse(ARGV)
 
-unless observed_topics
-  $stderr.puts 'Missing declaration of topics to follow'
+unless opts[:communication][:url] && observed_topics
+  $stderr.puts "ERROR: Missing declaration of --comms-url or topics to follow\n\n"
   $stderr.puts op
   exit(-1)
 end
@@ -56,8 +64,13 @@ def observe(tname, comm)
   comm.subscribe(tname) do |topic|
     topic.on_message do |msg|
       ts = Time.now.strftime('%H:%M:%S')
-      puts "#{ts}  #{msg.type}(#{msg.itype})  #{msg.inspect}"
-      puts "  #{topic.id}"
+      puts "#{ts}  #{msg.type}(#{msg.itype})  #{$debug ? msg.inspect : ''}"
+      #puts "  #{topic.id}"
+      if (src_topic = msg.src.id) == topic.id
+        puts "  #{topic.id}"        
+      else
+        puts "  #{src_topic} via #{topic.id}"
+      end
       msg.each_property do |name, value|
         puts "    #{name}: #{value}"
       end

data/bin/omf_send_create

@@ -0,0 +1,118 @@
+#!/usr/bin/env ruby
+BIN_DIR = File.dirname(File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__)
+TOP_DIR = File.join(BIN_DIR, '..')
+$: << File.join(TOP_DIR, 'lib')
+
+DESCR = %{
+Send a create message to a specific resource (topic) and print out any replies.
+
+Any additional command line arguments are interpreted as property:value and are
+sent with the create message.
+}
+
+require 'omf_common'
+
+OP_MODE = :development
+$debug = false
+
+opts = {
+  communication: {
+    #url: 'xmpp://srv.mytestbed.net'
+  },
+  eventloop: { type: :em},
+  logging: {
+    level: 'info'
+  }  
+}
+
+resource_url = nil
+resource_type = nil
+resource_properties = {}
+
+op = OptionParser.new
+op.banner = "Usage: #{op.program_name} [options] property1:value1 property2:value2 ...\n#{DESCR}\n"
+op.on '-r', '--resource-url URL', "URL of resource (e.g. xmpp://my.server.com/topic1)" do |url|
+  resource_url = url
+end
+op.on '-t', '--type TYPE', "Type of resource to create (e.g. node)" do |type|
+  resource_type = type
+end
+op.on '-y', '--yaml YAML_FILE', "Read type and property from YAML file" do |yfile|
+  require 'yaml'
+  y = YAML.load_file(yfile)
+  unless o = y['create']
+    puts "Expected top level 'create', but found '#{y.keys.inspect}'"
+    abort
+  end
+  resource_type = o['type']
+  resource_properties = o['properties']
+end
+op.on '-d', '--debug', "Set log level to DEBUG" do
+  opts[:logging][:level] = 'debug'
+  $debug = true
+end
+op.on_tail('-h', "--help", "Show this message") { $stderr.puts op; exit }
+rest = op.parse(ARGV) || []
+
+unless resource_url || resource_type
+  $stderr.puts 'Missing --resource-url --type or'
+  $stderr.puts op
+  exit(-1)
+end
+
+r = resource_url.split('/')
+resource = r.pop
+opts[:communication][:url] = r.join('/')
+
+key = nil
+def err_exit
+  $stderr.puts("Options need to be of the 'key: value' type")
+  exit(-1)  
+end
+rest.each do |s|
+  sa = s.split(':')
+  if sa.length == 2
+    err_exit if key
+    resource_properties[sa[0]] = sa[1]
+  else
+    if s.end_with?(':')
+      err_exit if key
+      key = s[0]
+    else
+      err_exit unless key
+      resource_properties[key] = s[0]
+      key = nil
+    end
+  end
+end
+err_exit if key
+
+def print_message(msg, resource)
+  puts "#{resource}   <#{msg.type}(#{msg.itype})>    #{$debug ? msg.inspect : ''}"
+  if msg.itype == 'WARN'
+    puts "    #{msg.inspect}"
+  end
+  msg.each_property do |name, value|
+    puts "    #{name}: #{value}"
+  end
+  puts "------"
+end
+
+OmfCommon.init(OP_MODE, opts) do |el|
+  OmfCommon.comm.on_connected do |comm|
+    comm.subscribe(resource) do |ptopic|
+      uid = resource_properties[:uid] ||= SecureRandom.uuid # uuid of newly created object
+      # Already subscribe to the new object's topic to avoid missing
+      # any initial messages
+      comm.subscribe(uid) do |ctopic|
+        ctopic.on_message do |msg|
+          print_message(msg, 'NEW')
+        end
+      
+        ptopic.create(resource_type, resource_properties) do |msg|
+          print_message(msg, resource)
+        end
+      end
+    end
+  end
+end

data/bin/{send_request.rb → omf_send_request}

@@ -1,4 +1,8 @@
-#
+#!/usr/bin/env ruby
+BIN_DIR = File.dirname(File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__)
+TOP_DIR = File.join(BIN_DIR, '..')
+$: << File.join(TOP_DIR, 'lib')
+
 DESCR = %{
 Send a request to a specific resource (topic) and print out any replies.
 
@@ -12,7 +16,7 @@ OP_MODE = :development
 
 opts = {
   communication: {
-#    url: 'amqp://srv.mytestbed.net'
+    #url: 'xmpp://srv.mytestbed.net'
   },
   eventloop: { type: :em},
   logging: {
@@ -23,18 +27,18 @@ opts = {
 resource_url = nil
 
 op = OptionParser.new
-op.banner = "Usage: #{op.program_name} [options] prop1 prop2 ...\n#{DESCR}\n"
-op.on '-r', '--resource-url URL', "URL of resource" do |url|
+op.banner = "Usage: #{op.program_name} [options] [prop1 prop2 ...]\n#{DESCR}\n"
+op.on '-r', '--resource-url URL', "URL of resource (e.g. xmpp://my.server.com/topic1)" do |url|
   resource_url = url
 end
-op.on '-d', '--debug', "Set logging to DEBUG level" do
+op.on '-d', '--debug', "Set log level to DEBUG" do
   opts[:logging][:level] = 'debug'
 end
 op.on_tail('-h', "--help", "Show this message") { $stderr.puts op; exit }
 req_properties = op.parse(ARGV) || []
 
 unless resource_url
-  $stderr.puts 'Missing --resource-url'
+  $stderr.puts "ERROR: Missing --resource-url\n\n"
   $stderr.puts op
   exit(-1)
 end
@@ -47,7 +51,8 @@ OmfCommon.init(OP_MODE, opts) do |el|
   OmfCommon.comm.on_connected do |comm|
     comm.subscribe(resource) do |topic|
       topic.request(req_properties) do |msg|
-        puts "#{resource}   <#{msg.type}(#{msg.itype})>    #{msg.inspect}"
+        dm = (opts[:logging][:level] == 'debug') ? "    #{msg.inspect}" : ""
+        puts "#{resource}   <#{msg.type}(#{msg.itype})>#{dm}"
         msg.each_property do |name, value|
           puts "    #{name}: #{value}"
         end

data/example/engine_alt.rb

@@ -1,25 +1,23 @@
 # OMF_VERSIONS = 6.0
 require 'omf_common'
+require 'omf_common/auth/certificate'
 
+root_cert = OmfCommon::Auth::Certificate.create('sa', 'authority')
 opts = {
   communication: {
-    url: 'amqp://localhost',
+    auth: {
+      #store: 'amqp://localhost',
+      certs: [
+        root_cert.to_pem_compact
+      ]
+    }
   }
 }
 
-# $stdout.sync = true
-# Logging.appenders.stdout(
-  # 'my_format',
-  # :layout => Logging.layouts.pattern(:date_pattern => '%H:%M:%S',
-                                     # :pattern => '%d %5l %c{2}: %m\n',
-                                     # :color_scheme => 'none'))
-# Logging.logger.root.appenders = 'my_format'
-# Logging.logger.root.level = :debug if opts[:debug]
-
-# Environment setup
-#OmfCommon.init(:developement, opts) 
-OmfCommon.init(:local) 
 
+OmfCommon.init(:local, opts)
+# Create a certificate for this controller
+root_cert.create_for(:controller, :controller, OmfCommon.comm.local_address())
 
 
 def create_engine(garage)
@@ -54,7 +52,7 @@ end
 # This method is called whenever a new engine has been created by the garage.
 #
 # @param [Topic] engine Topic representing the created engine
-# 
+#
 def on_engine_created(engine, garage)
   # Monitor all status information from teh engine
   engine.on_inform_status do |msg|
@@ -74,19 +72,19 @@ def on_engine_created(engine, garage)
   #engine.request() do |msg|
     puts ">>> REPLY #{msg.inspect}"
   end
-            
-              
 
 
-  return 
-  
+
+
+  return
+
   # Now we will apply 50% throttle to the engine
   engine.configure(throttle: 50)
 
   # Some time later, we want to reduce the throttle to 0, to avoid blowing up the engine
   engine.after(5) do
     engine.configure(throttle: 0)
-    
+
     # While we are at it, also test error handling
     engine.request([:error]) do |msg|
       if msg.success?
@@ -110,14 +108,15 @@ end
 
 OmfCommon.eventloop.run do |el|
   OmfCommon.comm.on_connected do |comm|
-    
+
     # Create garage proxy
     load File.join(File.dirname(__FILE__), '..', '..', 'omf_rc', 'example', 'garage_controller.rb')
-    garage_inst = OmfRc::ResourceFactory.create(:garage, hrn: :garage_1)
-    
+    garage_cert = root_cert.create_for(:garage1, :garage)
+    garage_inst = OmfRc::ResourceFactory.create(:garage, uid: :garage_1, certificate: garage_cert)
+
     # Get handle on existing entity
     comm.subscribe('garage_1') do |garage|
-    
+
       garage.on_inform_failed do |msg|
         logger.error msg
       end
@@ -126,7 +125,7 @@ OmfCommon.eventloop.run do |el|
         create_engine(garage)
       end
     end
-    
+
     el.after(20) { el.stop }
   end
 end