opennebula-cli 5.10.3 → 5.11.90.pre

data/lib/one_helper/oneuser_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onevcenter_helper.rb

@@ -1,6 +1,6 @@
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -96,6 +96,7 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
     end
 
     def host(arg)
+        return arg
     end
 
     ########################

data/lib/one_helper/onevdc_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onevm_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -345,15 +345,15 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 OneVMHelper.state_to_str(d['STATE'], d['LCM_STATE'])
             end
 
-            column :UCPU, 'CPU percentage used by the VM', :size => 4 do |d|
-                cpu = d['MONITORING']['CPU']
+            column :CPU, 'CPU asigned to the VM', :size => 4 do |d|
+                cpu = d['TEMPLATE']['CPU']
                 cpu = '0' if cpu.nil?
 
                 cpu
             end
 
-            column :UMEM, 'Memory used by the VM', :size => 7 do |d|
-                OpenNebulaHelper.unit_to_str(d['MONITORING']['MEMORY'].to_i,
+            column :MEM, 'Memory asigned to the VM', :size => 7 do |d|
+                OpenNebulaHelper.unit_to_str(d['TEMPLATE']['MEMORY'].to_i,
                                              options)
             end
 
@@ -395,7 +395,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 OneVMHelper.ip_str(d)
             end
 
-            default :ID, :USER, :GROUP, :NAME, :STAT, :UCPU, :UMEM, :HOST,
+            default :ID, :USER, :GROUP, :NAME, :STAT, :CPU, :MEM, :HOST,
                     :TIME
         end
 
@@ -457,6 +457,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
             tmp_str << "\nSCHED_ACTION = "
             tmp_str << "[ID = #{id}, ACTION = #{action}, "
+            tmp_str << "ARGS = \"#{options[:args]}\"," if options[:args]
             tmp_str << "TIME = #{options[:schedule].to_i}"
             tmp_str << str_periodic << ']'
 
@@ -1151,6 +1152,10 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                     d['ACTION'] unless d.nil?
                 end
 
+                column :ARGS, '', :left, :size => 15 do |d|
+                    d['ARGS'] ? d['ARGS'] : '-'
+                end
+
                 column :SCHEDULED, '', :size => 12 do |d|
                     OpenNebulaHelper.time_to_str(d['TIME'], false) \
                         unless d.nil?

data/lib/one_helper/onevmgroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onevnet_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onevntemplate_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onevrouter_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onezone_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -36,6 +36,8 @@ class Replicator
           :service => 'opennebula' },
         { :name    => 'ec2_driver.default',
           :service => 'opennebula' },
+        { :name    => 'monitord.conf',
+          :service => 'opennebula' },
         { :name    => 'econe.conf',
           :service => 'opennebula-econe' },
         { :name    => 'oneflow-server.conf',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.10.3
+  version: 5.11.90.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.10.3
+        version: 5.11.90.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.10.3
+        version: 5.11.90.pre
 description: Commands used to talk to OpenNebula
-email: contact@opennebula.org
+email: contact@opennebula.io
 executables:
 - oneacct
 - oneacl
@@ -85,6 +85,8 @@ files:
 - lib/one_helper/oneacl_helper.rb
 - lib/one_helper/onecluster_helper.rb
 - lib/one_helper/onedatastore_helper.rb
+- lib/one_helper/oneflow_helper.rb
+- lib/one_helper/oneflowtemplate_helper.rb
 - lib/one_helper/onegroup_helper.rb
 - lib/one_helper/onehook_helper.rb
 - lib/one_helper/onehost_helper.rb
@@ -106,7 +108,7 @@ files:
 - lib/one_helper/onezone_helper.rb
 - NOTICE
 - LICENSE
-homepage: http://opennebula.org
+homepage: http://opennebula.io
 licenses:
 - Apache-2.0
 metadata: {}
@@ -121,9 +123,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1