omf_common 6.0.0.pre.7 → 6.0.0.pre.8

data/lib/omf_common.rb

@@ -2,6 +2,7 @@ require 'logging'
 require 'active_support/inflector'
 
 require "omf_common/version"
+require 'omf_common/measure'
 require "omf_common/message"
 require "omf_common/comm"
 require "omf_common/command"

data/lib/omf_common/comm.rb

@@ -1,4 +1,6 @@
 require 'omf_common/dsl/xmpp'
+require 'omf_common/dsl/xmpp_mp'
+
 
 module OmfCommon
   # PubSub communication class, can be extended with different implementations

data/lib/omf_common/dsl/xmpp.rb

@@ -23,11 +23,13 @@ module OmfCommon
         jid = "#{username}@#{server}"
         client.setup(jid, password)
         client.run
+        MPConnection.inject(Time.now.to_f, jid, 'connect') if OmfCommon::Measure.enabled?
       end
 
       # Shut down XMPP connection
       def disconnect
         shutdown
+        OmfCommon::DSL::Xmpp::MPConnection.inject(Time.now.to_f, jid, 'disconnect') if OmfCommon::Measure.enabled?
       end
 
       # Create a new pubsub topic with additional configuration
@@ -49,6 +51,7 @@ module OmfCommon
       # @param [String] topic Pubsub topic name
       def subscribe(topic, &block)
         pubsub.subscribe(topic, nil, default_host, &callback_logging(__method__, topic, &block))
+        MPSubscription.inject(Time.now.to_f, jid, 'join', topic) if OmfCommon::Measure.enabled?
       end
 
       # Un-subscribe all existing subscriptions from all pubsub topics.
@@ -56,6 +59,7 @@ module OmfCommon
         pubsub.subscriptions(default_host) do |m|
           m[:subscribed] && m[:subscribed].each do |s|
             pubsub.unsubscribe(s[:node], nil, s[:subid], default_host, &callback_logging(__method__, s[:node], s[:subid]))
+            MPSubscription.inject(Time.now.to_f, jid, 'leave', s[:node]) if OmfCommon::Measure.enabled?
           end
         end
       end
@@ -71,6 +75,7 @@ module OmfCommon
       def publish(topic, message, &block)
         raise StandardError, "Invalid message" unless message.valid?
         pubsub.publish(topic, message, default_host, &callback_logging(__method__, topic, message.operation, &block))
+        MPPublished.inject(Time.now.to_f, jid, topic, message.to_s.gsub("\n",'')) if OmfCommon::Measure.enabled?
       end
 
       # Generate OMF related message
@@ -91,6 +96,8 @@ module OmfCommon
                   end
                 end
               end
+            else
+              Message.send(m_name)
             end
 
           OmfCommon::TopicMessage.new(message, self)
@@ -124,8 +131,13 @@ module OmfCommon
 
       # Event callback for pubsub topic event(item published)
       #
-      def topic_event(*args, &block)
-        pubsub_event(*args, &callback_logging(__method__, &block))
+      def topic_event(&block)
+        guard_block = proc do |event|
+          passed = (event.items?) && (!event.delayed?) && event.items.first.payload
+          MPReceived.inject(Time.now.to_f, jid, event.node, event.items.first.payload.to_s.gsub("\n",'')) if OmfCommon::Measure.enabled? && passed
+          passed
+        end
+        pubsub_event(guard_block, &callback_logging(__method__, &block))
       end
 
       # Return a topic object represents pubsub topic

data/lib/omf_common/dsl/xmpp_mp.rb

@@ -0,0 +1,36 @@
+module OmfCommon
+  module DSL
+    module Xmpp
+      class MPConnection < OML4R::MPBase
+        name :xmpp_connections
+        param :time, :type => :double
+        param :jid, :type => :string
+        param :operation, :type => :string
+      end
+
+      class MPPublished < OML4R::MPBase
+        name :xmpp_published
+        param :time, :type => :double
+        param :jid, :type => :string
+        param :topic, :type => :string
+        param :xml_stanza, :type => :string
+      end
+
+      class MPReceived < OML4R::MPBase
+        name :xmpp_received
+        param :time, :type => :double
+        param :jid, :type => :string
+        param :topic, :type => :string
+        param :xml_stanza, :type => :string
+      end
+
+      class MPSubscription < OML4R::MPBase
+        name :xmpp_subscriptions
+        param :time, :type => :double
+        param :jid, :type => :string
+        param :operation, :type => :string
+        param :topic, :type => :string
+      end
+    end
+  end
+end

data/lib/omf_common/exec_app.rb

@@ -1,163 +1,163 @@
-#
-# Copyright (c) 2006-2012 National ICT Australia (NICTA), Australia
-#
-# Copyright (c) 2004-2009 WINLAB, Rutgers University, USA
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-#
-# Library of client side helpers
-#
-require 'fcntl'
-
-#
-# Run an application on the client.
-#
-# Borrows from Open3
-#
-class ExecApp
-
-  # Holds the pids for all active apps
-  @@all_apps = Hash.new
-
-  # True if this active app is being killed by a proper
-  # call to ExecApp.signal_all() or signal()
-  # (i.e. when the caller of ExecApp decided to stop the application,
-  # as far as we are concerned, this is a 'clean' exit)
-  @clean_exit = false
-
-  # Return an application instance based on its ID
-  #
-  # @param [String] id of the application to return
-  def ExecApp.[](id)
-    app = @@all_apps[id]
-    logger.info "Unknown application '#{id}/#{id.class}'" if app.nil?
-    return app
-  end
-
-  def ExecApp.signal_all(signal = 'KILL')
-    @@all_apps.each_value { |app| app.signal(signal) }
-  end
-
-  def stdin(line)
-    logger.debug "Writing '#{line}' to app '#{@id}'"
-    @stdin.write("#{line}\n")
-    @stdin.flush
-  end
-
-  def signal(signal = 'KILL')
-    @clean_exit = true
-    Process.kill(signal, @pid)
-  end
-
-  #
-  # Run an application 'cmd' in a separate thread and monitor
-  # its stdout. Also send status reports to the 'observer' by
-  # calling its "on_app_event(eventType, appId, message")"
-  #
-  # @param id ID of application (used for reporting)
-  # @param observer Observer of application's progress
-  # @param cmd Command path and args
-  # @param map_std_err_to_out If true report stderr as stdin [false]
-  #
-  def initialize(id, observer, cmd, map_std_err_to_out = false)
-
-    @id = id
-    @observer = observer
-    @@all_apps[id] = self
-
-    pw = IO::pipe   # pipe[0] for read, pipe[1] for write
-    pr = IO::pipe
-    pe = IO::pipe
-
-    logger.debug "Starting application '#{id}' - cmd: '#{cmd}'"
-    @observer.on_app_event(:STARTED, id, cmd)
-    @pid = fork {
-      # child will remap pipes to std and exec cmd
-      pw[1].close
-      STDIN.reopen(pw[0])
-      pw[0].close
-
-      pr[0].close
-      STDOUT.reopen(pr[1])
-      pr[1].close
-
-      pe[0].close
-      STDERR.reopen(pe[1])
-      pe[1].close
-
-      begin
-        exec(cmd)
-      rescue => ex
-        cmd = cmd.join(' ') if cmd.kind_of?(Array)
-        STDERR.puts "exec failed for '#{cmd}' (#{$!}): #{ex}"
-      end
-      # Should never get here
-      exit!
-    }
-
-    pw[0].close
-    pr[1].close
-    pe[1].close
-    monitor_pipe(:stdout, pr[0])
-    monitor_pipe(map_std_err_to_out ? :stdout : :stderr, pe[0])
-    # Create thread which waits for application to exit
-    Thread.new(id, @pid) do |id, pid|
-      ret = Process.waitpid(pid)
-      status = $?
-      @@all_apps.delete(@id)
-      # app finished
-      if (status == 0) || @clean_exit
-        s = "OK"
-        logger.debug "Application '#{id}' finished"
-      else
-        s = "ERROR"
-        logger.debug "Application '#{id}' failed (code=#{status})"
-      end
-      @observer.on_app_event("DONE.#{s}", @id, "status: #{status}")
-    end
-    @stdin = pw[1]
-  end
-
-  private
-
-  #
-  # Create a thread to monitor the process and its output
-  # and report that back to the server
-  #
-  # @param name Name of app stream to monitor (should be :stdout, :stderr)
-  # @param pipe Pipe to read from
-  #
-  def monitor_pipe(name, pipe)
-    Thread.new() do
-      begin
-        while true do
-          s = pipe.readline.chomp
-          @observer.on_app_event(name.to_s.upcase, @id, s)
-        end
-      rescue EOFError
-        # do nothing
-      rescue Exception => err
-        logger.error "monitorApp(#{@id}): #{err}"
-      ensure
-        pipe.close
-      end
-    end
-  end
-end
+#
+# Copyright (c) 2006-2012 National ICT Australia (NICTA), Australia
+#
+# Copyright (c) 2004-2009 WINLAB, Rutgers University, USA
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+#
+# Library of client side helpers
+#
+require 'fcntl'
+
+#
+# Run an application on the client.
+#
+# Borrows from Open3
+#
+class ExecApp
+
+  # Holds the pids for all active apps
+  @@all_apps = Hash.new
+
+  # True if this active app is being killed by a proper
+  # call to ExecApp.signal_all() or signal()
+  # (i.e. when the caller of ExecApp decided to stop the application,
+  # as far as we are concerned, this is a 'clean' exit)
+  @clean_exit = false
+
+  # Return an application instance based on its ID
+  #
+  # @param [String] id of the application to return
+  def ExecApp.[](id)
+    app = @@all_apps[id]
+    logger.info "Unknown application '#{id}/#{id.class}'" if app.nil?
+    return app
+  end
+
+  def ExecApp.signal_all(signal = 'KILL')
+    @@all_apps.each_value { |app| app.signal(signal) }
+  end
+
+  def stdin(line)
+    logger.debug "Writing '#{line}' to app '#{@id}'"
+    @stdin.write("#{line}\n")
+    @stdin.flush
+  end
+
+  def signal(signal = 'KILL')
+    @clean_exit = true
+    Process.kill(signal, @pid)
+  end
+
+  #
+  # Run an application 'cmd' in a separate thread and monitor
+  # its stdout. Also send status reports to the 'observer' by
+  # calling its "on_app_event(eventType, appId, message")"
+  #
+  # @param id ID of application (used for reporting)
+  # @param observer Observer of application's progress
+  # @param cmd Command path and args
+  # @param map_std_err_to_out If true report stderr as stdin [false]
+  #
+  def initialize(id, observer, cmd, map_std_err_to_out = false)
+
+    @id = id
+    @observer = observer
+    @@all_apps[id] = self
+
+    pw = IO::pipe   # pipe[0] for read, pipe[1] for write
+    pr = IO::pipe
+    pe = IO::pipe
+
+    logger.debug "Starting application '#{id}' - cmd: '#{cmd}'"
+    @observer.on_app_event(:STARTED, id, cmd)
+    @pid = fork {
+      # child will remap pipes to std and exec cmd
+      pw[1].close
+      STDIN.reopen(pw[0])
+      pw[0].close
+
+      pr[0].close
+      STDOUT.reopen(pr[1])
+      pr[1].close
+
+      pe[0].close
+      STDERR.reopen(pe[1])
+      pe[1].close
+
+      begin
+        exec(cmd)
+      rescue => ex
+        cmd = cmd.join(' ') if cmd.kind_of?(Array)
+        STDERR.puts "exec failed for '#{cmd}' (#{$!}): #{ex}"
+      end
+      # Should never get here
+      exit!
+    }
+
+    pw[0].close
+    pr[1].close
+    pe[1].close
+    monitor_pipe(:stdout, pr[0])
+    monitor_pipe(map_std_err_to_out ? :stdout : :stderr, pe[0])
+    # Create thread which waits for application to exit
+    Thread.new(id, @pid) do |id, pid|
+      ret = Process.waitpid(pid)
+      status = $?
+      @@all_apps.delete(@id)
+      # app finished
+      if (status == 0) || @clean_exit
+        s = "OK"
+        logger.debug "Application '#{id}' finished"
+      else
+        s = "ERROR"
+        logger.debug "Application '#{id}' failed (code=#{status})"
+      end
+      @observer.on_app_event("DONE.#{s}", @id, "status: #{status}")
+    end
+    @stdin = pw[1]
+  end
+
+  private
+
+  #
+  # Create a thread to monitor the process and its output
+  # and report that back to the server
+  #
+  # @param name Name of app stream to monitor (should be :stdout, :stderr)
+  # @param pipe Pipe to read from
+  #
+  def monitor_pipe(name, pipe)
+    Thread.new() do
+      begin
+        while true do
+          s = pipe.readline.chomp
+          @observer.on_app_event(name.to_s.upcase, @id, s)
+        end
+      rescue EOFError
+        # do nothing
+      rescue Exception => err
+        logger.error "monitorApp(#{@id}): #{err}"
+      ensure
+        pipe.close
+      end
+    end
+  end
+end

data/lib/omf_common/measure.rb

@@ -0,0 +1,8 @@
+require 'oml4r'
+module OmfCommon
+  class Measure
+    @@enabled = false
+    def Measure.enabled? ; @@enabled end
+    def Measure.enable ; @@enabled = true end
+  end
+end

data/lib/omf_common/message.rb

@@ -4,6 +4,16 @@ require 'securerandom'
 require 'openssl'
 
 module OmfCommon
+
+  class MPMessage < OML4R::MPBase
+    name :message
+    param :time, :type => :double
+    param :operation, :type => :string
+    param :msg_id, :type => :string
+    param :context_id, :type => :string
+    param :content, :type => :string
+  end
+
   # Refer to resource life cycle, instance methods are basically construct & parse XML fragment
   #
   # @example To create a valid omf message, e.g. a 'configure' message:
@@ -17,6 +27,11 @@ module OmfCommon
     OMF_NAMESPACE = "http://schema.mytestbed.net/#{OmfCommon::PROTOCOL_VERSION}/protocol"
     SCHEMA_FILE = "#{File.dirname(__FILE__)}/protocol/#{OmfCommon::PROTOCOL_VERSION}.rng"
     OPERATION = %w(create configure request release inform)
+    # When OML instrumentation is enabled, we do not want to send a the same 
+    # measurement twice, once when a message is created for publishing to T,
+    # and once when this message comes back (as we are also a subscriber of T)
+    # Thus we keep track of message IDs here (again only when OML is enabled)
+    @@msg_id_list = []
 
     class << self
       OPERATION.each do |operation|
