opennebula-cli 4.3.90.rc1 → 4.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 09217c63aeee7abd11ea62bbce95d89aebf56bbf
+  data.tar.gz: d7f49893d15771de27179a3abbdf5df268b2f395
+SHA512:
+  metadata.gz: 9c3429402c0d4d1dddc85d22d31318b6572839b54f87383f42c7e96c6708e90b3d6d689a7ad4e0cf9372fcd44416d8c191387cedd82ad9e1892fcc629e805f72
+  data.tar.gz: 939acfc80e9e32485bcebbec3944f77b059ad1e4344bce722fc79dfa75df8234a84b7747a1ad319174e050fcd4fa4e67d2f00f60f485ef12386545ca2f56d848

data/bin/oneflow

@@ -251,7 +251,7 @@ def show_service(client, args, options)
                 puts str % ["ROLE STATE", Role.state_str(role['state'])]
                 puts str % ["PARENTS", role['parents'].join(', ')] if role['parents']
                 puts str % ["VM TEMPLATE", role['vm_template']]
-                puts str % ["CARNIDALITY", role['cardinality']]
+                puts str % ["CARDINALITY", role['cardinality']]
                 puts str % ["MIN VMS", role['min_vms']] if role['min_vms']
                 puts str % ["MAX VMS", role['max_vms']] if role['max_vms']
                 puts str % ["COOLDOWN", "#{role['cooldown']}s"] if role['cooldown']

data/bin/onehost

@@ -73,8 +73,22 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     :format => String
     }
 
+    FORCE = {
+        :name   => "force",
+        :large  => "--force" ,
+        :description => "Force probe upgrade in onehost sync"
+    }
+
+    RSYNC = {
+        :name   => "rsync",
+        :large  => "--rsync" ,
+        :description => "Use rsync to synchronize remotes. In case some " <<
+            "probes are no longer in the fronted are deleted in the hosts." <<
+            " rsync command must be installed in the frontend and nodes."
+    }
+
     CREAT_OPTIONS = [ IM, VMM, VNET, OneClusterHelper::CLUSTER ]
-    SYNC_OPTIONS  = [ OneClusterHelper::CLUSTER ]
+    SYNC_OPTIONS  = [ OneClusterHelper::CLUSTER, FORCE, RSYNC ]
 
     ########################################################################
     # Formatters for arguments
@@ -173,8 +187,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             onehost sync host01,host02,host03
     EOT
 
-    command :sync, sync_desc, [:range,:hostid_list, nil], :options=>SYNC_OPTIONS do
-        helper.sync(args[0],options)
+    command :sync, sync_desc, [:range, :hostid_list, nil],
+            :options=>SYNC_OPTIONS do
+        helper.sync(args[0], options)
     end
 
     list_desc = <<-EOT.unindent

data/bin/onetemplate

@@ -54,6 +54,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     instantiate_options = [
         OneTemplateHelper::VM_NAME,
         OneTemplateHelper::MULTIPLE,
+        OneTemplateHelper::USERDATA,
         OneVMHelper::HOLD
     ]
 
@@ -196,6 +197,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
                 if args[1]
                     extra_template = File.read(args[1])
+                elsif options[:userdata]
+                    t.info
+                    if t.has_elements?('TEMPLATE/EC2')
+                        t.add_element(
+                            'TEMPLATE/EC2',
+                            'USERDATA' => options[:userdata])
+
+                        extra_template = t.template_like_str(
+                            'TEMPLATE', false, 'EC2')
+                    end
                 else
                     res = OpenNebulaHelper.create_template(options)
 

data/lib/one_helper/onedatastore_helper.rb

@@ -134,10 +134,12 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
 
         shared = datastore['TEMPLATE/SHARED']
         local = shared != nil && shared.upcase == 'NO'
+        limit_mb = datastore['TEMPLATE/LIMIT_MB']
 
         puts str % ["TOTAL:", local ? '-' : OpenNebulaHelper.unit_to_str(datastore['TOTAL_MB'].to_i, {},'M')]
-        puts str % ["USED: ", local ? '-' : OpenNebulaHelper.unit_to_str(datastore['USED_MB'].to_i, {},'M')]
         puts str % ["FREE:",  local ? '-' : OpenNebulaHelper.unit_to_str(datastore['FREE_MB'].to_i, {},'M')]
+        puts str % ["USED: ", local ? '-' : OpenNebulaHelper.unit_to_str(datastore['USED_MB'].to_i, {},'M')]
+        puts str % ["LIMIT:",  local || limit_mb.nil? ? '-' : OpenNebulaHelper.unit_to_str(limit_mb.to_i, {},'M')]
         puts
 
         CLIHelper.print_header(str_h1 % "PERMISSIONS",false)

data/lib/one_helper/onehost_helper.rb

@@ -18,6 +18,9 @@ require 'one_helper'
 require 'one_helper/onevm_helper'
 
 class OneHostHelper < OpenNebulaHelper::OneHelper
+    TEMPLATE_XPATH  = '//HOST/TEMPLATE'
+    VERSION_XPATH   = "#{TEMPLATE_XPATH}/VERSION"
+
     def self.rname
         "HOST"
     end
@@ -163,6 +166,18 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
     NUM_THREADS = 15
     def sync(host_ids, options)
+        begin
+            current_version = File.read(REMOTES_LOCATION+'/VERSION').strip
+        rescue
+            STDERR.puts("Could not read #{REMOTES_LOCATION}/VERSION")
+            exit(-1)
+        end
+
+        if current_version.empty?
+            STDERR.puts "Remotes version can not be empty"
+            exit(-1)
+        end
+
         cluster_id = options[:cluster]
 
         # Get remote_dir (implies oneadmin group)
@@ -192,7 +207,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
         # Assign hosts to threads
         i = 0
-        hs_threads = Array.new
+        queue = Array.new
 
         pool.each do |host|
             if host_ids
@@ -201,33 +216,69 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                 next if host['CLUSTER_ID'].to_i != cluster_id
             end
 
-            hs_threads[i % NUM_THREADS] ||= []
-            hs_threads[i % NUM_THREADS] << host['NAME']
-            i+=1
+            host_version=host['TEMPLATE/VERSION']
+
+            if !options[:force]
+                next if host_version && host_version >= current_version
+            end
+
+            puts "* Adding #{host['NAME']} to upgrade"
+
+            queue << host
         end
 
         # Run the jobs in threads
         host_errors = Array.new
-        lock = Mutex.new
+        queue_lock = Mutex.new
+        error_lock = Mutex.new
+        total = queue.length
+
+        if total==0
+            puts "No hosts are going to be updated."
+            exit(0)
+        end
+
+        ts = (1..NUM_THREADS).map do |t|
+            Thread.new do
+                while true do
+                    host = nil
+                    size = 0
+
+                    queue_lock.synchronize do
+                        host=queue.shift
+                        size=queue.length
+                    end
+
+                    break if !host
+
+                    print_update_info(total-size, total, host['NAME'])
+
+                    if options[:rsync]
+                        sync_cmd = "rsync -Laz --delete #{REMOTES_LOCATION}" <<
+                            " #{host['NAME']}:#{remote_dir}"
+                    else
+                        sync_cmd = "scp -rp #{REMOTES_LOCATION}/. " <<
+                            "#{host['NAME']}:#{remote_dir} 2> /dev/null"
+                    end
 
-        ts = hs_threads.map do |t|
-            Thread.new {
-                t.each do |host|
-                    sync_cmd = "scp -rp #{REMOTES_LOCATION}/. #{host}:#{remote_dir} 2> /dev/null"
                     `#{sync_cmd} 2>/dev/null`
 
                     if !$?.success?
-                        lock.synchronize {
-                            host_errors << host
+                        error_lock.synchronize {
+                            host_errors << host['NAME']
                         }
+                    else
+                        update_version(host, current_version)
                     end
                 end
-            }
+            end
         end
 
         # Wait for threads to finish
         ts.each{|t| t.join}
 
+        puts
+
         if host_errors.empty?
             puts "All hosts updated successfully."
             0
@@ -240,6 +291,39 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
     private
 
+    def print_update_info(current, total, host)
+        bar_length=40
+
+        percentage=current.to_f/total.to_f
+        done=(percentage*bar_length).floor
+
+        bar="["
+        bar+="="*done
+        bar+="-"*(bar_length-done)
+        bar+="]"
+
+        info="#{current}/#{total}"
+
+        str="#{bar} #{info} "
+        name=host[0..(79-str.length)]
+        str=str+name
+        str=str+" "*(79-str.length)
+
+        print "#{str}\r"
+        STDOUT.flush
+    end
+
+    def update_version(host, version)
+        if host.has_elements?(VERSION_XPATH)
+            host.delete_element(VERSION_XPATH)
+        end
+
+        host.add_element(TEMPLATE_XPATH, 'VERSION' => version)
+
+        template=host.template_str
+        host.update(template)
+    end
+
     def factory(id=nil)
         if id
             OpenNebula::Host.new_with_id(id, @client)

data/lib/one_helper/oneimage_helper.rb

@@ -124,12 +124,9 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         {
             :name => "size",
             :large => "--size size",
-            :description => "Size in MB. Used for DATABLOCK type",
+            :description => "Size in MB. Used for DATABLOCK type or SOURCE based images.",
             :format => String,
             :proc => lambda do |o, options|
-                if !options[:type] || !(options[:type].upcase=='DATABLOCK')
-                    next [-1, "Size is only used for DATABLOCK type images"]
-                end
 
                 m=o.strip.match(/^(\d+(?:\.\d+)?)(m|mb|g|gb)?$/i)
 

data/lib/one_helper/onetemplate_helper.rb

@@ -36,6 +36,13 @@ EOT
         :description => "Instance multiple VMs"
     }
 
+    USERDATA={
+        :name  => "userdata",
+        :large => "--userdata userdata",
+        :format => String,
+        :description => "Integrate userdata into the EC2 section"
+    }
+
     def self.rname
         "VMTEMPLATE"
     end

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 4.3.90.rc1
-  prerelease: 7
+  version: 4.4.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.90.rc1
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.90.rc1
+        version: 4.4.0
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -78,27 +75,25 @@ files:
 - LICENSE
 homepage: http://opennebula.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OpenNebula Command Line Interface
 test_files: []
-has_rdoc: