omf_rc 6.1.0 → 6.1.1.pre

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b123d9324378ac7fa321bdc357c2ab03a91b46a6
+  data.tar.gz: 2601efc56f186f3c27d54bc6a8f22bf43d63cea8
+SHA512:
+  metadata.gz: 5ac15dbd1a156fe9b10cf57311991a51255bfbe4e754684e2c932cd9936f1aa6672b5998417f87db10fbb863724931778d084efac127ffff77f5327a8ddcf32d
+  data.tar.gz: 3a8d626b64282e4b42f87257cfda1469b724b9f5f4871dad3cb42011782b8e67fcf343f528cdcb223181805385f1e69fa9f0dc46612ce39cff9be7c800fc057b

data/config/config_node.yml.example

@@ -0,0 +1,24 @@
+---
+uri: xmpp://<%= "#{Socket.gethostname}-#{Process.pid}" %>:<%= "#{Socket.gethostname}-#{Process.pid}" %>@localhost
+environment: development
+debug: false
+
+resources:
+  - type: node
+    uid: <%= Socket.gethostname %>
+
+add_default_factories: false # Not loading default type factories
+
+factories: # Additional resources which can be created by this RC
+  load: [
+    'omf_rc/resource_proxy/node',
+    'omf_rc/resource_proxy/net',
+    'omf_rc/resource_proxy/wlan',
+    'omf_rc/resource_proxy/application'
+  ]
+  defaults:
+    application:
+      env:
+        PATH: "<%= ENV["rvm_bin_path"] %>:/opt/local/bin"
+        GEM_HOME: "<%= ENV["GEM_HOME"] %>"
+        GEM_PATH: "<%= ENV["_ORIGINAL_GEM_PATH"] %>"

data/config/instageni.yaml

@@ -0,0 +1,23 @@
+---
+uri: <%= File.read("/var/omf/communication_url").strip %>
+environment: production
+debug: false
+
+resources:
+  - type: node
+    uid: <%= File.read("/var/omf/node_uri").strip  %>
+
+add_default_factories: false # Not loading default type factories
+
+factories: # Additional resources which can be created by this RC
+  load: [
+    'omf_rc/resource_proxy/node',
+    'omf_rc/resource_proxy/net',
+    'omf_rc/resource_proxy/application'
+  ]
+  defaults:
+    application:
+      env:
+        PATH: "<%= ENV["rvm_bin_path"] %>:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+        GEM_HOME: "<%= ENV["GEM_HOME"] %>"
+        GEM_PATH: "<%= ENV["_ORIGINAL_GEM_PATH"] || ENV["GEM_PATH"] %>"

data/lib/omf_rc/resource_proxy/abstract_resource.rb

@@ -79,6 +79,17 @@ class OmfRc::ResourceProxy::AbstractResource
     create_children_resources: true
   }
 
+  @@defaults = {}
+
+  # Set defaults for a particular resource class. Can be retrieved with 'defaults'
+  # in the instance.
+  #
+  # @param [Hash] defaults resource class defaults. Interpretation is up to proxy implementation.
+  #
+  def self.set_defaults(resource_type, defaults)
+    @@defaults[resource_type.to_sym] = defaults
+  end
+
   attr_accessor :uid, :hrn, :type, :property, :certificate
   attr_reader :opts, :children, :membership, :creation_opts, :membership_topics, :topics
 
@@ -106,6 +117,7 @@ class OmfRc::ResourceProxy::AbstractResource
     @uid = (@opts.delete(:uid) || SecureRandom.uuid).to_s
     @hrn = @opts.delete(:hrn)
     @hrn = @hrn.to_s if @hrn
+    @node_index = nil
 
     @children = []
     @membership = []
@@ -171,6 +183,16 @@ class OmfRc::ResourceProxy::AbstractResource
     end
   end
 
+  # Set defaults for a particular resource class. Can be retrieved with 'defaults'
+  # in the instance.
+  #
+  # @param [Hash] defaults resource class defaults. Interpretation is up to proxy implementation.
+  #
+  def defaults(key = nil)
+    d = @@defaults[@type] || {}
+    key ? d[key] : d
+  end
+
   # Return resource' pubsub topic it has subscribed.
   def resource_topic
     if @topics.empty?
@@ -328,6 +350,11 @@ class OmfRc::ResourceProxy::AbstractResource
     @membership
   end
 
+  # Query resource's index number
+  def request_res_index(*args)
+    @res_index
+  end
+
   # Request child resources
   #
   # @return [Hashie::Mash] child resource mash with uid and hrn
@@ -398,6 +425,15 @@ class OmfRc::ResourceProxy::AbstractResource
     @membership
   end
 