@@ -35,8 +50,13 @@ module OmfCommon
       end
 
       def parse(xml)
+        raise ArgumentError, 'Can not parse an empty XML into OMF message' if xml.nil? || xml.empty?
         xml_root = Nokogiri::XML(xml).root
-        new(xml_root.element_name, nil, xml_root.namespace.href).inherit(xml_root)
+        result = new(xml_root.element_name, nil, xml_root.namespace.href).inherit(xml_root)
+        if OmfCommon::Measure.enabled? && !@@msg_id_list.include?(result.msg_id)
+          MPMessage.inject(Time.now.to_f, result.operation.to_s, result.msg_id, result.context_id, result.to_s.gsub("\n",'')) 
+        end
+        result 
       end
     end
 
@@ -47,7 +67,7 @@ module OmfCommon
       key_node.write_attr('key', key)
 
       unless value.nil?
-        key_node.write_attr('type', value.class.to_s.downcase)
+        key_node.write_attr('type', ruby_type_2_prop_type(value.class))
         c_node = value_node_set(value)
 
         if c_node.class == Array
@@ -66,7 +86,7 @@ module OmfCommon
         [].tap do |array|
           value.each_pair do |k, v|
             n = Message.new(k)
-            n.write_attr('type', v.class.to_s.downcase)
+            n.write_attr('type', ruby_type_2_prop_type(v.class))
 
             c_node = value_node_set(v, k)
             if c_node.class == Array
@@ -80,7 +100,7 @@ module OmfCommon
       when Array
         value.map do |v|
           n = Message.new('item')
-          n.write_attr('type', v.class.to_s.downcase)
+          n.write_attr('type', ruby_type_2_prop_type(v.class))
 
           c_node = value_node_set(v, 'item')
           if c_node.class == Array
@@ -104,9 +124,20 @@ module OmfCommon
     #
     def sign
       write_attr('msg_id', OpenSSL::Digest::SHA1.new(canonicalize)) if read_attr('id').nil? || read_attr('id').empty?
+      if OmfCommon::Measure.enabled?
+        MPMessage.inject(Time.now.to_f, operation.to_s, msg_id, context_id, self.to_s.gsub("\n",''))
+        @@msg_id_list << msg_id
+      end
       self
     end
 
+    # param :time, :type => :int32
+    # param :operation, :type => :string
+    # param :msg_id, :type => :string
+    # param :context_id, :type => :string
+    # param :content, :type => :string
+
+
     # Validate against relaxng schema
     #
     def valid?
@@ -151,7 +182,11 @@ module OmfCommon
     #
     def read_content(element_name)
       element_content = read_element("//#{element_name}").first.content rescue nil
-      element_content.empty? ? nil : element_content
+      unless element_content.nil?
+        element_content.empty? ? nil : element_content
+      else
+        nil
+      end
     end
 
     # Context ID will be requested quite often
@@ -164,6 +199,14 @@ module OmfCommon
       read_property(:resource_id) || read_content(:resource_id)
     end
 
+    def publish_to
+      read_property(:publish_to) || read_content(:publish_to)
+    end
+
+    def msg_id
+      read_attr('msg_id')
+    end
+
     # Get a property by key
     #
     # @param [String] key name of the property element
@@ -178,17 +221,17 @@ module OmfCommon
     def reconstruct_data(node)
       case node.attr('type')
       when 'array'
-        mash ||= Hashie::Mash.new
-        mash[:items] = node.element_children.map do |child|
+        node.element_children.map do |child|
           reconstruct_data(child)
         end
-        mash
       when /hash/
         mash ||= Hashie::Mash.new
         node.element_children.each do |child|
           mash[child.attr('key') || child.element_name] ||= reconstruct_data(child)
         end
         mash
+      when /boolean/
+        node.content == "true"
       else
         node.content.empty? ? nil : node.content.ducktype
       end
@@ -205,5 +248,16 @@ module OmfCommon
     def print_app_event
       "APP_EVENT (#{read_property(:app)}, ##{read_property(:seq)}, #{read_property(:event)}): #{read_property(:msg)}"
     end
+
+    private
+
+    def ruby_type_2_prop_type(ruby_class_type)
+      v_type = ruby_class_type.to_s.downcase
+      if %w(trueclass falseclass).include?(v_type)
+        'boolean'
+      else
+        v_type
+      end
+    end
   end
 end

data/lib/omf_common/topic.rb

@@ -22,7 +22,7 @@ module OmfCommon
           event.node == self.id &&
           (valid_guard?(message_guard_proc) ? message_guard_proc.call(omf_message) : true)
       end
-      comm.topic_event(guard_block, &event_block)
+      comm.pubsub_event(guard_block, &event_block)
     end
 
     private

data/lib/omf_common/version.rb

@@ -1,4 +1,4 @@
 module OmfCommon
-  VERSION = "6.0.0.pre.7"
+  VERSION = "6.0.0.pre.8"
   PROTOCOL_VERSION = "6.0"
 end

data/omf_common.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "blather", "~> 0.8.0"
   s.add_runtime_dependency "logging", "~> 1.7.1"
   s.add_runtime_dependency "hashie", "~> 1.2.0"
+  s.add_runtime_dependency "oml4r", "~> 2.8.0"
 end

data/test/omf_common/message_spec.rb

@@ -68,22 +68,25 @@ describe OmfCommon::Message do
     end
   end
 
-  describe "must be able to parse a XML element into Message object" do
-    it "must behave" do
+  describe "when asked to parse a XML element into Message object" do
+    it "must create the message object correctly " do
       xml = Message.create do |m|
         m.property('type', 'vm')
         m.property('os', 'debian')
         m.property('memory', { value: 1024, unit: 'mb', precision: 0 })
         m.property('devices', [{ name: 'w0', driver: 'mod_bob'}, { name: 'w1', driver: ['mod1', 'mod2']} ])
+        m.property('true', true)
+        m.property('false', false)
+        m.property('boolean_array', [false, true])
       end.canonicalize
 
       message = Message.parse(xml)
 
       message.must_be_kind_of Message
       message.operation.must_equal :create
-      message.read_element("//property").size.must_equal 4
+      message.read_element("//property").size.must_equal 7
       message.read_content("unit").must_equal 'mb'
-      message.read_element("/create/property").size.must_equal 4
+      message.read_element("/create/property").size.must_equal 7
       message.read_property("type").must_equal 'vm'
       message.read_property(:type).must_equal 'vm'
 
@@ -94,13 +97,22 @@ describe OmfCommon::Message do
       memory.precision.must_equal 0
 
       devices = message.read_property(:devices)
-      devices.items.must_be_kind_of Array
-      devices.items.size.must_equal 2
-      devices.items.find { |v| v.name == 'w1'}.driver.items.size.must_equal 2
+      devices.must_be_kind_of Array
+      devices.size.must_equal 2
+      devices.find { |v| v.name == 'w1'}.driver.size.must_equal 2
       # Each property iterator
       message.each_property do |v|
-        %w(type os memory devices).must_include v.attr('key')
+        %w(type os memory devices true false boolean_array).must_include v.attr('key')
       end
+
+      message.read_property(:true).must_equal true
+      message.read_property(:false).must_equal false
+      message.read_property('boolean_array').must_equal [false, true]
+    end
+
+    it "must fail if parse an empty xml" do
+      lambda { Message.parse("") }.must_raise ArgumentError
+      lambda { Message.parse(nil) }.must_raise ArgumentError
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.7
+  version: 6.0.0.pre.8
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: oml4r
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 description: Common library of OMF, a generic framework for controlling and managing
   networking testbeds.
 email:
@@ -140,7 +156,9 @@ files:
 - lib/omf_common/core_ext/object.rb
 - lib/omf_common/core_ext/string.rb
 - lib/omf_common/dsl/xmpp.rb
+- lib/omf_common/dsl/xmpp_mp.rb
 - lib/omf_common/exec_app.rb
+- lib/omf_common/measure.rb
 - lib/omf_common/message.rb
 - lib/omf_common/protocol/6.0.rnc
 - lib/omf_common/protocol/6.0.rng
@@ -182,4 +200,3 @@ signing_key:
 specification_version: 3
 summary: Common library of OMF
 test_files: []
-has_rdoc: