omf_ec 6.1.2 → 6.1.3.pre.1

data/Gemfile

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

data/example/config/default.yml

@@ -0,0 +1,6 @@
+communication:
+  # Connect to AMQP server at localhost
+  url: amqp://localhost
+
+# Use OML server located at localhost port 3003
+oml_uri: tcp:localhost:3003

data/example/config/with_custom_logging.yml

@@ -0,0 +1,29 @@
+communication:
+  url: amqp://localhost
+
+# By providing logging section, you can modify log message location and layout
+#
+# In this example, these setting are identical to EC default
+logging:
+  level:
+    default: debug
+  appenders:
+    # To STDOUT
+    stdout:
+      level: info
+      date_pattern: "%H:%M:%S"
+      pattern: "%d %5l %c{2}: %m\n"
+      color_schema: default
+    # To Rolling log file, and log everything
+    rolling_file:
+      level: all
+      log_dir: /var/tmp
+      # max 50mb of each log file
+      size: 52428800
+      # keep a 5 logs in total
+      keep: 5
+      date_pattern: "%F %T %z"
+      pattern: "[%d] %-5l %c: %m\n"
+
+# Use OML server located at localhost port 3003
+oml_uri: tcp:localhost:3003

data/lib/omf_ec/backward/dsl.rb

@@ -16,6 +16,7 @@ module OmfEc
           v5_style(:allGroups, base)
           v5_style(:allNodes!, base)
           v5_style(:defGraph, base)
+          v5_style(:defGroup, base)
           v5_style(:loadOEDL, base)
           v5_style(:ensureProperty, base)
         end
@@ -37,14 +38,6 @@ module OmfEc
         def_application(name,&block)
       end
 
-      def defGroup(name, *members, &block)
-        group = OmfEc::Group.new(name)
-        OmfEc.experiment.add_group(group)
-        group.add_resource(*members)
-
-        block.call(group) if block
-      end
-
       # Wait for some time before issuing more commands
       #
       # @param [Fixnum] duration Time to wait in seconds (can be

data/lib/omf_ec/dsl.rb

@@ -49,7 +49,6 @@ module OmfEc
       end
     end
 
-
     # Use EM timer to execute after certain time
     #
     # @example do something after 2 seconds
@@ -78,16 +77,32 @@ module OmfEc
     #
     # @param [String] name name of the group
     #
-    # @example add resource 'a' to group 'bob'
-    #   def_group('bob') do |g|
-    #     g.add_resource('a')
+    # @example add resource 'a', 'b' to group 'My_Pinger'
+    #
+    #   defGroup('My_Pinger', 'a', 'b') do |g|
+    #     g.addApplication("ping") do |app|
+    #       app.setProperty('target', 'mytestbed.net')
+    #       app.setProperty('count', 3)
+    #     end
     #   end
     #
-    # @see OmfEc::Backward::DSL#defGroup
-    def def_group(name, &block)
-      group = OmfEc::Group.new(name, &block)
+    #   # Or pass resources as an array
+    #
+    #   res_array = ['a', 'b']
+    #
+    #   defGroup('My_Pinger', res_array) do |g|
+    #     g.addApplication("ping") do |app|
+    #       app.setProperty('target', 'mytestbed.net')
+    #       app.setProperty('count', 3)
+    #     end
+    #   end
+    #
+    def def_group(name, *members, &block)
+      group = OmfEc::Group.new(name)
       OmfEc.experiment.add_group(group)
-      group
+      group.add_resource(*members)
+
+      block.call(group) if block
     end
 
     # Get a group instance
@@ -255,7 +270,7 @@ module OmfEc
         rescue Exception => e
           error "Fail loading built-in OEDL library '#{location}': #{e}"
         end
-      when :file, :http 
+      when :file, :http, :https
         begin
           file = Tempfile.new("oedl-#{Time.now.to_i}")
           # see: http://stackoverflow.com/questions/7578898

data/lib/omf_ec/experiment.rb

@@ -210,6 +210,7 @@ module OmfEc
             g.resources[type: 'application'].release unless g.app_contexts.empty?
             g.resources[type: 'net'].release unless g.net_ifs.find_all { |v| v.conf[:type] == 'net' }.empty?
             g.resources[type: 'wlan'].release unless g.net_ifs.find_all { |v| v.conf[:type] == 'wlan' }.empty?
+            g.resources.membership = { leave: g.address }
           end
 
           OmfCommon.el.after(4) do

data/lib/omf_ec/group.rb

@@ -62,6 +62,7 @@ module OmfEc
     #
     # Resources to be added could be a list of resources, groups, or the mixture of both.
     def add_resource(*names)
+      names.flatten!
       synchronize do
         # Recording membership first, used for ALL_UP event
         names.each do |name|
@@ -75,7 +76,6 @@ module OmfEc
       end
     end
 
-
     # Create a set of new resources and add them to the group
     #
     # @param [String] name

data/lib/omf_ec/runner.rb

@@ -25,6 +25,24 @@ module OmfEc
       @config_opts = Mash.new(
         environment: 'development',
         communication: { url: "amqp://localhost" },
+        logging: {
+          level: { default: 'debug' },
+          appenders: {
+            stdout: {
+              level: :info,
+              date_pattern: '%H:%M:%S',
+              pattern: '%d %5l %c{2}: %m\n'
+            },
+            rolling_file: {
+              level: :debug,
+              log_dir: '/var/tmp',
+              size: 1024*1024*50, # max 50mb of each log file
+              keep: 5, # keep a 5 logs in total
+              date_pattern: '%F %T %z',
+              pattern: '[%d] %-5l %c: %m\n'
+            },
+          }
+        }
       )
 
       @cmd_opts = Mash.new
@@ -113,7 +131,7 @@ module OmfEc
             exit
           end
 
-          op.on("-d", "--debug", "Debug mode (printing debug logging messages)") do
+          op.on("-d", "--debug", "Debug mode (Set logging level in Stdout to :debug)") do
             @cmd_opts[:debug] = true
             remove_cmd_opts_from_argv("-d", "--debug")
           end
@@ -219,6 +237,8 @@ module OmfEc
 
       if @config_opts[:debug]
         Logging.logger.root.level = 'debug'
+        stdout_appender = Logging.logger.root.appenders.find { |a| a.class == Logging::Appenders::Stdout }
+        stdout_appender.level = 'debug' if stdout_appender
       else
         Logging.consolidate 'OmfCommon', 'OmfRc'
       end
@@ -280,7 +300,6 @@ module OmfEc
     def init
       oml_init
       setup_experiment
-      #load_experiment
     end
 
     def run

data/test/omf_ec/dsl_spec.rb

@@ -20,6 +20,24 @@ describe OmfEc::DSL do
     OmfEc.unstub(:subscribe_and_monitor)
   end
 
+  describe "when calling defGroup" do
+    it "must be able to accept a list of arguments" do
+      @dsl.defGroup('bob', 'a', 'b') do |g|
+        g.members.keys.must_include 'a'
+        g.members.keys.must_include 'b'
+        g.must_be_kind_of OmfEc::Group
+      end
+    end
+
+    it "must be able to accept array as arguments" do
+      array = %w(c d)
+      @dsl.defGroup('bob', array) do |g|
+        g.members.keys.must_include 'c'
+        g.members.keys.must_include 'd'
+        g.must_be_kind_of OmfEc::Group
+      end
+    end
+  end
 
   describe "when included" do
     it "must respond to after and every" do
@@ -46,11 +64,6 @@ describe OmfEc::DSL do
       @dsl.group('bob').must_equal g
     end
 
-    it "must respond to def_group" do
-      block = proc { 1 }
-      @dsl.def_group('bob', &block).must_be_kind_of OmfEc::Group
-    end
-
     it "must respond to all_groups iterator" do
       block = proc { 1 }
       @dsl.all_groups(&block)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.2
-  prerelease: 
+  version: 6.1.3.pre.1
+  prerelease: 6
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.3.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.3.pre.1
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,8 @@ files:
 - Gemfile
 - Rakefile
 - bin/omf_ec
+- example/config/default.yml
+- example/config/with_custom_logging.yml
 - example/engine_oedl.rb
 - example/engine_test.rb
 - example/test_exp/test00.rb
@@ -193,12 +195,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2232053717488476374
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_ec
 rubygems_version: 1.8.23