+  # Set the resource index, overwriting any previous index
+  # The index is a unique integer for each resource in an experiment
+  # It's used e.g. to give each node an IP address such as x.x.x.res_index
+  #
+  # @param [String|Array] args name of group topic/topics
+  def configure_res_index(index)
+    @res_index = index
+  end
+
   # @!endgroup
 
   # Parse omf message and execute as instructed by the message
@@ -496,7 +532,7 @@ class OmfRc::ResourceProxy::AbstractResource
         # Getting property status, for preparing inform msg
         add_prop_status_to_response(new_obj, msg_props.keys, response)
 
-				if (cred = new_obj.certificate)
+        if (cred = new_obj.certificate)
           response[:cert] = cred.to_pem_compact
         end
         # self here is the parent

data/lib/omf_rc/resource_proxy/application.rb

@@ -473,6 +473,10 @@ module OmfRc::ResourceProxy::Application
   # @!macro work
   work('build_command_line') do |res|
     cmd_line = "env -i " # Start with a 'clean' environment
+    if env = res.defaults(:env)
+      env = env.map {|k,v| "#{k.to_s.upcase}=#{v}"}.join(' ')
+      cmd_line += "#{env} "
+    end
     res.property.environments.each do |e,v|
       val = v.kind_of?(String) ? "'#{v}'" : v
       cmd_line += "#{e.to_s.upcase}=#{val} "

data/lib/omf_rc/resource_proxy/node.rb

@@ -78,13 +78,4 @@ module OmfRc::ResourceProxy::Node
     end
   end
   # @!endgroup
-
-  # @!macro group_prop
-  #
-  # @!attribute [rw] node_index
-  #   Node Index
-  #   @!macro prop
-  property :node_index
-  # @!endgroup
-
 end

data/lib/omf_rc/runner.rb

@@ -34,7 +34,7 @@ module OmfRc
       @def_opts = Mash.new(
         environment: 'production',
         resources: [ { type: :node, uid: @node_id }],
-        factories: [],
+        factories: {},
         communication: { url: "xmpp://#{@node_id}-#{Process.pid}:#{@node_id}-#{Process.pid}@localhost" },
         add_default_factories: true,
       )
@@ -73,14 +73,26 @@ module OmfRc
         if @opts[:add_default_factories] != false
           OmfRc::ResourceFactory.load_default_resource_proxies
         end
-
-        @opts[:factories].each do |f|
-          if (req = f[:require])
-            begin
-              info "Try to load resource module '#{req}'"
-              require(req)
-            rescue LoadError => e
-              error e.message
+        if f = @opts[:factories]
+          if (loads = f[:load])
+            loads.each do |m|
+              begin
+                info "Try to load proxy module '#{m}'"
+                require(m)
+              rescue LoadError => e
+                error e.message
+              end
+            end
+          end
+          if (inits = f[:defaults])
+            pl = OmfRc::ResourceFactory.proxy_list
+            inits.each do |m, v|
+              unless p = pl[m]
+                error "Can't find proxy '#{m}' to set defaults for"
+              end
+              info "Setting proxy defaults for '#{m}'"
+              debug "Setting proxy defaults for '#{m}' to '#{v}'"
+              OmfRc::ResourceProxy::AbstractResource.set_defaults(m, v)
             end
           end
         end

data/omf_rc.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path("../../omf_common/lib", __FILE__)
 require "omf_rc/version"
 
 Gem::Specification.new do |s|

data/test/omf_rc/resource_proxy/abstract_resource_spec.rb

@@ -65,9 +65,9 @@ describe AbstractResource do
     end
 
     it "must returned all the properties can be requested & configured" do
-      @parent.request_available_properties.configure.must_equal [:p0, :membership]
+      @parent.request_available_properties.configure.must_equal [:p0, :membership, :res_index]
       @parent.request_available_properties.request.must_equal(
-        [:p0, :test_exception, :supported_children_type, :uid, :type, :hrn, :name, :membership, :child_resources]
+        [:p0, :test_exception, :supported_children_type, :uid, :type, :hrn, :name, :membership, :res_index, :child_resources]
       )
     end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.1.0
-  prerelease: 
+  version: 6.1.1.pre
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,55 +41,48 @@ dependencies:
 - !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: omf_common
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.1.1.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.1.1.pre
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,17 +97,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   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
@@ -141,8 +126,10 @@ files:
 - bin/omf_rc
 - bin/plc_trigger_omf_rc
 - config/config.yml
+- config/config_node.yml.example
 - config/config_with_authentication.yml.example
 - config/config_with_extensions.yml.example
+- config/instageni.yaml
 - init/angstrom
 - init/debian
 - init/fedora
@@ -207,26 +194,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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_rc
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 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/deferred_process_spec.rb
+- 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/ip_spec.rb
+- test/omf_rc/util/iw_spec.rb
+- test/omf_rc/util/mod_spec.rb
+- test/test_helper.rb