opennebula-cli 4.2.0 → 4.3.80.beta

data/bin/onecluster

@@ -197,4 +197,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             obj.update(str, options[:append])
         end
     end
+
+    rename_desc = <<-EOT.unindent
+        Renames the Cluster
+    EOT
+
+    command :rename, rename_desc, :clusterid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(args[1])
+        end
+    end
 end

data/bin/onedatastore

@@ -174,4 +174,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             obj.update(str, options[:append])
         end
     end
+
+    rename_desc = <<-EOT.unindent
+        Renames the Datastore
+    EOT
+
+    command :rename, rename_desc, :datastoreid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(args[1])
+        end
+    end
 end

data/bin/onehost

@@ -20,8 +20,10 @@ ONE_LOCATION=ENV["ONE_LOCATION"]
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION="/usr/lib/one/ruby"
+    REMOTES_LOCATION="/var/lib/one/remotes"
 else
     RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
+    REMOTES_LOCATION=ONE_LOCATION+"/var/remotes/"
 end
 
 $: << RUBY_LIB_LOCATION
@@ -72,6 +74,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     }
 
     CREAT_OPTIONS = [ IM, VMM, VNET, OneClusterHelper::CLUSTER ]
+    SYNC_OPTIONS  = [ OneClusterHelper::CLUSTER ]
 
     ########################################################################
     # Formatters for arguments
@@ -164,16 +167,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     sync_desc = <<-EOT.unindent
         Synchronizes probes in /var/lib/one/remotes ($ONE_LOCATION/var/remotes
         in self-contained installations) with Hosts.
-        The copy is performed the next time the Host is monitored
+        Examples:
+            onehost sync
+            onehost sync -c myCluster
+            onehost sync host01,host02,host03
     EOT
 
-    command :sync, sync_desc do
-        if ONE_LOCATION
-            FileUtils.touch "#{ONE_LOCATION}/var/remotes"
-        else
-            FileUtils.touch "/var/lib/one/remotes"
-        end
-        0
+    command :sync, sync_desc, [:range,:hostid_list, nil], :options=>SYNC_OPTIONS do
+        helper.sync(args[0],options)
     end
 
     list_desc = <<-EOT.unindent
@@ -213,4 +214,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             host.flush
         end
     end
+
+    rename_desc = <<-EOT.unindent
+        Renames the Host
+    EOT
+
+    command :rename, rename_desc, :hostid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(args[1])
+        end
+    end
 end

data/bin/oneuser

@@ -380,7 +380,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     chgrp_desc = <<-EOT.unindent
-        Changes the User's main group
+        Changes the User's primary group
     EOT
 
     command :chgrp, chgrp_desc, [:range, :userid_list], :groupid do
@@ -389,6 +389,30 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    addgroup_desc = <<-EOT.unindent
+        Adds the User to a secondary group
+    EOT
+
+    command :addgroup, addgroup_desc, [:range, :userid_list], :groupid do
+        gid = args[1]
+
+        helper.perform_actions(args[0],options,"group added") do |user|
+            user.addgroup( gid )
+        end
+    end
+
+    delgroup_desc = <<-EOT.unindent
+        Removes the User from a secondary group
+    EOT
+
+    command :delgroup, delgroup_desc, [:range, :userid_list], :groupid do
+        gid = args[1]
+
+        helper.perform_actions(args[0],options,"group deleted") do |user|
+            user.delgroup( gid )
+        end
+    end
+
     chauth_desc = <<-EOT.unindent
         Changes the User's auth driver and its password (optional)
         Examples:

data/bin/onevm

@@ -111,6 +111,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         OpenNebulaHelper.rname_to_id(arg, "USER")
     end
 
+    set :format, :datastoreid, OpenNebulaHelper.rname_to_id_desc("DATASTORE") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "DATASTORE")
+    end
+
     set :format, :vmid, OneVMHelper.to_id_desc do |arg|
         helper.to_id(arg)
     end
@@ -318,7 +322,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         With --hard it unplugs the VM.
 
-        States: RUNNING
+        States: RUNNING, UNKNOWN (with --hard)
     EOT
 
     command :shutdown, shutdown_desc, [:range,:vmid_list],
@@ -413,17 +417,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: PENDING
     EOT
 
-    command :deploy, deploy_desc, [:range,:vmid_list], :hostid,
+    command :deploy, deploy_desc, [:range,:vmid_list], :hostid, [:datastoreid,nil], 
             :options=>[ENFORCE] do
         host_id = args[1]
         verbose = "deploying in host #{host_id}"
 
+        enforce = options[:enforce].nil? ? false : options[:enforce]
+        ds_id = args[2].nil? ? -1 : args[2]
+
         helper.perform_actions(args[0],options,verbose) do |vm|
-            if !options[:enforce].nil?
-                vm.deploy(host_id, options[:enforce])
-            else
-                vm.deploy(host_id)
-            end
+            vm.deploy(host_id, enforce, ds_id)
         end
     end
 

data/lib/one_helper.rb

@@ -186,6 +186,37 @@ EOT
             :large  => '--vnc',
             :description => 'Add VNC server to the VM'
         },
+        {
+            :name   => 'vnc_password',
+            :large  => '--vnc-password password',
+            :format => String,
+            :description => 'VNC password'
+        },
+        {
+            :name   => 'vnc_listen',
+            :large  => '--vnc-listen ip',
+            :format => String,
+            :description => 'VNC IP where to listen for connections. '<<
+                'By default is 0.0.0.0 (all interfaces).'
+        },
+        {
+            :name   => 'spice',
+            :large  => '--spice',
+            :description => 'Add spice server to the VM'
+        },
+        {
+            :name   => 'spice_password',
+            :large  => '--spice-password password',
+            :format => String,
+            :description => 'spice password'
+        },
+        {
+            :name   => 'spice_listen',
+            :large  => '--spice-listen ip',
+            :format => String,
+            :description => 'spice IP where to listen for connections. '<<
+                'By default is 0.0.0.0 (all interfaces).'
+        },
         {
             :name   => 'ssh',
             :large  => '--ssh [file]',
@@ -217,6 +248,19 @@ EOT
             :large  => '--boot device',
             :description => 'Select boot device (hd|fd|cdrom|network)',
             :format => String
+        },
+        {
+            :name   => 'files_ds',
+            :large  => '--files_ds file1,file2',
+            :format => Array,
+            :description => 'Add files to the contextualization CD from the' <<
+                'files datastore'
+        },
+        {
+            :name   => 'init',
+            :large  => '--init script1,script2',
+            :format => Array,
+            :description => 'Script or scripts to start in context'
         }
     ]
 
@@ -743,7 +787,8 @@ EOT
     end
 
     def self.create_context(options)
-        if !(options.keys & [:ssh, :net_context, :context]).empty?
+        context_options = [:ssh, :net_context, :context, :init, :files_ds]
+        if !(options.keys & context_options).empty?
             lines=[]
 
             if options[:ssh]
@@ -761,11 +806,25 @@ EOT
             end
 
             if options[:net_context]
-                    lines << "NETWORK = \"YES\""
+                lines << "NETWORK = \"YES\""
             end
 
             lines+=options[:context] if options[:context]
 
+            if options[:files_ds]
+                text='FILES_DS="'
+                text << options[:files_ds].map do |file|
+                    %Q<$FILE[IMAGE=\\"#{file}\\"]>
+                end.join(' ')
+                text << '"'
+
+                lines << text
+            end
+
+            if options[:init]
+                lines << %Q<INIT_SCRIPTS="#{options[:init].join(' ')}">
+            end
+
             if !lines.empty?
                 "CONTEXT=[\n"<<lines.map{|l| "  "<<l }.join(",\n")<<"\n]\n"
             else
@@ -813,7 +872,21 @@ EOT
         end
 
         if options[:vnc]
-            template<<'GRAPHICS=[ TYPE="vnc", LISTEN="0.0.0.0" ]'<<"\n"
+            vnc_listen=options[:vnc_listen] || "0.0.0.0"
+            template<<"GRAPHICS=[ TYPE=\"vnc\", LISTEN=\"#{vnc_listen}\""
+            if options[:vnc_password]
+                template << ", PASSWD=\"#{options[:vnc_password]}\""
+            end
+            template<<' ]'<<"\n"
+        end
+
+        if options[:spice]
+            spice_listen=options[:spice_listen] || "0.0.0.0"
+            template<<"GRAPHICS=[ TYPE=\"spice\", LISTEN=\"#{spice_listen}\""
+            if options[:spice_password]
+                template << ", PASSWD=\"#{options[:spice_password]}\""
+            end
+            template<<' ]'<<"\n"
         end
 
         context=create_context(options)

data/lib/one_helper/onecluster_helper.rb

@@ -102,7 +102,6 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper
         CLIHelper.print_header(str_h1 % "CLUSTER #{cluster['ID']} INFORMATION")
         puts str % ["ID",   cluster.id.to_s]
         puts str % ["NAME", cluster.name]
-        puts str % ["SYSTEM DS", cluster['SYSTEM_DS']]
         puts
 
         CLIHelper.print_header(str_h1 % "CLUSTER TEMPLATE", false)

data/lib/one_helper/onedatastore_helper.rb

@@ -49,7 +49,8 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
             end
 
             column :SIZE, "Datastore total size", :size =>10 do |d|
-                if d['TEMPLATE']['TYPE'] == 'SYSTEM_DS'
+                shared = d['TEMPLATE']['SHARED']
+                if shared != nil && shared.upcase == 'NO'
                     "-"
                 else
                     OpenNebulaHelper.unit_to_str(d['TOTAL_MB'].to_i, {}, 'M')
@@ -115,8 +116,6 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
         str="%-15s: %-20s"
         str_h1="%-80s"
 
-        system = datastore.type == 1
-
         CLIHelper.print_header(str_h1 % "DATASTORE #{datastore['ID']} INFORMATION")
         puts str % ["ID",       datastore.id.to_s]
         puts str % ["NAME",     datastore.name]
@@ -132,9 +131,13 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
         puts
 
         CLIHelper.print_header(str_h1 % "DATASTORE CAPACITY", false)
-        puts str % ["TOTAL:", system ? '-' : OpenNebulaHelper.unit_to_str(datastore['TOTAL_MB'].to_i, {},'M')]
-        puts str % ["USED: ", system ? '-' : OpenNebulaHelper.unit_to_str(datastore['USED_MB'].to_i, {},'M')]
-        puts str % ["FREE:",  system ? '-' : OpenNebulaHelper.unit_to_str(datastore['FREE_MB'].to_i, {},'M')]
+
+        shared = datastore['TEMPLATE/SHARED']
+        local = shared != nil && shared.upcase == 'NO'
+
+        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
 
         CLIHelper.print_header(str_h1 % "PERMISSIONS",false)

data/lib/one_helper/onegroup_helper.rb

@@ -61,10 +61,15 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
             end
 
             column :USERS, "Number of Users in this group", :size=>5 do |d|
-                if d["USERS"]["ID"].nil?
-                    "0"
+                ids = d["USERS"]["ID"]
+
+                case ids
+                when String
+                    "1"
+                when Array
+                    ids.size
                 else
-                    d["USERS"]["ID"].size
+                    "0"
                 end
             end
 

data/lib/one_helper/onehost_helper.rb

@@ -29,7 +29,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
     def self.state_to_str(id)
         id        = id.to_i
         state_str = Host::HOST_STATES[id]
-        
+
         return Host::SHORT_HOST_STATES[state_str]
     end
 
@@ -114,7 +114,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                         "#{cpu_usage} / #{max_cpu} (#{ratio}%)"
                     else
                         "#{cpu_usage} / -"
-                    end                    
+                    end
                 end
             end
 
@@ -156,6 +156,84 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         table
     end
 
+
+    NUM_THREADS = 15
+    def sync(host_ids, options)
+        cluster_id = options[:cluster]
+
+        # Get remote_dir (implies oneadmin group)
+        rc = OpenNebula::System.new(@client).get_configuration
+        return -1, rc.message if OpenNebula.is_error?(rc)
+
+        conf = rc
+        remote_dir = conf['SCRIPTS_REMOTE_DIR']
+
+        # Verify the existence of REMOTES_LOCATION
+        if !File.directory? REMOTES_LOCATION
+            error_msg = "'#{REMOTES_LOCATION}' does not exist. " <<
+                            "This command must be run in the frontend."
+            return -1,error_msg
+        end
+
+        # Touch the update file
+        FileUtils.touch(File.join(REMOTES_LOCATION,'.update'))
+
+        # Get the Host pool
+        filter_flag ||= OpenNebula::Pool::INFO_ALL
+
+        pool = factory_pool(filter_flag)
+
+        rc = pool.info
+        return -1, rc.message if OpenNebula.is_error?(rc)
+
+        # Assign hosts to threads
+        i = 0
+        hs_threads = Array.new
+
+        pool.each do |host|
+            if host_ids
+                next if !host_ids.include?(host['ID'].to_i)
+            elsif cluster_id
+                next if host['CLUSTER_ID'].to_i != cluster_id
+            end
+
+            hs_threads[i % NUM_THREADS] ||= []
+            hs_threads[i % NUM_THREADS] << host['NAME']
+            i+=1
+        end
+
+        # Run the jobs in threads
+        host_errors = Array.new
+        lock = Mutex.new
+
+        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
+                        }
+                    end
+                end
+            }
+        end
+
+        # Wait for threads to finish
+        ts.each{|t| t.join}
+
+        if host_errors.empty?
+            puts "All hosts updated successfully."
+            0
+        else
+            STDERR.puts "Failed to update the following hosts:"
+            host_errors.each{|h| STDERR.puts "* #{h}"}
+            -1
+        end
+    end
+
     private
 
     def factory(id=nil)
@@ -200,6 +278,22 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         puts str % ["RUNNING VMS", host['HOST_SHARE/RUNNING_VMS']]
         puts
 
+        datastores = host.to_hash['HOST']['HOST_SHARE']['DATASTORES']['DS']
+
+        if datastores.nil?
+            datastores = []
+        else
+            datastores = [datastores].flatten
+        end
+
+        datastores.each do |datastore|
+            CLIHelper.print_header(str_h1 % "LOCAL SYSTEM DATASTORE ##{datastore['ID']} CAPACITY", false)
+            puts str % ["TOTAL:", OpenNebulaHelper.unit_to_str(datastore['TOTAL_MB'].to_i, {},'M')]
+            puts str % ["USED: ", OpenNebulaHelper.unit_to_str(datastore['USED_MB'].to_i, {},'M')]
+            puts str % ["FREE:",  OpenNebulaHelper.unit_to_str(datastore['FREE_MB'].to_i, {},'M')]
+            puts
+        end
+
         CLIHelper.print_header(str_h1 % "MONITORING INFORMATION", false)
 
         puts host.template_str

data/lib/one_helper/onequota_helper.rb

@@ -31,9 +31,10 @@ class OneQuotaHelper
         #  ]
         #
         #  VM = [
-        #    VMS    = <Max. number of VMs>
-        #    MEMORY = <Max. allocated memory (Mb)>
-        #    CPU    = <Max. allocated CPU>
+        #    VMS           = <Max. number of VMs>
+        #    MEMORY        = <Max. allocated memory (MB)>
+        #    CPU           = <Max. allocated CPU>
+        #    VOLATILE_SIZE = <Max. allocated volatile disks (MB)>
         #  ]
         #
         #  NETWORK = [
@@ -180,14 +181,14 @@ class OneQuotaHelper
 
         if !vm_quotas[0].nil?
             CLIHelper::ShowTable.new(nil, self) do
-                column :"NUMBER OF VMS", "", :right, :size=>20 do |d|
+                column :"NUMBER OF VMS", "", :right, :size=>17 do |d|
                     if !d.nil?
                         elem = 'VMS'
                         limit = d[elem]
                         limit = helper.get_default_limit(
                             limit, "VM_QUOTA/VM/#{elem}")
 
-                        "%8d / %8d" % [d["VMS_USED"], limit]
+                        "%7d / %7d" % [d["VMS_USED"], limit]
                     end
                 end
 
@@ -215,6 +216,20 @@ class OneQuotaHelper
                         "%8.2f / %8.2f" % [d["CPU_USED"], limit]
                     end
                 end
+
+                column :"VOLATILE_SIZE", "", :right, :size=>20 do |d|
+                    if !d.nil?
+                        elem = 'VOLATILE_SIZE'
+                        limit = d[elem]
+                        limit = helper.get_default_limit(
+                            limit, "VM_QUOTA/VM/#{elem}")
+
+                        "%8s / %8s" % [
+                            OpenNebulaHelper.unit_to_str(d["VOLATILE_SIZE_USED"].to_i,{},"M"),
+                            OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")
+                        ]
+                    end
+                end
             end.show(vm_quotas, {})
 
             puts

data/lib/one_helper/oneuser_helper.rb

@@ -245,13 +245,15 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
     def format_resource(user, options = {})
         system = System.new(@client)
 
-        str="%-15s: %-20s"
+        str="%-16s: %-20s"
         str_h1="%-80s"
 
         CLIHelper.print_header(str_h1 % "USER #{user['ID']} INFORMATION")
         puts str % ["ID",          user.id.to_s]
         puts str % ["NAME",        user.name]
         puts str % ["GROUP",       user['GNAME']]
+        groups = user.retrieve_elements("GROUPS/ID")
+        puts str % ["SECONDARY GROUPS", groups.join(',') ] if groups.size > 1
         puts str % ["PASSWORD",    user['PASSWORD']]
         puts str % ["AUTH_DRIVER", user['AUTH_DRIVER']]
 

data/lib/one_helper/onevm_helper.rb

@@ -248,6 +248,9 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         puts str % ["HOST",
             vm['/VM/HISTORY_RECORDS/HISTORY[last()]/HOSTNAME']] if
                 %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str
+        puts str % ["CLUSTER ID", 
+            vm['/VM/HISTORY_RECORDS/HISTORY[last()]/CID'] ] if 
+                %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str
         puts str % ["START TIME",
             OpenNebulaHelper.time_to_str(vm['/VM/STIME'])]
         puts str % ["END TIME",
@@ -547,6 +550,10 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 VirtualMachine.get_reason d["REASON"]
             end
 
+            column :DS, "System Datastore", :size=>4 do |d|
+                d["DS_ID"]
+            end
+
             column :START, "Time when the state changed", :size=>15 do |d|
                 OpenNebulaHelper.time_to_str(d['STIME'])
             end
@@ -569,7 +576,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 OpenNebulaHelper.short_period_to_str(dtime)
             end
 
-            default :SEQ, :HOST, :ACTION, :REASON, :START, :TIME, :PROLOG
+            default :SEQ, :HOST, :ACTION, :DS, :START, :TIME, :PROLOG
         end
 
         vm_hash=vm.to_hash

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.0
-  prerelease: 
+  version: 4.3.80.beta
+  prerelease: 7
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.80.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.80.beta
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -91,9 +91,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25