omf_ec 6.0.0 → 6.0.1

data/bin/omf_ec

@@ -106,7 +106,7 @@ command :load do |c|
   c.flag [:outprefix]
 
   c.action do |global_options, options, args|
-    @cmd = "omf-5.4 load -t #{options[:t]} -i #{options[:i]} "
+    @cmd = "USER=#{ENV['USER']} omf-5.4 load -t #{options[:t]} -i #{options[:i]} "
     @cmd += "-o #{options[:o]} --outpath #{options[:outpath]} "
     @cmd += "-r #{options[:r]} " if options[:r]
     @cmd += "--outprefix #{options[:outprefix]} " if options[:outprefix]
@@ -130,7 +130,7 @@ command :save do |c|
   c.flag [:r, :resize]
 
   c.action do |global_options, options, args|
-    @cmd = "omf-5.4 save "
+    @cmd = "USER=#{ENV['USER']} omf-5.4 save "
     @cmd += "-n #{options[:n]} " if options[:n]
     @cmd += "-r #{options[:r]} " if options[:r]
     load_exp(@testbed_exp_path, global_options, options)

data/lib/omf_ec/backward/exp/testbed.rb

@@ -1,47 +1,43 @@
-comm = OmfCommon.comm
+def create_app(testbed)
+  testbed.create(:application) do |reply|
+    if reply.success?
+      app = reply.resource
 
-testbed_topic = comm.get_topic('testbed')
+      app.on_subscribed do
+        app.request([:platform])
 
-msgs = {
-  create: comm.create_message([type: 'application']),
-  req_platform: comm.request_message([:platform]),
-  conf_path: comm.configure_message([binary_path: @cmd]),
-  run_application: comm.configure_message([state: :running])
-}
+        after(1) { app.configure(binary_path: @cmd) }
+        after(2) { app.configure(state: :running) }
 
-msgs[:create].on_inform_creation_ok do |message|
-  app_topic = comm.get_topic(message.res_id)
-  app_topic.subscribe do
-    msgs[:req_platform].publish app_topic.id
-    sleep 1
-    msgs[:conf_path].publish app_topic.id
-    sleep 1
-    msgs[:run_application].publish app_topic.id
-  end
+        app.on_status  do |m|
+          if m[:status_type] == 'APP_EVENT'
+            after(2) { OmfCommon.comm.disconnect } if m[:event] =~ /DONE.(OK|ERROR)/
+            info m[:msg]
+          else
+            m.each_property do |k, v|
+              info "#{k} => #{v.strip}" unless v.nil?
+            end
+          end
+        end
+
+        app.on_warn  do |m|
+          warn m[:reason]
+        end
 
-  app_topic.on_message  do |m|
-    if m.operation == :inform
-      case m.read_content("itype")
-      when 'STATUS'
-        if m.read_property("status_type") == 'APP_EVENT'
-          after (2) { comm.disconnect } if m.read_property("event") =~ /DONE.(OK|ERROR)/
-          puts m.read_property("msg")
+        app.on_error  do |m|
+          error m[:reason]
         end
-      when 'ERROR'
-        logger.error m.read_content('reason') if m.read_content("itype") == 'ERROR'
-      when 'WARN'
-        logger.warn m.read_content('reason') if m.read_content("itype") == 'WARN'
       end
+    else
+      error reply[:reason]
     end
   end
 end
 
-msgs[:req_platform].on_inform_status do |m|
-  m.each_property do |p|
-    logger.info "#{p.attr('key')} => #{p.content.strip}"
+OmfCommon.comm.subscribe('testbed') do |testbed|
+  unless testbed.error?
+    create_app(testbed)
+  else
+    error testbed.inspect
   end
 end
-
-testbed_topic.subscribe do
-  msgs[:create].publish testbed_topic.id
-end

data/lib/omf_ec/version.rb

@@ -1,3 +1,3 @@
 module OmfEc
-  VERSION = "6.0.0"
+  VERSION = "6.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest