opennebula-cli 6.0.3 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d71d6197859d846259af7cb730330d8d29a03e89
-  data.tar.gz: 515adb9afa80cf52f7ab93ac9a582af9bc38afc8
+SHA256:
+  metadata.gz: c4908cbc17aac8f9c51ea753a53ae639ae001ffafd53e434de2607dbeca48a17
+  data.tar.gz: b8177017450198bf4c1a37a0239568c090c8ed8c1527cd5de04079ceb72a6f6a
 SHA512:
-  metadata.gz: 02cfddcd26f6d496448f69653ad05f463eebf60cb5d40a956319faaed2f9b4829db13e75b9154168e3a0597a3cf2f20739229ce9758b2ce537f535c9f5a5e644
-  data.tar.gz: 8409cabd907844035d833f9d37b37dc08c15bf0afd276a1772c303ffa6d1a6e004985f4eefa5d440590d93f5910f209fee68bef5238aa8e206c6f806d82865e4
+  metadata.gz: e1768f1cfaf3e35b24c0ea83e646d86fe4d02363ca9d9e96e8b9f7e41f8ca4405e81728d1b95284660579a02b01041253f4f1c56a93ef5ebc4a7fb4966730134
+  data.tar.gz: a089348845dc43030ae6e079c8d71d8a0abc1978dd369bddebaf718d42ad7be24e476308d622e47673d906e387a2465055a64d1117ff1cbc48d04abf9e35cb47

data/bin/oneflow

@@ -82,6 +82,14 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'Force flow necover delete'
     }
 
+    APPEND = {
+        :name  => 'append',
+        :large => '--append',
+        :description => 'Append template to the current one'
+    }
+
+    FORMAT = [OpenNebulaHelper::JSON, OpenNebulaHelper::YAML]
+
     # create helper object
     helper = OneFlowHelper.new
 
@@ -122,7 +130,7 @@ CommandParser::CmdParser.new(ARGV) do
         List the available services
     EOT
 
-    command :list, list_desc, :options => OpenNebulaHelper::FORMAT do
+    command :list, list_desc, :options => FORMAT do
         helper.list_service_pool(helper.client(options), options)
     end
 
@@ -146,10 +154,7 @@ CommandParser::CmdParser.new(ARGV) do
         Show detailed information of a given service
     EOT
 
-    command :show,
-            show_desc,
-            :service_id,
-            :options => OpenNebulaHelper::FORMAT do
+    command :show, show_desc, :service_id, :options => FORMAT do
         helper.format_resource(helper.client(options), args[0], options)
     end
 
@@ -365,7 +370,11 @@ CommandParser::CmdParser.new(ARGV) do
         be launched to modify the current content.
     EOT
 
-    command :update, update_desc, :service_id, [:file, nil] do
+    command :update,
+            update_desc,
+            :service_id,
+            [:file, nil],
+            :options => APPEND do
         service_id = args[0]
         client     = helper.client(options)
 
@@ -383,8 +392,10 @@ CommandParser::CmdParser.new(ARGV) do
                 tmp  = Tempfile.new(service_id.to_s)
                 path = tmp.path
 
-                tmp.write(JSON.pretty_generate(template))
-                tmp.flush
+                unless options[:append]
+                    tmp.write(JSON.pretty_generate(template))
+                    tmp.flush
+                end
 
                 if ENV['EDITOR']
                     editor_path = ENV['EDITOR']
@@ -403,7 +414,17 @@ CommandParser::CmdParser.new(ARGV) do
             end
         end
 
-        response = client.put("#{RESOURCE_PATH}/#{service_id}", File.read(path))
+        if options[:append]
+            req             = {}
+            req['append']   = true
+            req['template'] = File.read(path)
+
+            response = client.put("#{RESOURCE_PATH}/#{service_id}",
+                                  req.to_json)
+        else
+            response = client.put("#{RESOURCE_PATH}/#{service_id}",
+                                  File.read(path))
+        end
 
         if CloudClient.is_error?(response)
             [response.code.to_i, response.to_s]

data/bin/oneflow-template

@@ -104,6 +104,8 @@ CommandParser::CmdParser.new(ARGV) do
                         'deleting service template'
     }
 
+    FORMAT = [OpenNebulaHelper::JSON, OpenNebulaHelper::YAML]
+
     usage '`oneflow-template` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
@@ -141,7 +143,7 @@ CommandParser::CmdParser.new(ARGV) do
         List the available Service Templates
     EOT
 
-    command :list, list_desc, :options => OpenNebulaHelper::FORMAT do
+    command :list, list_desc, :options => FORMAT do
         helper.list_service_template_pool(helper.client(options), options)
     end
 
@@ -169,10 +171,7 @@ CommandParser::CmdParser.new(ARGV) do
         Show detailed information of a given Service Template
     EOT
 
-    command :show,
-            show_desc,
-            :templateid,
-            :options => OpenNebulaHelper::FORMAT do
+    command :show, show_desc, :templateid, :options => FORMAT do
         helper.format_resource(helper.client(options), args[0], options)
     end
 

data/bin/onehook

@@ -256,8 +256,8 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     lock_desc = <<-EOT.unindent
-        Locks a Hook with differents levels for lock any actions with this Hook,
-        show and monitoring never will be locked.
+        Locks a Hook to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.

data/bin/oneimage

@@ -159,9 +159,9 @@ CommandParser::CmdParser.new(ARGV) do
           - new persistent image, OS type and qcow2 format:
 
             oneimage create -d 1 --name ubuntu --path /tmp/ubuntu.qcow2 \\
-                            --prefix sd --type OS --driver qcow2 \\
-                            --description "A OS plain installation \\
-                            --persistent"
+                            --prefix sd --type OS --format qcow2 \\
+                            --description "A OS plain installation" \\
+                            --persistent
 
           - a datablock image of 400MB:
 
@@ -436,8 +436,8 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     lock_desc = <<-EOT.unindent
-        Locks a VM with differents levels for lock any actions with this VM, show and
-        monitoring never will be locked.
+        Locks an Image to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -464,7 +464,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks an Image.
         Valid states are: All.
     EOT
 

data/bin/onemarketapp

@@ -440,8 +440,8 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     lock_desc = <<-EOT.unindent
-        Locks a VM with differents levels for lock any actions with this VM,
-        show and monitoring never will be locked.
+        Locks a marketplace app to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -470,7 +470,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks a marketplace app.
         Valid states are: All.
     EOT
 

data/bin/onetemplate

@@ -406,8 +406,8 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     lock_desc = <<-EOT.unindent
-        Locks a VM with differents levels for lock any actions with this VM,
-        show and monitoring never will be locked.
+        Locks a Template to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -434,7 +434,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks a Template.
         Valid states are: All.
     EOT
 

data/bin/oneuser

@@ -573,7 +573,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, [:userid, nil],
-            :options => OpenNebulaHelper::FORMAT do
+            :options => [OpenNebulaHelper::FORMAT, OpenNebulaHelper::DECRYPT] do
         user = args[0] || OpenNebula::User::SELF
         helper.show_resource(user, options)
     end

data/bin/onevcenter

@@ -165,7 +165,8 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :list,
             list_desc,
-            :options => [OBJECT, HOST, DATASTORE, VCENTER, USER, PASS] do
+            :options => [OBJECT, HOST, DATASTORE, VCENTER, USER, PASS,
+                         CLIHelper::CSV_OPT] do
         begin
             args = helper.parse_opts(options)
             args[:filter] = true
@@ -178,7 +179,8 @@ CommandParser::CmdParser.new(ARGV) do
 
             helper.list_object(options, list)
         rescue StandardError => e
-            puts e.message
+            STDERR.puts e.message
+            exit 1
         end
 
         exit 0
@@ -209,7 +211,8 @@ CommandParser::CmdParser.new(ARGV) do
 
             helper.list_object(options, list)
         rescue StandardError => e
-            puts e.message
+            STDERR.puts e.message
+            exit 1
         end
 
         exit 0
@@ -256,7 +259,8 @@ CommandParser::CmdParser.new(ARGV) do
 
             importer.stdout
         rescue StandardError => e
-            puts e.message
+            STDERR.puts e.message
+            exit 1
         end
 
         exit 0
@@ -283,7 +287,8 @@ CommandParser::CmdParser.new(ARGV) do
 
             importer.stdout
         rescue StandardError => e
-            puts e.message
+            STDERR.puts e.message
+            exit 1
         end
 
         exit 0
@@ -305,7 +310,11 @@ CommandParser::CmdParser.new(ARGV) do
             :options => [VCENTER, USER, PASS, USE_DEFAULTS, PORT] do
         con_ops = helper.connection_options('Hosts', options)
 
-        VCenterDriver::VcImporter.import_clusters(con_ops, options)
+        begin
+            VCenterDriver::VcImporter.import_clusters(con_ops, options)
+        rescue StandardError
+            exit 1
+        end
 
         exit 0
     end

data/bin/onevm

@@ -1305,7 +1305,8 @@ CommandParser::CmdParser.new(ARGV) do
         CONTEXT (any value, **variable substitution will be made**)
     EOT
 
-    command :updateconf, updateconf_desc, :vmid, [:file, nil] do
+    command :updateconf, updateconf_desc, :vmid, [:file, nil],
+            :options => OpenNebulaHelper::APPEND do
         template = ''
 
         begin
@@ -1332,14 +1333,17 @@ CommandParser::CmdParser.new(ARGV) do
                 template = OpenNebulaHelper.editor_input(template)
             end
 
-            vm.updateconf(template)
+            vm.updateconf(template, options[:append])
         end
     end
 
     lock_desc = <<-EOT.unindent
-        Locks a VM with differents levels for lock any actions with this VM, show and
-        monitoring never will be locked.
+        Locks a VM to prevent certain actions defined by different levels.
+        The show and monitoring action will never be locked.
         Valid states are: All.
+        [Use]: locks Admin, Manage and Use actions.
+        [Manage]: locks Manage and Use actions.
+        [Admin]: locks only Admin actions.
     EOT
 
     command :lock, lock_desc, [:range, :vmid_list],
@@ -1361,7 +1365,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks a Virtual Machine.
         Valid states are: All.
     EOT
 
@@ -1411,22 +1415,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :'delete-chart', delete_chart_desc, :vmid, :sched_id do
         helper.perform_action(args[0], {}, 'Charter deleted') do |vm|
-            rc = vm.info
-
-            if OpenNebula.is_error?(rc)
-                STDERR.puts "Error #{rc.message}"
-                exit(-1)
-            end
-
-            xpath = "USER_TEMPLATE/SCHED_ACTION[ID=#{args[1]}]"
-
-            unless vm.retrieve_elements(xpath)
-                STDERR.puts "Sched action #{args[1]} not found"
-                exit(-1)
-            end
-
-            vm.delete_element(xpath)
-            rc = vm.update(vm.user_template_str)
+            rc = vm.sched_action_delete(args[1])
 
             if OpenNebula.is_error?(rc)
                 STDERR.puts "Error deleting: #{rc.message}"
@@ -1571,54 +1560,7 @@ CommandParser::CmdParser.new(ARGV) do
             :vmid,
             [:login, nil],
             :options => [NIC_ID, CMD, SSH_OPTS] do
-        helper.perform_action(args[0], options, 'SSH') do |vm|
-            rc = vm.info
-
-            if OpenNebula.is_error?(rc)
-                STDERR.puts rc.message
-                exit(-1)
-            end
-
-            # Get user to login
-            args[1].nil? ? login = 'root' : login = args[1]
-
-            # Get CMD to run
-            options[:cmd].nil? ? cmd = '' : cmd = options[:cmd]
-
-            # Get NIC to connect
-            if options[:nic_id]
-                nic = vm.retrieve_xmlelements(
-                    "//TEMPLATE/NIC[NIC_ID=\"#{options[:nic_id]}\"]"
-                )[0]
-            else
-                nic = vm.retrieve_xmlelements('//TEMPLATE/NIC[SSH="YES"]')[0]
-            end
-
-            nic = vm.retrieve_xmlelements('//TEMPLATE/NIC[1]')[0] if nic.nil?
-
-            if nic.nil?
-                STDERR.puts 'No NIC found'
-                exit(-1)
-            end
-
-            # If there is node port
-            if nic['EXTERNAL_PORT_RANGE']
-                ip   = vm.to_hash['VM']['HISTORY_RECORDS']['HISTORY']
-                ip   = [ip].flatten[-1]['HOSTNAME']
-                port = Integer(nic['EXTERNAL_PORT_RANGE'].split(':')[0]) + 21
-            else
-                ip   = nic['IP']
-                port = 22
-            end
-
-            options[:ssh_opts].nil? ? opts = '' : opts = options[:ssh_opts]
-
-            system("ssh #{opts} #{login}@#{ip} -p #{port} #{cmd}")
-        end
-
-        # rubocop:disable Style/SpecialGlobalVars
-        $?.exitstatus
-        # rubocop:enable Style/SpecialGlobalVars
+        helper.ssh(args, options)
     end
 
     port_desc = <<-EOT.unindent

data/bin/onevmgroup

@@ -233,8 +233,8 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     lock_desc = <<-EOT.unindent
-        Locks a VM with differents levels for lock any actions with this VM, show and
-        monitoring never will be locked.
+        Locks a VM Group to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -261,7 +261,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks a VM Group.
         Valid states are: All.
     EOT
 

data/bin/onevnet

@@ -381,8 +381,8 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     lock_desc = <<-EOT.unindent
-        Locks a VM with differents levels for lock any actions with this VM, show and
-        monitoring never will be locked.
+        Locks a Virtual Network to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -409,7 +409,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks a Virtual Network.
         Valid states are: All.
     EOT
 

data/bin/onevntemplate

@@ -341,8 +341,8 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     lock_desc = <<-EOT.unindent
-        Locks a VN template with differents levels for lock any actions with this VN template,
-        show and monitoring never will be locked.
+        Locks a VN Template to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -369,7 +369,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VN template for unlock any actions with this VN template.
+        Unlocks a VN Template.
         Valid states are: All.
     EOT
 

data/bin/onevrouter

@@ -366,8 +366,8 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     lock_desc = <<-EOT.unindent
-        Locks a VM with differents levels for lock any actions with this VM, show and
-        monitoring never will be locked.
+        Locks a Virtual Router to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -394,7 +394,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks a Virtual Router.
         valid states are: All.
     EOT
 

data/bin/onezone

@@ -269,4 +269,24 @@ CommandParser::CmdParser.new(ARGV) do
 
         0
     end
+
+    enable_desc = <<-EOT.unindent
+        Enable zone
+    EOT
+
+    command :enable, enable_desc, [:range, :zoneid_list] do
+        helper.perform_actions(args[0], options, 'enable zone') do |o|
+            o.enable
+        end
+    end
+
+    disable_desc = <<-EOT.unindent
+        Disable zone, disabled zones can execute only readonly commands
+    EOT
+
+    command :disable, disable_desc, [:range, :zoneid_list] do
+        helper.perform_actions(args[0], options, 'disable zone') do |o|
+            o.disable
+        end
+    end
 end

data/lib/one_helper/oneacct_helper.rb

@@ -216,11 +216,15 @@ class AcctHelper < OpenNebulaHelper::OneHelper
             d["HOURS"]
         end
 
+        column :RUNNING_HOURS, "Running hours", :size=>7 do |d|
+            d["RHOURS"] || '-'
+        end
+
         column :COST, "Cost", :size=>15 do |d|
             d["TOTAL_COST"]
         end
 
-        default :USER_NAME, :GROUP_NAME, :VM_ID, :VM_NAME, :MONTH, :YEAR, :HOURS, :COST
+        default :USER_NAME, :GROUP_NAME, :VM_ID, :VM_NAME, :MONTH, :YEAR, :HOURS, :RUNNING_HOURS, :COST
     end
 
     def self.print_start_end_time_header(start_time, end_time)

data/lib/one_helper/onevcenter_helper.rb

@@ -188,14 +188,14 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
 
     # This method will print a list for a vcenter_resource.
     #
-    def list_object(_options, list)
+    def list_object(options, list)
         vcenter_host = list.keys[0]
         list = cli_format(list.values.first)
         table = format_list
 
         show_header(vcenter_host)
 
-        table.show(list)
+        table.show(list, options)
     end
 
     # handles :cli section of TABLE
@@ -493,10 +493,11 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
 
         keys_to_remove = []
         vm['config.extraConfig'].each do |extraconfig|
-            if extraconfig.key.include?('opennebula.disk') ||
-               extraconfig.key.include?('opennebula.vm')
-                keys_to_remove << extraconfig.key
-            end
+            next unless extraconfig.key.include?('opennebula.disk') ||
+               extraconfig.key.include?('opennebula.vm') ||
+               extraconfig.key.downcase.include?('remotedisplay')
+
+            keys_to_remove << extraconfig.key
         end
 
         [vm, keys_to_remove]