omf_rc 6.0.0.pre.5 → 6.0.0.pre.6

data/test/omf_rc/util/iw_spec.rb

@@ -1,38 +1,149 @@
+require 'minitest/mock'
 require 'test_helper'
-require 'mock_helper'
+require 'cocaine'
 
-mock_execute(fixture("iw/help"), "iw help")
+@command = MiniTest::Mock.new
 
-require 'omf_rc/util/iw'
+Cocaine::CommandLine.stub(:new, @command) do
+  @command.expect(:run, fixture("iw/help"))
+  require 'omf_rc/util/iw'
 
-describe OmfRc::Util::Iw do
-  describe "when included in the resource instance" do
-    before do
-      module OmfRc::ResourceProxy::IwTest
-        include OmfRc::ResourceProxyDSL
-        register_proxy :iw_test
-        utility :iw
+  describe OmfRc::Util::Iw do
+    describe "when included in the resource instance" do
+      before do
+        @command = MiniTest::Mock.new
+
+        module OmfRc::ResourceProxy::IwTest
+          include OmfRc::ResourceProxyDSL
+          register_proxy :iw_test
+          utility :iw
+        end
+
+        @wlan00 = OmfRc::ResourceFactory.new(:iw_test, hrn: 'wlan00', property: { phy: 'phy00' })
       end
-    end
 
-    after do
-      mock_verify_execute
-    end
+      it "must provide features defined in proxy" do
+        %w(request_link configure_name configure_channel configure_bitrates).each do |m|
+          OmfRc::Util::Iw.method_defined?(m).must_equal true
+        end
+      end
 
-    it "must provide features defined in proxy" do
-      %w(request_link configure_name configure_channel configure_bitrates).each do |m|
-        OmfRc::Util::Iw.method_defined?(m).must_equal true
+      it "could request properties of the wifi interface" do
+        Cocaine::CommandLine.stub(:new, @command) do
+          @command.expect(:run, fixture("iw/link"))
+          @wlan00.request_link.keys.must_include "ssid"
+          @command.verify
+        end
       end
-    end
 
-    it "could request properties of the wifi device" do
-      mock_execute(fixture("iw/link"), "iw wlan00 link")
-      OmfRc::ResourceFactory.new(:iw_test, hrn: 'wlan00').request_link.keys.must_include "ssid"
-    end
+      it "could request info of the wifi interface" do
+        Cocaine::CommandLine.stub(:new, @command) do
+          @command.expect(:run, fixture("iw/info"))
+          @wlan00.request_info.keys.must_equal ["ifindex", "type", "wiphy"]
+          @command.verify
+        end
+      end
+
+      it "could configure the device's prorperty" do
+        Cocaine::CommandLine.stub(:new, @command) do
+          @command.expect(:run, true)
+          @wlan00.configure_power_save(true)
+          @command.verify
+        end
+      end
 
-    it "could configure the device's prorperty" do
-      mock_execute(nil, /iw wlan00 set */)
-      OmfRc::ResourceFactory.new(:iw_test, hrn: 'wlan00').configure_power_save.must_be_nil
+      it "must could initialise wpa config/pid file path" do
+        @wlan00.init_ap_conf_pid
+        @wlan00.request_ap_conf.must_equal "/tmp/hostapd.wlan00.conf"
+        @wlan00.request_ap_pid.must_equal "/tmp/hostapd.wlan00.pid"
+      end
+
+      it "must could initialise wpa config/pid file path" do
+        @wlan00.init_wpa_conf_pid
+        @wlan00.request_wpa_conf.must_equal "/tmp/wpa.wlan00.conf"
+        @wlan00.request_wpa_pid.must_equal "/tmp/wpa.wlan00.pid"
+      end
+
+      it "could delete current interface" do
+        Cocaine::CommandLine.stub(:new, @command) do
+          @command.expect(:run, true)
+          @wlan00.delele_interface
+          @command.verify
+        end
+      end
+
+      it "could add a new interface" do
+        Cocaine::CommandLine.stub(:new, @command) do
+          @command.expect(:run, true)
+          @wlan00.add_interface(:managed)
+          @command.verify
+        end
+      end
+
+      it "must be able to validate iw parameters when setting up mode" do
+        lambda { @wlan00.configure_mode(mode: 'master') }.must_raise ArgumentError
+        lambda { @wlan00.configure_mode(mode: 'bob') }.must_raise ArgumentError
+        lambda { @wlan00.configure_mode(mode: 'master', hw_mode: 'x') }.must_raise ArgumentError
+        lambda { @wlan00.configure_mode(hw_mode: 'x') }.must_raise ArgumentError
+      end
+
+      it "must be able to configure as master mode" do
+        Cocaine::CommandLine.stub(:new, @command) do
+          3.times { @command.expect(:run, true) }
+
+          @wlan00.configure_mode(mode: 'master', channel: 1, essid: 'bob', hw_mode: 'b')
+          File.open("/tmp/hostapd.wlan00.conf") do |f|
+            f.read.must_match "driver=nl80211\ninterface=wlan00\nssid=bob\nchannel=1\nhw_mode=b\n"
+          end
+
+          3.times { @command.expect(:run, true) }
+
+          @wlan00.configure_mode(mode: 'master', channel: 1, essid: 'bob', hw_mode: 'n')
+          File.open("/tmp/hostapd.wlan00.conf") do |f|
+            f.read.must_match "driver=nl80211\ninterface=wlan00\nssid=bob\nchannel=1\nhw_mode=g\nwmm_enabled=1\nieee80211n=1\nht_capab=\[HT20\-\]\n"
+          end
+
+          3.times { @command.expect(:run, true) }
+
+          @wlan00.configure_mode(mode: 'master', channel: 16, essid: 'bob', hw_mode: 'n')
+          File.open("/tmp/hostapd.wlan00.conf") do |f|
+            f.read.must_match "driver=nl80211\ninterface=wlan00\nssid=bob\nchannel=16\nhw_mode=a\nwmm_enabled=1\nieee80211n=1\nht_capab=\[HT20\-\]\n"
+          end
+
+          @command.verify
+        end
+      end
+
+      it "must be able to configure as managed mode" do
+        Cocaine::CommandLine.stub(:new, @command) do
+          3.times { @command.expect(:run, true) }
+
+          @wlan00.configure_mode(mode: 'managed', essid: 'bob')
+          File.open("/tmp/wpa.wlan00.conf") do |f|
+            f.read.must_match "network={\n  ssid=\"bob\"\n  scan_ssid=1\n  key_mgmt=NONE\n}"
+          end
+
+          @command.verify
+        end
+      end
+
+      it "must be able to configure as adhoc/ibss mode" do
+        Cocaine::CommandLine.stub(:new, @command) do
+          4.times { @command.expect(:run, true) }
+
+          @wlan00.configure_mode(mode: 'adhoc', essid: 'bob', frequency: 2412)
+          @command.verify
+        end
+      end
+
+      it "must be able to configure as monitor mode" do
+        Cocaine::CommandLine.stub(:new, @command) do
+          3.times { @command.expect(:run, true) }
+
+          @wlan00.configure_mode(mode: 'monitor')
+          @command.verify
+        end
+      end
     end
   end
 end

data/test/omf_rc/util/mock_spec.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+require 'omf_rc/util/mock'
+
+describe OmfRc::Util::Mock do
+  describe "when included in the resource proxy" do
+    before do
+      module OmfRc::ResourceProxy::MockTest
+        include OmfRc::ResourceProxyDSL
+        register_proxy :mock_test
+        utility :mock
+      end
+      @mock = OmfRc::ResourceFactory.new(:mock_test)
+    end
+
+    it "must have these demo methods available" do
+      @mock.request_nothing.must_equal @mock.uid
+      @mock.configure_nothing
+      @mock.configure_hrn "bob"
+      @mock.request_hrn.must_equal "bob"
+      @mock.request_resource_proxy_list.must_equal OmfRc::ResourceFactory.proxy_list
+      OmfCommon::Command.stub :execute, "bob_os" do
+        @mock.request_kernel_version.must_equal "bob_os"
+      end
+    end
+  end
+end

data/test/omf_rc/util/mod_spec.rb

@@ -1,9 +1,8 @@
 require 'test_helper'
-require 'mock_helper'
 require 'omf_rc/util/mod'
 
 describe OmfRc::Util::Mod do
-  describe "when included in the resource instance" do
+  describe "when included in the resource proxy" do
     before do
       module OmfRc::ResourceProxy::ModTest
         include OmfRc::ResourceProxyDSL
@@ -12,19 +11,17 @@ describe OmfRc::Util::Mod do
       end
     end
 
-    after do
-      mock_verify_execute
-    end
-
     it "will find out a list of modules" do
-      mock_execute(fixture("lsmod"), "lsmod")
-      OmfRc::ResourceFactory.new(:mod_test).request_modules.must_include "kvm"
-      OmfRc::ResourceFactory.new(:mod_test).request_modules.wont_include "Module"
+      OmfCommon::Command.stub :execute, fixture("lsmod") do
+        OmfRc::ResourceFactory.new(:mod_test).request_modules.must_include "kvm"
+        OmfRc::ResourceFactory.new(:mod_test).request_modules.wont_include "Module"
+      end
     end
 
     it "could load a module" do
-      mock_execute(nil, /modprobe */)
-      OmfRc::ResourceFactory.new(:mod_test).configure_load_module('magic_module').must_be_nil
+      OmfCommon::Command.stub :execute, true do
+        OmfRc::ResourceFactory.new(:mod_test).configure_load_module('magic_module').must_equal true
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start { add_filter "/test" }
+
 gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/pride'
@@ -5,5 +8,13 @@ require 'minitest/pride'
 require 'omf_rc'
 require 'omf_rc/resource_factory'
 
+# Default fixture directory
+FIXTURE_DIR = "#{File.dirname(__FILE__)}/fixture"
+
 # Shut up all the loggers
 Logging.logger.root.clear_appenders
+
+# Reading fixture file
+def fixture(name)
+  File.read("#{FIXTURE_DIR}/#{name.to_s}")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.5
+  version: 6.0.0.pre.6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !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
@@ -59,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 6.0.0.pre
+- !ruby/object:Gem::Dependency
+  name: cocaine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: Resource controller of OMF, a generic framework for controlling and managing
   networking testbeds.
 email:
@@ -78,26 +110,49 @@ 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/generic_application.rb
 - lib/omf_rc/resource_proxy/mock.rb
+- lib/omf_rc/resource_proxy/net.rb
 - lib/omf_rc/resource_proxy/node.rb
-- lib/omf_rc/resource_proxy/wifi.rb
+- lib/omf_rc/resource_proxy/openflow_slice.rb
+- lib/omf_rc/resource_proxy/openflow_slice_factory.rb
+- lib/omf_rc/resource_proxy/wlan.rb
 - lib/omf_rc/resource_proxy_dsl.rb
+- lib/omf_rc/util/common_tools.rb
+- lib/omf_rc/util/hostapd.rb
+- lib/omf_rc/util/ip.rb
 - lib/omf_rc/util/iw.rb
 - lib/omf_rc/util/mock.rb
 - lib/omf_rc/util/mod.rb
+- lib/omf_rc/util/openflow_tools.rb
 - lib/omf_rc/util/package.rb
+- lib/omf_rc/util/platform_tools.rb
+- lib/omf_rc/util/wpa.rb
 - lib/omf_rc/version.rb
 - omf_rc.gemspec
+- test/fixture/ip/addr_show
 - test/fixture/iw/help
+- test/fixture/iw/info
 - test/fixture/iw/link
 - test/fixture/lsmod
-- test/mock_helper.rb
+- 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/generic_application_spec.rb
+- test/omf_rc/resource_proxy/mock_spec.rb
 - test/omf_rc/resource_proxy/node_spec.rb
 - test/omf_rc/resource_proxy_dsl_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/mock_spec.rb
 - test/omf_rc/util/mod_spec.rb
 - test/test_helper.rb
 homepage: https://www.mytestbed.net
@@ -125,3 +180,4 @@ signing_key:
 specification_version: 3
 summary: OMF resource controller
 test_files: []
+has_rdoc: 

data/lib/omf_rc/resource_proxy/wifi.rb

@@ -1,8 +0,0 @@
-module OmfRc::ResourceProxy::Wifi
-  include OmfRc::ResourceProxyDSL
-
-  register_proxy :wifi
-
-  utility :mod
-  utility :iw
-end

data/test/mock_helper.rb

@@ -1,15 +0,0 @@
-FIXTURE_DIR = "#{File.dirname(__FILE__)}/fixture"
-
-OmfCommon::Command = MiniTest::Mock.new
-
-def mock_execute(result, command_pattern)
-  OmfCommon::Command.expect :execute, result, [command_pattern]
-end
-
-def mock_verify_execute
-  OmfCommon::Command.verify
-end
-
-def fixture(name)
-  File.read("#{FIXTURE_DIR}/#{name.to_s}")
-end