opennebula-cli 4.90.0.beta1 → 4.90.10.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03d316a86c2d34e3a0f246b8c1bc65380a3edabb
-  data.tar.gz: 9cce74d38345ea1f873119f10bdb16ace40391a6
+  metadata.gz: d6a5ac89156c41b32c7dda603606ea64843a5951
+  data.tar.gz: 230a6c25080f7057b86cbe31a2cf287700a2ef5b
 SHA512:
-  metadata.gz: adc9b92034a6fb1ac7d4ee40ed90ae967eed40a05e34309ab02cd21a383cbb9112e58b0bad114d3e3b6e48cb4c22d2606c7b1974b306340cc2044352b78226d3
-  data.tar.gz: 5651dbf53d3b2827bb65bd839c3c58b9a401e013864e7eab4183902240937126ef4c260a17f2669b285735075b0b8b8340e387a5fc959d46aedfd6aba9c594d7
+  metadata.gz: 180e52d5207e7e8ae08ac0d2c973dd538f1c124a1e10c85a83fc479e41c8dd8d8aeb82a0739f85d2984e1016a781e7ec2943d0f8303f50a230c7e6e736aee0cd
+  data.tar.gz: 92d169992c1679bc7769f24fd8bf40e09420bfeff0b415746f0f52065f1f1b39a7580506017e09c9b6406a643b71aab4bd7f9a137ebf3e114d959b6c90f6a850

data/bin/oneacct

@@ -122,8 +122,8 @@ cmd = CommandParser::CmdParser.new(ARGV) do
                     end
                 end
 
-                cols=AcctHelper::ACCT_TABLE.default_columns
-                AcctHelper::ACCT_TABLE.default(:UID, *cols)
+                cols = [ :UID ] + AcctHelper::ACCT_TABLE.default_columns
+                options[:list] ||= cols
 
                 AcctHelper::ACCT_TABLE.show(a, options)
                 exit(0)

data/bin/oneimage

@@ -105,7 +105,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
             oneimage create -d 1 --name ubuntu --path /tmp/ubuntu.qcow2 \\
                             --prefix sd --type OS --driver qcow2 \\
-                            --description "A OS plain installation"
+                            --description "A OS plain installation \\
+                            --persistent"
 
           - a datablock image of 400MB:
 

data/bin/onevcenter

@@ -642,7 +642,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                     rc = one_i.allocate(i[:one], i[:dsid].to_i)
 
                     if ::OpenNebula.is_error?(rc)
-                        STDOUT.puts "    Error creating image: #{rc.message}\n"
+                        STDOUT.puts "Error creating image: #{rc.message}\n"
+                        if rc.message == "[ImageAllocate] Not enough space "\
+                                         "in datastore"
+                            STDOUT.puts "Please disable DATASTORE_CAPACITY_"\
+                                        "CHECK in /etc/one/oned.conf and "\
+                                        "restart OpenNebula."
+                        end
                     else
                         STDOUT.puts "    OpenNebula image #{one_i.id} created!\n"
                     end

data/bin/onevm

@@ -925,9 +925,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     updateconf_desc = <<-EOT.unindent
-        Updates the configuration of a VM. The VM cannot be in a active (running)
+        Updates the configuration of a VM. The VM cannot be in an active (running)
         state, valid states are: pending, failure, poweroff, undeploy, hold or
-        clonning.
+        cloning.
 
         This command accepts a template file or opens an editor, the full list of
         configuration attributes are:

data/lib/one_helper.rb

@@ -347,6 +347,11 @@ EOT
             :large  => '--startscript [file]',
             :format => String,
             :description => 'Start script to be executed'
+        },
+        {
+            :name   => 'report_ready',
+            :large  => '--report_ready',
+            :description => 'Sends READY=YES to OneGate, useful for OneFlow'
         }
     ]
 
@@ -953,7 +958,7 @@ EOT
     end
 
     def self.create_context(options)
-        context_options = [:ssh, :net_context, :context, :init, :files_ds, :startscript]
+        context_options = [:ssh, :net_context, :context, :init, :files_ds, :startscript, :report_ready]
         if !(options.keys & context_options).empty?
             lines=[]
 
@@ -1003,6 +1008,10 @@ EOT
                 lines<<"START_SCRIPT_BASE64=\"#{script}\""
             end
 
+            if options[:report_ready]
+                lines << "REPORT_READY = \"YES\""
+            end
+
             if !lines.empty?
                 "CONTEXT=[\n" << lines.map{|l| "  " << l }.join(",\n") << "\n]\n"
             else

data/lib/one_helper/oneacct_helper.rb

@@ -157,12 +157,12 @@ class AcctHelper < OpenNebulaHelper::OneHelper
 
         column :NETRX, "Data received from the network", :size=>6 do |d|
             # NET is measured in bytes, unit_to_str expects KBytes
-            OpenNebulaHelper.unit_to_str(d["VM"]["MONITORING/NETRX"].to_i / 1024.0, {})
+            OpenNebulaHelper.unit_to_str(d["VM"]["MONITORING"]["NETRX"].to_i / 1024.0, {})
         end
 
         column :NETTX, "Data sent to the network", :size=>6 do |d|
             # NET is measured in bytes, unit_to_str expects KBytes
-            OpenNebulaHelper.unit_to_str(d["VM"]["MONITORING/NETTX"].to_i / 1024.0, {})
+            OpenNebulaHelper.unit_to_str(d["VM"]["MONITORING"]["NETTX"].to_i / 1024.0, {})
         end
 
         column :DISK, "Total disk size used", :size=>6 do |d|

data/lib/one_helper/oneimage_helper.rb

@@ -102,16 +102,19 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         {
             :name => "disk_type",
             :large => "--disk_type disk_type",
-            :description => "Type of the image (BLOCK, CDROM, RBD or FILE)",
-            :format => String,
-            :proc => lambda do |o, options|
-                type=o.strip.upcase
-                if %w{BLOCK CDROM FILE RBD}.include? type
-                    [0, type]
-                else
-                    [-1, "Disk type must be BLOCK, CDROM, RBD or FILE"]
-                end
-            end
+            :description => "Type of the image \n"<<
+                            " "*31<<"for KVM: BLOCK, CDROM, RBD or FILE \n"<<
+                            " "*31<<"for vCenter: THIN, TICHK, ZEOREDTHICK " <<
+                                     "(for others, check the documentation) ",
+            :format => String
+        },
+        {
+            :name => "adapter_type",
+            :large => "--adapter_type adapter_type",
+            :description => "Controller that will handle this image in " <<
+                            "vCenter (lsiLogic, ide, busLogic). For other "<<
+                            "values check the documentation",
+            :format => String
         },
         {
             :name => "source",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 4.90.0.beta1
+  version: 4.90.10.rc1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,19 +16,18 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.90.0.beta1
+        version: 4.90.10.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.90.0.beta1
+        version: 4.90.10.rc1
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
 - oneuser.backup
-- oneacct
 - oneacl
 - onecluster
 - onedatastore
@@ -42,13 +41,14 @@ executables:
 - oneshowback
 - onetemplate
 - oneuser
-- onevcenter
 - onevdc
 - onevnet
 - onevrouter
 - onezone
 - oneimage
 - onevm
+- oneacct
+- onevcenter
 extensions: []
 extra_rdoc_files: []
 files: