opennebula-cli 5.5.80.pre → 5.5.90.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc41f8f8df8ba4974563f1d788b8fa0e69ce4617
-  data.tar.gz: 31e9809c019b480988762595668062132560b0cc
+  metadata.gz: 8fd311db0f9451a7e5b7c8c73bb43875710a4e6b
+  data.tar.gz: 7ddcba5be8c6594f2fbd501f70840ef662d6a27c
 SHA512:
-  metadata.gz: 53b2984f595372db08abf082ebd17108e6a276fcf9471ed06be843982714f0b8b30acf9550e0ff7e451e80072ee31013f9c893f80b78e9e7c5692166b9e2f665
-  data.tar.gz: 4162550f47afd3a4995577a34f6a6d0ae4d3a5b4bb7852a842e5a29e54cb50bf45f2d720df04f95e185ff1464b00ff19ef73008e4090bf9c73a98b80a7138271
+  metadata.gz: 6269451844e1879df05cb5d8615195b450af36e6952e6d6e513907c2dfc2350c64f5fd17d77fefad2e7c1be2e6a229d4b09b73e297e8dbfd3f983e6ed950d590
+  data.tar.gz: 7118136d64beda6dffecc752abd5ffc85c9bf587ab4d7700c0c5d823f1a7905146e9797e1919dcfb8ca7392bffbab8197f83f6570cc709b585d18b2db021f543

data/bin/onehost

@@ -244,8 +244,17 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :flush, flush_desc, [:range,:hostid_list] do
+        begin
+            if !ONE_LOCATION
+                action = YAML.load_file("/etc/one/cli/onehost.yaml")[:default_actions][0][:flush]
+            else
+                action = YAML.load_file("#{ONE_LOCATION}/etc/cli/onehost.yaml")[:default_actions][0][:flush]
+            end
+        rescue Exception => e
+            STDERR.puts e
+        end
         helper.perform_actions(args[0],options,"flush") do |host|
-            host.flush
+            host.flush action
         end
     end
 

data/bin/oneimage

@@ -75,7 +75,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     list_options << OpenNebulaHelper::NUMERIC
     list_options << OpenNebulaHelper::DESCRIBE
 
-    CREATE_OPTIONS = [OneDatastoreHelper::DATASTORE]
+    CREATE_OPTIONS = [OneDatastoreHelper::DATASTORE, OneImageHelper::IMAGE]
 
     ########################################################################
     # Formatters for arguments
@@ -147,6 +147,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             exit -1
         end
 
+        check_capacity = options[:no_check_capacity].nil? ? false : true;
+
         if args[0] && OpenNebulaHelper.create_template_options_used?(options)
             STDERR.puts "You can not use both template file and template"<<
                 " creation options."
@@ -173,7 +175,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                     exit 0
                 end
 
-                image.allocate(template, options[:datastore])
+                image.allocate(template, options[:datastore], check_capacity)
             rescue => e
                 STDERR.puts e.messsage
                 exit -1

data/bin/onezone

@@ -128,6 +128,18 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
 
     end
+
+    resetserver_desc = <<-EOT.unindent
+        Reset follower log index. This should be trigger when a follower DB has
+        been reset.
+    EOT
+
+    command :"server-reset", resetserver_desc, :zoneid, :serverid do
+        helper.perform_action(args[0], options, "server reset") do |o|
+            o.reset_server(args[1].to_i)
+        end
+    end
+
     update_desc = <<-EOT.unindent
         Update the template contents. If a path is not provided the editor will
         be launched to modify the current content.

data/lib/one_helper/onehost_helper.rb

@@ -105,7 +105,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                 OpenNebulaHelper.cluster_str(d["CLUSTER"])
             end
 
-            column :RVM, "Number of Virtual Machines running", :size=>3 do |d|
+            column :TVM, "Total Virtual Machines allocated to the Host", :size=>3 do |d|
                 d["HOST_SHARE"]["RUNNING_VMS"] || 0
             end
 
@@ -210,7 +210,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                 OneHostHelper.state_to_str(d["STATE"])
             end
 
-            default :ID, :NAME, :CLUSTER, :RVM, :ALLOCATED_CPU, :ALLOCATED_MEM, :STAT
+            default :ID, :NAME, :CLUSTER, :TVM, :ALLOCATED_CPU, :ALLOCATED_MEM, :STAT
         end
 
         table

data/lib/one_helper/oneimage_helper.rb

@@ -160,6 +160,14 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         OpenNebulaHelper::DRY
     ]
 
+    IMAGE = {
+        :name => "no_check_capacity",
+        :large => "--no_check_capacity",
+        :description =>
+            "Check Datastore capacity. By Default YES",
+        :format => String
+    }
+
     def self.rname
         "IMAGE"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.5.80.pre
+  version: 5.5.90.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-03 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.5.80.pre
+        version: 5.5.90.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.5.80.pre
+        version: 5.5.90.pre
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables: