omf_rc 6.1.4.pre.2 → 6.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1916ba4d7b83441e5b71cfe25c00b0e42890668a
+  data.tar.gz: 5e9b81f986a3e796feec8305524ea740e02e123a
+SHA512:
+  metadata.gz: 064aaf15db1cc87f2f75aec5d6dc64533f2df0f7d0bcf1bc818e7256c20ba8a2de3972cedbf69acf94b5cd2bf12a4039b14478407bcb9844a04a6a545d44cb7a
+  data.tar.gz: 1bd1b9bc3858c1e40e590615507f73bba64124a21a06488d07d9607cbbf92a1573fab2ccd212cd61e5a1b467002bdba3d6db5754778ea0e284b816890441a43c

data/Gemfile

@@ -4,8 +4,11 @@ source "http://rubygems.org"
 gemspec
 
 gem 'omf_common', path: "../omf_common"
-gem 'blather'
 
 group :test do
   gem 'rake'
 end
+
+group :xmpp do
+  gem 'blather'
+end

data/config/config.yml

@@ -1,6 +1,11 @@
 ---
 # default topic name is this machine's hostname
 # this is to ensure that every RC has its own topic and AMQP account
-uid: <%= Socket.gethostname %>
-uri: amqp://localhost
 environment: production
+
+communication:
+  url: amqp://localhost
+
+resources:
+- type: node
+  uid: <%= Socket.gethostname %>

data/config/config_node_topo_check.yml.example

@@ -1,21 +1,25 @@
 ---
-uri: xmpp://<%= "#{Socket.gethostname}-#{Process.pid}" %>:<%= "#{Socket.gethostname}-#{Process.pid}" %>@localhost
-environment: development
-debug: false
+environment: production
+
+communication:
+  url: amqp://localhost
 
 resources:
   - type: node
     uid: <%= Socket.gethostname %>
 
-add_default_factories: false # Not loading default type factories
+# DO NOT load default factories
+add_default_factories: false
 
-factories: # Additional resources which can be created by this RC
+# Customise resources which can be created by this RC
+factories:
   load: [
     'omf_rc/resource_proxy/node',
     'omf_rc/resource_proxy/net',
     'omf_rc/resource_proxy/wlan',
     'omf_rc/resource_proxy/application'
   ]
+  # Set default value of resource property
   defaults:
     node:
       topo_file: '/etc/topology.txt'

data/config/with_custom_logging.yml

@@ -0,0 +1,34 @@
+---
+environment: production
+
+communication:
+  url: amqp://localhost
+
+logging:
+  level:
+    default: debug
+  appenders:
+    # To Rolling log file, and log everything
+    rolling_file:
+      level: all
+      log_dir: /var/tmp
+      # max 10k of each log file
+      size: 10240
+      # keep 1 log in total
+      keep: 1
+      date_pattern: "%F %T %z"
+      pattern: "[%d] %-5l %c: %m\n"
+
+resources:
+  - type: node
+    uid: <%= Socket.gethostname %>
+
+# DO NOT load default factories
+add_default_factories: false
+
+# Customise resources which can be created by this RC
+factories:
+  load: [
+    'omf_rc/resource_proxy/node',
+    'omf_rc/resource_proxy/application'
+  ]

data/lib/omf_rc/resource_proxy/abstract_resource.rb

@@ -28,6 +28,16 @@ class OmfRc::ResourceProxy::MPReceived < OML4R::MPBase
   param :mid, :type => :string # Unique ID this message
 end
 
+# TODO This should probably go to common, together with same functionality from EC
+# MP only used for injecting metadata
+class OmfRc::MetaData < OML4R::MPBase
+  name :meta_data
+
+  param :domain, type: :string
+  param :key, type: :string
+  param :value, type: :string
+end
+
 # @note Suppose you have read the {file:doc/DEVELOPERS.mkd DEVELOPERS GUIDE} which explains the basic the resource controller system.
 #
 # This is the abstract resource proxy class, which provides the base of all proxy implementations. When creating new resource instances, this abstract class will always be initialised first and then extended by one of the specific resource proxy modules.
@@ -233,6 +243,8 @@ class OmfRc::ResourceProxy::AbstractResource
 
     new_resource = OmfRc::ResourceFactory.create(type.to_sym, opts, creation_opts, &creation_callback)
 
+    log_metadata(self.uid, new_resource.uid, :create)
+
     call_hook(:after_create, self, new_resource)
 
     self.synchronize do
@@ -783,4 +795,8 @@ class OmfRc::ResourceProxy::AbstractResource
   def namespaced_property?(name)
     respond_to?(:namespace) && name =~ /^(.+)__(.+)$/
   end
+
+  def log_metadata(key, value, domain)
+    OmfRc::MetaData.inject(domain.to_s, key.to_s, value.to_s)
+  end
 end

data/lib/omf_rc/resource_proxy/application.rb

@@ -561,7 +561,7 @@ module OmfRc::ResourceProxy::Application
       o = res.property.oml
       ofile = "/tmp/#{res.uid}-#{Time.now.to_i}.xml"
       of = File.open(ofile,'w')
-      of << "<omlc experiment='#{o.experiment}' id='#{o.id}_#{res.uid}'>\n"
+      of << "<omlc experiment='#{o.experiment}' id='#{res.opts.parent.uid}_#{o.id}_#{res.uid}'>\n"
       o.collection.each do |c|
         of << "  <collect url='#{c.url}'>\n"
         c.streams.each do |m|

data/lib/omf_rc/resource_proxy_dsl.rb

@@ -217,10 +217,12 @@ module OmfRc::ResourceProxyDSL
     #       end
     #     end
     #   end
-    def configure(name, &register_block)
-      define_method("configure_#{name.to_s}") do |*args, &block|
-        args[0] = Hashie::Mash.new(args[0]) if args[0].class == Hash
-        register_block.call(self, *args, block) if register_block
+    def configure(name, opts = {}, &register_block)
+      unless opts[:if] && !opts[:if].call
+        define_method("configure_#{name.to_s}") do |*args, &block|
+          args[0] = Hashie::Mash.new(args[0]) if args[0].class == Hash
+          register_block.call(self, *args, block) if register_block
+        end
       end
     end
 
@@ -267,10 +269,12 @@ module OmfRc::ResourceProxyDSL
     #     end
     #   end
     #
-    def request(name, &register_block)
-      define_method("request_#{name.to_s}") do |*args, &block|
-        args[0] = Hashie::Mash.new(args[0]) if args[0].class == Hash
-        register_block.call(self, *args, block) if register_block
+    def request(name, opts = {}, &register_block)
+      unless opts[:if] && !opts[:if].call
+        define_method("request_#{name.to_s}") do |*args, &block|
+          args[0] = Hashie::Mash.new(args[0]) if args[0].class == Hash
+          register_block.call(self, *args, block) if register_block
+        end
       end
     end
 

data/lib/omf_rc/util/common_tools.rb

@@ -3,29 +3,8 @@
 # You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
 
-#
-# Copyright (c) 2012 National ICT Australia (NICTA), Australia
-#
-# 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.
-#
+require 'facter'
 
-#
 # This module defines a Utility with some common work blocks that could be
 # useful to any type of Resource Proxy (RP)
 #
@@ -55,9 +34,13 @@ module OmfRc::Util::CommonTools
   #
   # [Boolean] true or fals
   #
-  work('boolean?') do |res,obj|
+  work('boolean?') do |res, obj|
     result = false
     result = true if obj.kind_of?(TrueClass) || obj.kind_of?(FalseClass)
     result
   end
+
+  def cmd_exists?(cmd)
+    !Facter::Core::Execution.which(cmd).nil?
+  end
 end

data/lib/omf_rc/util/mod.rb

@@ -13,10 +13,12 @@ module OmfRc::Util::Mod
   include Hashie
   # @!macro extend_dsl
 
+  utility :common_tools
+
   # @!macro group_request
   # @!macro request
   # @!method request_modules
-  request :modules do
+  request :modules, if: proc { cmd_exists?('lsmod') } do
     CommandLine.new('lsmod').run.split("\n").map do |v|
       v.match(/^(\w+).+$/) && $1
     end.compact.tap { |ary| ary.shift }
@@ -30,7 +32,7 @@ module OmfRc::Util::Mod
   # @param value name of the module to load
   # @!macro configure
   # @!method configure_load_module
-  configure :load_module do |resource, value|
+  configure :load_module, if: proc { cmd_exists?('modprobe') } do |resource, value|
     raise ArgumentError, "Please provide at least module name" if value.name.nil?
 
     flags_string = nil

data/lib/omf_rc/util/sysfs.rb

@@ -34,16 +34,10 @@ module OmfRc::Util::Sysfs
             device[:op_state] = (fo.read || '').chomp
           end
           # Let's see if the interface is already up
-          # NOTE: THIS MAY NOT BE ROBUST
-          s = `ifconfig #{File.basename(v)}`
-          unless s.nil? || s.empty?
-            if m = s.match(/inet addr:\s*([0-9.]+)/)
-              device[:ip4] = m[1]
-            end
-            if m = s.match(/inet6 addr:\s*([0-9a-f.:\/]+)/)
-              device[:ip6] = m[1]
-            end
-          end
+          ip = Facter.value("ipaddress_#{File.basename(v)}")
+          ip_v6 = Facter.value("ipaddress6_#{File.basename(v)}")
+          device[:ip4] = ip if ip
+          device[:ip6] = ip_v6 if ip_v6
           devices << device
         end
       end

data/test/omf_rc/resource_proxy_dsl_spec.rb

@@ -35,6 +35,10 @@ describe OmfRc::ResourceProxyDSL do
       request :zulu do |resource, options|
         "You called zulu with: #{options.keys.join('|')}"
       end
+
+      request :xray, if: proc { false } do
+        "This property would NOT be registered"
+      end
     end
 
     module OmfRc::ResourceProxy::MockRootProxy
@@ -108,6 +112,16 @@ describe OmfRc::ResourceProxyDSL do
       mock_proxy.request_zulu(country: 'uk').must_equal "You called zulu with: country"
     end
 
+    it "wont define methods when restriction provided and failed to meet" do
+      begin
+        mock_proxy = OmfRc::ResourceFactory.create(:mock_proxy, uid: :mp0)
+        mock_proxy.request_xray
+      rescue => e
+        e.must_be_kind_of NoMethodError
+        e.message.must_match /request_xray/
+      end
+    end
+
     it "must be able to include utility" do
       Class.new do
         include OmfRc::ResourceProxyDSL

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.1.4.pre.2
-  prerelease: 6
+  version: 6.1.4
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: omf_common
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.pre.2
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.pre.2
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Resource controller of OMF, a generic framework for controlling and managing
@@ -146,6 +131,7 @@ files:
 - config/config_with_authentication.yml.example
 - config/config_with_extensions.yml.example
 - config/instageni.yaml
+- config/with_custom_logging.yml
 - init/angstrom
 - init/debian
 - init/fedora
@@ -211,26 +197,54 @@ files:
 homepage: http://omf.mytestbed.net
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: omf_rc
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OMF resource controller
-test_files: []
+test_files:
+- test/fixture/ip/addr_show
+- test/fixture/iw/help
+- test/fixture/iw/info
+- test/fixture/iw/link
+- test/fixture/lsmod
+- test/fixture/omf_rc.simple.yml
+- test/fixture/omf_rc.yml
+- test/fixture/oml.hash
+- test/fixture/oml.spec
+- test/fixture/oml.xml
+- test/fixture/sys/class/ieee80211/phy0/device/uevent
+- test/fixture/sys/class/ieee80211/phy0/uevent
+- test/fixture/sys/class/net/eth0/device/uevent
+- test/fixture/sys/class/net/eth0/uevent
+- test/fixture/sys/class/net/wlan0/device/uevent
+- test/fixture/sys/class/net/wlan0/uevent
+- test/omf_rc/message_process_error_spec.rb
+- test/omf_rc/resource_factory_spec.rb
+- test/omf_rc/resource_proxy/abstract_resource_spec.rb
+- test/omf_rc/resource_proxy/application_spec.rb
+- test/omf_rc/resource_proxy/node_spec.rb
+- test/omf_rc/resource_proxy_dsl_spec.rb
+- test/omf_rc/runner_spec.rb
+- test/omf_rc/util/common_tools_spec.rb
+- test/omf_rc/util/fact_spec.rb
+- test/omf_rc/util/ip_spec.rb
+- test/omf_rc/util/iw_spec.rb
+- test/omf_rc/util/mod_spec.rb
+- test/test_helper.rb