omf_rc 6.0.0.pre.2 → 6.0.0.pre.3

data/lib/omf_rc/resource_proxy/abstract_resource.rb

@@ -9,7 +9,10 @@ class OmfRc::ResourceProxy::AbstractResource
   DISCONNECT_WAIT = 5
   # Time to wait before releasing resource, wait for deleting pubsub nodes
   RELEASE_WAIT = 5
-  attr_accessor :uid, :hrn, :type, :comm
+
+  # @!attribute metadata
+  #   @return [String] the resource's internal meta data storage
+  attr_accessor :uid, :hrn, :type, :comm, :metadata
   attr_reader :opts, :children, :host
 
   # Initialisation
@@ -31,6 +34,7 @@ class OmfRc::ResourceProxy::AbstractResource
     @hrn = @opts.hrn
     @children ||= []
     @host = nil
+    @metadata = @opts.metadata || Hashie::Mash.new
 
     @comm = comm || OmfCommon::Comm.new(@opts.dsl)
     # Fire when connection to pubsub server established
@@ -86,6 +90,7 @@ class OmfRc::ResourceProxy::AbstractResource
   #
   # @param (see #initialize)
   def create(type, opts = nil)
+    before_create if respond_to? :before_create
     new_resource = OmfRc::ResourceFactory.new(type.to_sym, opts, @comm)
     children << new_resource
     new_resource
@@ -162,7 +167,7 @@ class OmfRc::ResourceProxy::AbstractResource
         when :request
           inform_msg = OmfCommon::Message.inform(end_result[:context_id], 'STATUS') do |i|
             end_result[:result].each_pair do |k, v|
-              i.property(k) { |p| p.element('current', v) }
+              i.property(k, v)
             end
           end.sign
           @comm.publish(end_result[:inform_to], inform_msg, host)
@@ -170,7 +175,7 @@ class OmfRc::ResourceProxy::AbstractResource
         when :configure
           inform_msg = OmfCommon::Message.inform(end_result[:context_id], 'STATUS') do |i|
             end_result[:result].each_pair do |k, v|
-              i.property(k) { |p| p.element('current', v) }
+              i.property(k, v)
             end
           end.sign
           @comm.publish(end_result[:inform_to], inform_msg, host)

data/lib/omf_rc/resource_proxy/wifi.rb

@@ -3,6 +3,6 @@ module OmfRc::ResourceProxy::Wifi
 
   register_proxy :wifi
 
-  #utility :mod
+  utility :mod
   utility :iw
 end

data/lib/omf_rc/util/mod.rb

@@ -1,23 +1,15 @@
 module OmfRc::Util::Mod
+  include OmfRc::ResourceProxyDSL
 
-  LSMOD_CMD = 'lsmod'
-  MODPROBE_CMD = 'modprobe'
+  register_utility :mod
 
-  def request_property(property)
-    case property
-    when /^(mod|driver)_(.+)$/
-      OmfRc::Cmd.exec(LSMOD).match(/^#{$+}( )+/) ? true : false
-    else
-      super
-    end
+  register_request :modules do
+    OmfCommon::Command.execute('lsmod').split("\n").map do |v|
+      v.match(/^(.+)\W*.+$/) && $1
+    end.compact
   end
 
-  def configure_property(property, value)
-    case property
-    when /^(mod|driver)_(.+)$/
-      OmfRc::Cmd.exec("#{MODPROBE} #{$+}")
-    else
-      super
-    end
+  register_configure :load_module do |resource, value|
+    OmfCommon::Command.execute("modprobe #{value}")
   end
 end

data/lib/omf_rc/util/package.rb

@@ -1,3 +1,5 @@
+# Package management utility, could be included in application resource proxy
+#
 module OmfRc::ResourceProxy::Package
   include OmfRc::ResourceProxyDSL
 

data/lib/omf_rc/version.rb

@@ -1,3 +1,3 @@
 module OmfRc
-  VERSION = "6.0.0.pre.2"
+  VERSION = "6.0.0.pre.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.2
+  version: 6.0.0.pre.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -84,7 +84,6 @@ files:
 - lib/omf_rc/message_process_error.rb
 - lib/omf_rc/resource_factory.rb
 - lib/omf_rc/resource_proxy/abstract_resource.rb
-- lib/omf_rc/resource_proxy/interface.rb
 - lib/omf_rc/resource_proxy/mock.rb
 - lib/omf_rc/resource_proxy/node.rb
 - lib/omf_rc/resource_proxy/wifi.rb

data/lib/omf_rc/resource_proxy/interface.rb

@@ -1,48 +0,0 @@
-require 'hashie'
-
-module OmfRc::ResourceProxy::Interface
-  include OmfRc::ResourceProxyDSL
-
-  register_proxy :interface
-
-  IPTABLES = 'iptables'
-  ROUTE = 'route'
-
-  def configure_property(property, value)
-    case property
-    when /^forwarding$/
-      OmfRc::Cmd.exec("echo #{value ? '1' : '0'} > /proc/sys/net/ipv4/conf/#{uid}/forwarding")
-    when /^gateway$/
-      # FIXME Not sure about this one, hard coded everything?
-      OmfRc::Cmd.exec("route del default dev eth1; route add default gw #{value}; route add 224.10.10.6 dev eth1")
-    when /^route$/
-      value = Hashie::Mash.new(value)
-      arguments = %w(net gw mask).map {|v| "-#{v} #{value.send(v)}" if value.send(v)}.join(' ')
-      OmfRc::Cmd.exec("#{ROUTE} #{value.op} #{arguments} dev #{uid}")
-    when /^filter$/
-      operation = case value.op
-                  when /^add$/
-                    '-A'
-                  when /^del$/
-                    '-D'
-                  when /^clear$/
-                    '-F'
-                  end
-      chain = "#{value.chain.upcase} -i #{uid}" if value.chain
-      protocol = case value.proto
-                 when /^(tcp|udp)$/
-                   [ ("-p #{value.proto}"),
-                     ("-s #{value.src}" if value.src),
-                     ("-d #{value.dst}" if value.dst),
-                     ("--sport #{value.sport}" if value.sport),
-                     ("--dport #{value.dport}" if value.dport) ].join(' ')
-                 when /^mac$/
-                   "-m mac --mac-source #{value.src}"
-                 end
-      target = "#{value.target.upcase}" if value.target
-      OmfRc::Cmd.exec("#{IPTABLES} #{operation} #{chain} #{protocol} #{chain}")
-    else
-      super
-    end
-  end
-end