omf_rc 6.0.0.pre.7 → 6.0.0.pre.8

data/lib/omf_rc/util/vmbuilder.rb

@@ -0,0 +1,181 @@
+#
+# 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.
+
+#
+# This module defines the command specifics to build a VM image using
+# the vmbuilder tool
+#
+# Utility dependencies: common_tools
+#
+# @see OmfRc::ResourceProxy::VirtualMachine
+#
+module OmfRc::Util::Vmbuilder
+  include OmfRc::ResourceProxyDSL
+
+  VMBUILDER = "/usr/bin/vmbuilder"
+
+  VMBUILDER_DEFAULT = Hashie::Mash.new({
+                      cpus: 1, mem: 512,
+                      rootsize: 20000, overwrite: true,
+                      ip: nil, mask: nil, net: nil, bcast: nil, 
+                      gw: nil, dns: nil 
+                      })
+
+  UBUNTU_DEFAULT = Hashie::Mash.new({ 
+                  suite: 'natty', arch: 'i386',
+                  user: 'administrator', pass: 'omf',
+                  mirror: 'http://10.0.0.200:9999/ubuntu',
+                  #mirror: 'http://au.archive.ubuntu.com/ubuntu/',
+                  bridge: nil,
+                  #variant: 'minbase',
+                  #pkg: ['openssh-server'] 
+                  #pkg: ['openssh-server','sudo','inetutils-ping','host',
+                  #      'net-tools','vim','gpgv'] 
+                  pkg: ['openssh-server','sudo','inetutils-ping','host',
+                        'net-tools','vim','gpgv',
+                        'build-essential','automake', 'curl',
+                        'zlib1g-dev','libxslt-dev','libxml2-dev',
+                        'libssl-dev','iw'] 
+                  })
+
+  property :vmbuilder_opts, :default => VMBUILDER_DEFAULT
+  property :ubuntu_opts, :default => UBUNTU_DEFAULT
+
+  %w(vmbuilder ubuntu).each do |prefix|
+    prop = "#{prefix}_opts"
+    configure(prop) do |res, opts|
+      if opts.kind_of? Hash
+        if res.property[prop].empty?
+          res.property[prop] = res.send("#{prefix}_DEFAULT").merge(opts)
+        else 
+          res.property[prop] = res.property[prop].merge(opts)
+        end
+      else
+        res.log_inform_error "#{prefix} option configuration failed! "+
+          "Options not passed as Hash (#{opts.inspect})"
+      end
+      res.property[prop]
+    end
+  end
+
+  %w(vmbuilder ubuntu).each do |prefix|
+    prop = "#{prefix}_opts"
+    request(prop) do |res, opts|
+      if res.property[prop].empty?
+        res.property[prop] = res.send("#{prefix}_DEFAULT")
+      else 
+        res.property[prop]
+      end
+    end
+  end
+
+  work :build_img_with_vmbuilder do |res|
+    # Construct the vmbuilder command
+    `mkdir -p #{res.property.image_path}`
+    if $?.exitstatus != 0
+      msg = "Cannot create VM directory at #{res.property.image_path}"
+      res.log_inform_error msg
+      cmd = msg
+    else
+      cmd = "cd #{res.property.image_path} ; "
+      cmd += res.property.use_sudo ? "sudo " : ""
+      cmd += "#{VMBUILDER} #{res.property.hypervisor} #{res.property.vm_os} "+
+              "--libvirt #{res.property.hypervisor_uri} "+
+              "--hostname #{res.property.vm_name} "
+      # Add vmbuilder options
+      res.property.vmbuilder_opts.each do |k,v|
+        if k.to_sym == :overwrite
+          cmd += "-o " if v
+        else
+          cmd += "--#{k.to_s} #{v} " unless v.nil?
+        end
+      end
+      # Add OS-specific options, eg. call 'vmbuilder_ubuntu_opts' if OS is ubuntu
+      cmd = res.send("build_img_with_#{res.property.vm_os}", cmd)
+      # Add first boot script
+      firstboot = "#{res.property.image_path}/firstboot.sh"
+      res.send("build_firstboot_for_#{res.property.vm_os}", firstboot)
+      # Return the fully constructed command line
+      cmd += "--firstboot #{firstboot}"
+    end
+    logger.info "Building VM with: '#{cmd}'"
+    result = `#{cmd} 2>&1`
+    if $?.exitstatus != 0
+      res.log_inform_error "Cannot build VM image: '#{result}'"
+      false
+    else
+      logger.info "VM image built successfully!"
+      true
+    end
+  end
+
+  work :build_img_with_ubuntu do |res,cmd|
+    res.property.ubuntu_opts.each do |k,v|
+      if k.to_sym == :pkg 
+        v.each { |p| cmd += "--addpkg #{p} "} if v.length > 0
+      else
+        cmd += "--#{k.to_s} #{v} " unless v.nil?
+      end
+    end
+    cmd
+  end
+
+  work :build_firstboot_for_ubuntu do |res,file|
+    f = File.open(file,'w')
+    f << <<-eos
+#!/bin/bash
+# Fix DNS setting
+echo 'nameserver #{res.property.vmbuilder_opts.dns}' >> /etc/resolv.conf
+# Regenerate SSH key for each image instance
+rm /etc/ssh/ssh_host*key*
+dpkg-reconfigure -fnoninteractive -pcritical openssh-server
+eos
+    # Add OMF install to that first boot script
+    if res.property.enable_omf
+      u = res.property.omf_opts.user.nil? ? \
+        "#{res.property.vm_name}" : res.property.omf_opts.user
+      p = res.property.omf_opts.password.nil? ? \
+        "123456" : res.property.omf_opts.password
+      t = res.property.omf_opts.topic.nil? ? \
+        "#{res.property.vm_name}_node" : res.property.omf_opts.topic
+      f << <<-eos
+# Install OMF 6 RC
+curl -L https://get.rvm.io | bash -s stable
+source /usr/local/rvm/scripts/rvm
+command rvm install 1.9.3
+PATH=$PATH:/usr/local/rvm/rubies/ruby-1.9.3-p194/bin/ 
+source /usr/local/rvm/environments/ruby-1.9.3-p194
+gem install omf_rc --pre --no-ri --no-rdoc 
+# HACK
+# Right now we dont have a Ubuntu startup script for OMF6 RC
+# Do this quick hack in the meantime
+echo '#!/bin/bash' >>/etc/rc2.d/S99omf_rc
+echo 'source /etc/profile.d/rvm.sh' >>/etc/rc2.d/S99omf_rc
+echo 'source /usr/local/rvm/environments/ruby-1.9.3-p194' >>/etc/rc2.d/S99omf_rc
+echo 'nohup omf_rc -u #{u} -p #{p} -t #{t} -s #{res.property.omf_opts.server} &>>/tmp/omf_rc.log &' >>/etc/rc2.d/S99omf_rc
+chmod 555 /etc/rc2.d/S99omf_rc
+/etc/rc2.d/S99omf_rc
+eos
+    end
+    f.close
+  end
+
+end

data/lib/omf_rc/version.rb

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

data/test/omf_rc/resource_proxy/abstract_resource_spec.rb

@@ -64,10 +64,12 @@ describe AbstractResource do
 
   describe "when destroyed" do
     it "must destroy itself together with any resources created by it" do
-      child = @node.create(:wifi, { hrn: 'default_wifi' })
-      @node.children.wont_be_empty
-      @node.release(child.uid)
-      @node.children.must_be_empty
+      @node.comm.stub :delete_topic, nil do
+        child = @node.create(:wifi, { hrn: 'default_wifi' })
+        @node.children.wont_be_empty
+        @node.release(child.uid)
+        @node.children.must_be_empty
+      end
     end
   end
 

data/test/omf_rc/util/ip_spec.rb

@@ -41,7 +41,9 @@ describe OmfRc::Util::Ip do
     it "could configure the device's prorperty" do
       lambda { @wlan00.configure_ip_addr("192.168.1.124/24") }.must_raise Cocaine::ExitStatusError
       Cocaine::CommandLine.stub(:new, @command) do
-        @command.expect(:run, "")
+        3.times do
+          @command.expect(:run, "")
+        end
         @command.expect(:run, fixture("ip/addr_show"))
         @wlan00.configure_ip_addr("192.168.1.124/24")
         @command.verify

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.7
+  version: 6.0.0.pre.8
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70355490301900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '3.2'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
+  version_requirements: *70355490301900
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70355490301000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.1
+  version_requirements: *70355490301000
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70355490299940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70355490299940
 - !ruby/object:Gem::Dependency
   name: omf_common
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70355490298920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 6.0.0.pre
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 6.0.0.pre
+  version_requirements: *70355490298920
 - !ruby/object:Gem::Dependency
   name: cocaine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70355490298000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,12 +65,7 @@ dependencies:
         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
+  version_requirements: *70355490298000
 description: Resource controller of OMF, a generic framework for controlling and managing
   networking testbeds.
 email:
@@ -116,17 +91,22 @@ files:
 - lib/omf_rc/resource_proxy/node.rb
 - lib/omf_rc/resource_proxy/openflow_slice.rb
 - lib/omf_rc/resource_proxy/openflow_slice_factory.rb
+- lib/omf_rc/resource_proxy/virtual_machine.rb
+- lib/omf_rc/resource_proxy/virtual_machine_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/libvirt.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/sysfs.rb
+- lib/omf_rc/util/vmbuilder.rb
 - lib/omf_rc/util/wpa.rb
 - lib/omf_rc/version.rb
 - omf_rc.gemspec
@@ -178,8 +158,36 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: omf_rc
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 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/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/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