ccbuilder 0.0.3 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/bin/befog

@@ -4,33 +4,49 @@ require "rubygems"
 require "getoptlong"
 require "ONEClient"
 
-help = <<EOF
-Usage: befog [OPTIONS] COMMAND
+help = <<EOHELP
+Authors: Dennis Klein <d.klein@gsi.de>, Victor Penso <v.penso@gsi.de>
+USAGE: 
+    befog [OPTIONS] COMMAND
 
-  -h, --help: Display this help
+OPTIONS:
+    -h, --help                Display this help
+    -v, --verbose             Print out progress and debug logs
 
-  COMMANDS:
+COMMANDS:
 
-  create FILE | create n virtual machines of type specified in FILE
-    -n, --repeat: Number of virtual machines, default n=1
-    FILE: Open Nebula virtual machine descriptor
+* create (create n virtual machines of type specified in FILE)
+    befog create FILE
+    
+    -n, --repeat              Number of virtual machines, default n=1
+    FILE                      Open Nebula virtual machine descriptor
 
-  list | show a list of your virtual machines
+* list (show a list of your virtual machines)
+    befog list
 
-  delete ID[..ID] | delete specified virtual machines
-    ID: single virtual machine ID
-    ID..ID: range of virtual machine IDs 
-EOF
+    -t, --table               Display table header
+
+* delete (delete specified virtual machines)
+    befog delete ID[..ID]
+    
+    ID                        single virtual machine ID
+    ID..ID                    range of virtual machine IDs 
+
+EOHELP
 
 begin
 
   opts = GetoptLong.new(
     [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
-    [ '--repeat', '-n', GetoptLong::REQUIRED_ARGUMENT ]
+    [ '--repeat', '-n', GetoptLong::REQUIRED_ARGUMENT ],
+    [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ],
+    [ '--table', '-t', GetoptLong::NO_ARGUMENT ]
   )
-
+  
   # parse OPTIONS
   repeat = 1
+  verbose = false
+  table = false
   opts.each do |opt, arg|
     case opt
       when '--help'
@@ -38,35 +54,46 @@ begin
         exit
       when '--repeat'
         repeat = arg.to_i
+      when '--verbose'
+        verbose = true
+      when '--table'
+        table = true
     end
   end
 
   # parse COMMAND
-  raise "Missing command (try --help)" if ARGV.length != 1
+  raise "Missing command (try --help)" if ARGV.length < 1
   command = ARGV[0]
 
   case command
   when "create"
     file = ARGV[1]
-    raise "Missing Open Nebula virtual machine decriptor FILE (try --help)" if !File.exists?(file)
-    one_client = CCBuilder::ONEClient.new
+    raise "Missing Open Nebula virtual machine decriptor FILE (try --help)" if !file 
+    raise "File does not exist: #{file}" if !File.exists?(file)
+    one_client = CCBuilder::ONEClient.new(verbose)
     one_client.create(file, repeat)
+
   when "list"
-    one_client = CCBuilder::ONEClient.new
+    one_client = CCBuilder::ONEClient.new(verbose)
+    format = "%7s %16s %30s %15s"
+    puts format % ['ID', 'IP', 'HOST', 'STATE'] if table
     one_client.list.each do |vm| 
-      print vm['id'] + "\t" + vm['ip'] + "\t" + vm['host']
+      puts format % [vm['id'], vm['ip'], vm['host'], vm['state']]
     end
+
   when "delete"
     begin
-      id_low = ARGV[1].match(/^([12345679][:digit:]*)/)[0].to_i
-      id_high = ARGV[1].match(/\.\.([12345679][:digit:]*)?/)[0].to_i
-    rescue
-      raise "Illegal ID input (try --help)"
+      id_low, id_high = ARGV[1].split('..')
+      id_low = id_low.to_i
+      id_high = id_high.to_i
+      raise "Invalid or missing low ID" if !id_low
+    rescue Exception => e
+      raise "Illegal ID input. #{e.message} (try --help)"
     end
-    raise "Missing ID (try --help)" if id_low == 0
     id_high = id_low if id_high < id_low
-    one_client = CCBuilder::ONEClient.new
+    one_client = CCBuilder::ONEClient.new(verbose)
     one_client.delete(id_low, id_high)  
+
   else
     raise "Unrecognized command: #{command} (try --help)"
   end

data/lib/ONEClient.rb

@@ -7,11 +7,13 @@ RUBY_LIB_LOCATION = !ONE_LOCATION ? "/usr/lib/one/ruby" : ONE_LOCATION+"/lib/rub
 $: << RUBY_LIB_LOCATION
 
 require "OpenNebula"
+require "resolv"
 
 module CCBuilder
   class ONEClient
 
-    def initialize()
+    def initialize(verbose = false)
+      @verbose = verbose
       @one_client = OpenNebula::Client.new(nil)
     rescue OpenNebula::Error => e
       raise Error.new("OpenNebula: #{e.message}")
@@ -21,20 +23,51 @@ module CCBuilder
     def create(one_vm_descriptor, n = 1)
       n.times do |i|
         create_single(one_vm_descriptor)
+        puts "created VM #i" if @verbose
       end
     end
 
     def create_single(one_vm_descriptor)
       vm = OpenNebula::VirtualMachine.new(OpenNebula::VirtualMachine.build_xml, @one_client)
       template=File.read(one_vm_descriptor)
-      vm.allocate(template)
+     vm.allocate(template)
     rescue
       raise Error.new("OpenNebula: Can not read template: #{one_vm_descriptor}")
     end
 
     # API-method list
     def list
-      raise Error.new("not yet implemented")
+      n = 3
+      vmpool = OpenNebula::VirtualMachinePool.new(@one_client, -1)
+      result = vmpool.info
+      vms = Array.new 
+      queue = Queue.new # queue to hold ids which need to be looked up
+      threads = Array.new
+      n.times do |i| # Launch n threads which do the lookups#        
+        threads[i] = Thread.new do 
+          id = queue.pop
+          until id == 0
+            vm = OpenNebula::VirtualMachine.new_with_id(id, @one_client)
+            vm.info
+            ip = vm.template_str.scan(/IP=(\d+\.\d+\.\d+\.\d+),/)[0][0]
+            state = vm.lcm_state_str
+            host = Resolv::getname(ip)
+            Thread.pass
+            puts "VM ##{id} with ip #{ip} resolved to name #{host}" if @verbose
+            vms << { 'id' => id, 'ip' => ip, 'host' => host, 'state' => state }
+            STDOUT.flush
+            id = queue.pop
+          end 
+        end
+      end
+      vmpool.map do |vm|
+        queue << vm.id
+      end
+      n.times { queue << 0 } # send 0 to terminate threads 
+      n.times { |i| threads[i].join } # wait until threads finished
+      return vms
+    ensure
+      n.times { |i| threads[i].terminate } 
     end
 
     # API-method delete
@@ -42,7 +75,8 @@ module CCBuilder
       id_high = id_low if id_high < id_low
       Range.new(id_low,id_high).each do |id|
         delete_single(id)
-      end 
+        puts "deleted VM #{id}" if @verbose
+      end
     end
 
     def delete_single(id)
@@ -52,8 +86,7 @@ module CCBuilder
       raise Error.new("OpenNebula: #{e.message}")
     end
 
+    class Error < Exception 
     end
-
-    class Error < Exception end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ccbuilder
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Dennis Klein