omf_rc 6.0.0.pre.3 → 6.0.0.pre.4

data/lib/omf_rc/resource_proxy/abstract_resource.rb

@@ -160,7 +160,7 @@ class OmfRc::ResourceProxy::AbstractResource
               inform_msg = OmfCommon::Message.inform(end_result[:context_id], 'CREATED') do |i|
                 i.element('resource_id', new_uid)
                 i.element('resource_address', new_uid)
-              end.sign
+              end
               @comm.publish(end_result[:inform_to], inform_msg, host)
             end
           end
@@ -169,7 +169,7 @@ class OmfRc::ResourceProxy::AbstractResource
             end_result[:result].each_pair do |k, v|
               i.property(k, v)
             end
-          end.sign
+          end
           @comm.publish(end_result[:inform_to], inform_msg, host)
 
         when :configure
@@ -177,7 +177,7 @@ class OmfRc::ResourceProxy::AbstractResource
             end_result[:result].each_pair do |k, v|
               i.property(k, v)
             end
-          end.sign
+          end
           @comm.publish(end_result[:inform_to], inform_msg, host)
         when :release
           inform_msg = OmfCommon::Message.inform(end_result[:context_id], 'RELEASED') do |i|
@@ -198,7 +198,7 @@ class OmfRc::ResourceProxy::AbstractResource
     dp.errback do |e|
       inform_msg = OmfCommon::Message.inform(e.context_id, 'FAILED') do |i|
         i.element("error_message", e.message)
-      end.sign
+      end
       @comm.publish(e.inform_to, inform_msg, host)
     end
 

data/lib/omf_rc/resource_proxy/mock.rb

@@ -5,11 +5,11 @@ module OmfRc::ResourceProxy::Mock
 
   utility :mock
 
-  register_hook :before_ready do |resource|
+  hook :before_ready do |resource|
     logger.info "#{resource.uid} is now ready"
   end
 
-  register_hook :before_release do |resource|
+  hook :before_release do |resource|
     logger.info "#{resource.uid} is to be released"
   end
 end

data/lib/omf_rc/resource_proxy/node.rb

@@ -3,15 +3,15 @@ module OmfRc::ResourceProxy::Node
 
   register_proxy :node
 
-  register_hook :before_ready do |resource|
+  hook :before_ready do |resource|
     logger.info "#{resource.uid} is now ready"
   end
 
-  register_hook :before_release do |resource|
+  hook :before_release do |resource|
     logger.info "#{resource.uid} is now released"
   end
 
-  register_request :proxies do
+  request :proxies do
     OmfRc::ResourceFactory.proxy_list
   end
 end

data/lib/omf_rc/resource_proxy_dsl.rb

@@ -44,15 +44,15 @@ module OmfRc::ResourceProxyDSL
     #
     #    register_proxy :node
     #
-    #    register_hook :before_ready do |resource|
+    #    hook :before_ready do |resource|
     #      logger.info "#{resource.uid} is now ready"
     #    end
     #
-    #    register_hook :before_release do |resource|
+    #    hook :before_release do |resource|
     #      logger.info "#{resource.uid} is now released"
     #    end
     #   end
-    def register_hook(name, &register_block)
+    def hook(name, &register_block)
       define_method(name) do
         register_block.call(self) if register_block
       end
@@ -115,20 +115,20 @@ module OmfRc::ResourceProxyDSL
     #   module OmfRc::Util::Iw
     #     include OmfRc::ResourceProxyDSL
     #
-    #     register_configure :freq do |resource, value|
+    #     configure :freq do |resource, value|
     #       Command.execute("iw #{resource.hrn} set freq #{value}")
     #     end
     #
     #     # or use iterator to define multiple properties
     #     %w(freq channel type).each do |p|
-    #       register_configure p do |resource, value|
+    #       configure p do |resource, value|
     #         Command.execute("iw #{resource.hrn} set freq #{value}")
     #       end
     #     end
     #
     #     # or we can try to parse iw's help page to extract valid properties and then automatically register them
     #     Command.execute("iw help").chomp.gsub(/^\t/, '').split("\n").map {|v| v.match(/[phy|dev] <.+> set (\w+) .*/) && $1 }.compact.uniq.each do |p|
-    #       register_configure p do |resource, value|
+    #       configure p do |resource, value|
     #         Command.execute("iw #{resource.hrn} set #{p} #{value}")
     #       end
     #     end
@@ -136,7 +136,7 @@ module OmfRc::ResourceProxyDSL
     #
     # @see OmfCommon::Command.execute
     #
-    def register_configure(name, &register_block)
+    def configure(name, &register_block)
       define_method("configure_#{name.to_s}") do |*args, &block|
       register_block.call(self, *args, block) if register_block
       end
@@ -144,13 +144,13 @@ module OmfRc::ResourceProxyDSL
 
     # Register a property that could be requested
     #
-    # @param (see #register_configure)
+    # @param (see #configure)
     # @yieldparam [AbstractResource] resource pass the current resource object to the block
     # @example suppose we define a utility for iw command interaction
     #   module OmfRc::Util::Iw
     #     include OmfRc::ResourceProxyDSL
     #
-    #     register_request :freq do |resource|
+    #     request :freq do |resource|
     #       Command.execute("iw #{resource.hrn} link").match(/^(freq):\W*(.+)$/) && $2
     #     end
     #
@@ -161,7 +161,7 @@ module OmfRc::ResourceProxyDSL
     #       end
     #     end
     #   end
-    def register_request(name, &register_block)
+    def request(name, &register_block)
       define_method("request_#{name.to_s}") do |*args|
         register_block.call(self) if register_block
       end

data/lib/omf_rc/util/iw.rb

@@ -3,12 +3,12 @@ module OmfRc::Util::Iw
   include OmfRc::ResourceProxyDSL
 
   OmfCommon::Command.execute("iw help").chomp.gsub(/^\t/, '').split("\n").map {|v| v.match(/[phy|dev] <.+> set (\w+) .*/) && $1 }.compact.uniq.each do |p|
-    register_configure p do |resource, value|
+    configure p do |resource, value|
       OmfCommon::Command.execute("#{IW_CMD} #{resource.hrn} set #{p} #{value}")
     end
   end
 
-  register_request :link do |resource|
+  request :link do |resource|
     known_properties = Hashie::Mash.new
 
     OmfCommon::Command.execute("iw #{resource.hrn} link").chomp.gsub(/^\t/, '').split("\n").drop(1).each do |v|

data/lib/omf_rc/util/mock.rb

@@ -3,25 +3,25 @@ module OmfRc::Util::Mock
 
   register_utility :mock
 
-  register_request :nothing do |resource|
+  request :nothing do |resource|
     resource.uid
   end
 
-  register_configure :nothing
+  configure :nothing
 
-  register_configure :hrn do |resource, hrn|
+  configure :hrn do |resource, hrn|
     resource.hrn = hrn
   end
 
-  register_request :resource_proxy_list do
+  request :resource_proxy_list do
     OmfRc::ResourceFactory.proxy_list
   end
 
-  register_request :resource_utility_list do
+  request :resource_utility_list do
     OmfRc::ResourceFactory.utility_list
   end
 
-  register_request :kernel_version do
+  request :kernel_version do
     OmfCommon::Command.execute("uname -r")
   end
 end

data/lib/omf_rc/util/mod.rb

@@ -3,13 +3,13 @@ module OmfRc::Util::Mod
 
   register_utility :mod
 
-  register_request :modules do
+  request :modules do
     OmfCommon::Command.execute('lsmod').split("\n").map do |v|
       v.match(/^(.+)\W*.+$/) && $1
     end.compact
   end
 
-  register_configure :load_module do |resource, value|
+  configure :load_module do |resource, value|
     OmfCommon::Command.execute("modprobe #{value}")
   end
 end

data/lib/omf_rc/util/package.rb

@@ -5,15 +5,15 @@ module OmfRc::ResourceProxy::Package
 
   register_utility :package
 
-  register_request :package_version do |resource|
+  request :package_version do |resource|
     OmfCommon::Command.execute("dpkg -l #{resource.hrn} | awk 'END { print $3 }'")
   end
 
-  register_configure :install_package do |resource|
+  configure :install_package do |resource|
     OmfCommon::Command.execute("apt-get install -y --reinstall --allow-unauthenticated -qq #{resource.hrn}")
   end
 
-  register_configure :remove_package do |resource|
+  configure :remove_package do |resource|
     OmfCommon::Command.execute("apt-get purge -y -qq #{resource.hrn}")
   end
 end

data/lib/omf_rc/version.rb

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

data/test/omf_rc/resource_proxy/abstract_resource_spec.rb

@@ -8,8 +8,8 @@ module OmfRc::ResourceProxy
     include OmfRc::ResourceProxyDSL
     register_proxy :node
 
-    register_request :name
-    register_configure :name
+    request :name
+    configure :name
   end
 
   module Interface

data/test/omf_rc/resource_proxy_dsl_spec.rb

@@ -6,8 +6,8 @@ describe OmfRc::ResourceProxyDSL do
     module OmfRc::Util::MockUtility
       include OmfRc::ResourceProxyDSL
       register_utility :mock_utility
-      register_configure :alpha
-      register_request :alpha
+      configure :alpha
+      request :alpha
     end
 
     module OmfRc::ResourceProxy::MockProxy
@@ -16,12 +16,12 @@ describe OmfRc::ResourceProxyDSL do
       register_proxy :mock_proxy
       utility :mock_utility
 
-      register_hook :before_ready do
+      hook :before_ready do
         "bob"
       end
-      register_hook :before_release
-      register_configure :bravo
-      register_request :bravo
+      hook :before_release
+      configure :bravo
+      request :bravo
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.3
+  version: 6.0.0.pre.4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -73,12 +73,6 @@ files:
 - Rakefile
 - bin/omf_rc
 - config/omf_rc.yml
-- integration_test/omf_rc/resource_proxy/app_spec.rb
-- integration_test/omf_rc/resource_proxy/interface_spec.rb
-- integration_test/omf_rc/resource_proxy/mock_spec.rb
-- integration_test/omf_rc/resource_proxy/node_spec.rb
-- integration_test/omf_rc/resource_proxy/wifi_spec.rb
-- integration_test/test_helper.rb
 - lib/omf_rc.rb
 - lib/omf_rc/deferred_process.rb
 - lib/omf_rc/message_process_error.rb

data/integration_test/omf_rc/resource_proxy/app_spec.rb

@@ -1,25 +0,0 @@
-require 'test_helper'
-require 'omf_rc/resource_proxy'
-
-include OmfRc::ResourceProxy
-
-describe App do
-  before do
-    @resource = AbstractResource.new(properties: { pubsub: "mytestbed.net" })
-    @app1 = @resource.create(:type => 'app', :uid => 'zathura')
-    @app2 = @resource.create(:type => 'app', :uid => 'bob')
-  end
-
-  describe "when configured with properties" do
-    it "must run the underline commands" do
-    end
-  end
-
-  describe "when properties requested" do
-    it "must return an array with actual properties" do
-      @resource.request([:version], {:uid => 'zathura'}).first.version.must_match /[\d|\.|-]+/
-      @resource.request([:version], {:uid => 'bob'}).first.version.must_be_nil
-    end
-  end
-end
-

data/integration_test/omf_rc/resource_proxy/interface_spec.rb

@@ -1,26 +0,0 @@
-require 'test_helper'
-require 'omf_rc/resource_proxy'
-
-include OmfRc::ResourceProxy
-
-describe Interface do
-  before do
-    @resource = AbstractResource.new(properties: { pubsub: "mytestbed.net" })
-    @interface = @resource.create(:type => 'interface', :uid => 'eth0')
-  end
-
-  describe "when configured with properties" do
-    it "must run the underline commands" do
-    end
-  end
-
-  describe "when properties requested" do
-    it "must return an array with actual properties" do
-      @resource.request([:mac, :ip], {:type => 'interface'}).each do |interface|
-        interface.mac.must_match /([\da-fA-F]+:){5}[\da-fA-F]+/
-        interface.ip.must_match /([.\d]+\.){3}[.\d]+/
-      end
-    end
-  end
-end
-

data/integration_test/omf_rc/resource_proxy/mock_spec.rb

@@ -1,58 +0,0 @@
-require 'test_helper'
-require 'omf_rc/resource_factory'
-
-include OmfRc::ResourceProxy
-
-module OmfRc::Util::UMock
-  include OmfRc::ResourceProxyDSL
-
-  register_utility :u_mock
-
-  register_configure :very_important_property do
-    raise StandardError, 'We just did something very important, I need your attention'
-  end
-
-  register_request :very_important_property do
-    "Very important property's value"
-  end
-end
-
-module OmfRc::ResourceProxy::Mock
-  include OmfRc::ResourceProxyDSL
-
-  register_proxy :mock
-
-  utility :u_mock
-
-  register_bootstrap do
-    logger.debug 'I am starting up, but have nothing to do there'
-  end
-
-  register_cleanup do
-    logger.debug 'I am shutting down, but have nothing to do there'
-  end
-
-  def test
-  end
-end
-
-describe Mock do
-  before do
-    @resource = OmfRc::ResourceFactory.new(:mock, :uid => 'suzuka', :properties => {:mock_property => "test"})
-  end
-
-  describe "when child resource with a known type" do
-    it "must load methods from related module correctly" do
-      @resource.create(:mock, uid: 'mock') do |mock|
-        mock.must_respond_to :test
-        mock.must_respond_to :configure_very_important_property
-        mock.must_respond_to :request_very_important_property
-        proc { mock.configure_very_important_property('test') }.must_raise StandardError
-        mock.request_very_important_property do |value|
-          value.must_equal "Very important property's value"
-        end
-      end
-    end
-  end
-end
-

data/integration_test/omf_rc/resource_proxy/node_spec.rb

@@ -1,26 +0,0 @@
-require 'test_helper'
-require 'omf_rc/resource_proxy'
-
-include OmfRc::ResourceProxy
-
-describe Node do
-  before do
-    @resource = AbstractResource.new(properties: { pubsub: "mytestbed.net" })
-    @node = @resource.create(:type => 'node', :uid => 'monaco')
-  end
-
-  describe "when configured with properties" do
-    it "must run the underline commands" do
-    end
-  end
-
-  describe "when properties requested" do
-    it "must return an array with actual properties" do
-      @resource.request([:devices], {:uid => 'monaco'}).first.devices.each do |device|
-        device.type.wont_be_nil
-        device.name.wont_be_nil
-      end
-    end
-  end
-end
-

data/integration_test/omf_rc/resource_proxy/wifi_spec.rb

@@ -1,30 +0,0 @@
-require 'test_helper'
-require 'omf_rc/resource_proxy'
-
-include OmfRc::ResourceProxy
-
-describe Wifi do
-  before do
-    @resource = AbstractResource.new(properties: { pubsub: "mytestbed.net" })
-    @wifi = @resource.create(:type => 'wifi', :uid => 'wlan0')
-  end
-
-  describe "when configured with properties" do
-    it "must run the underline commands" do
-    end
-  end
-
-  describe "when properties requested" do
-    it "must return an array with actual properties" do
-      @resource.request([:ssid, :freq, :rx, :tx, :signal, :tx_bitrate], {:type => 'wifi'}).each do |wifi|
-        wifi.ssid.wont_be_nil
-        wifi.freq.wont_be_nil
-        wifi.rx.wont_be_nil
-        wifi.tx.wont_be_nil
-        wifi.signal.wont_be_nil
-        wifi.tx_bitrate.wont_be_nil
-      end
-    end
-  end
-end
-

data/integration_test/test_helper.rb

@@ -1,5 +0,0 @@
-gem 'minitest'
-require 'minitest/autorun'
-require 'minitest/pride'
-
-require 'omf_rc'