opennebula-cli 7.2.0 → 7.3.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb762770e0bd2a420c29addeff20bbdfe1a4f06d4fe9b985020d173db5453455
-  data.tar.gz: 1b18551e801f0236f5ce82c86461905bc94a357ea71d60ed9ad9b0c686b31429
+  metadata.gz: ddabe36ca91b760ad2cc9c641d585f9fc9591567267620b59db910f0a865e2ce
+  data.tar.gz: 212ffde1d9910ce5daf0f60884f4d8e9721dc57d2368fb705dd51534d6493b0b
 SHA512:
-  metadata.gz: d237cdc388909240306d142df874c26d9762ed61b97a31770eb94658eb5539c14332da9a95a396972753790ea57cdfd0e9023fd6abdf9823e327d46f73fb45be
-  data.tar.gz: c955a8e3abf7e147fc486828c56d9baffaab6fdb44f6117736fe9a4f4cbd0bb7718087eefe02c649578fe31c5c85031fcb1e9856d1bbe07541ba56dc7b5faf7a
+  metadata.gz: cb603d35ae289e02fc13bf767ce336d40a82252b896963c37f90669d2b95392e4e7b4feff3d23fd0a3ae6ba46ab4302f0d26149eff4d4c4df85f0295eba4d29f
+  data.tar.gz: ae5a2a2ca0d6eb53b69b2619dd2b0c01706e873d38bdaee7e24d346168e637912616bbfd64cd92ecf46712bf0e5d3bf7e155d89f64c345b1a20ee5fba9171c6c

data/bin/oneflow

@@ -35,6 +35,7 @@ $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
 
 require 'json'
 require 'tempfile'
+require 'uri'
 
 require 'command_parser'
 require 'opennebula/oneflow_client'
@@ -60,6 +61,10 @@ def check_document_type(response)
     end
 end
 
+def path_escape(path_segment)
+    URI::DEFAULT_PARSER.escape(path_segment, /[^A-Za-z0-9\-._~]/)
+end
+
 CommandParser::CmdParser.new(ARGV) do
     usage '`oneflow` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
@@ -112,6 +117,14 @@ CommandParser::CmdParser.new(ARGV) do
         Service.list_to_id(arg, 'SERVICE')
     end
 
+    set :format, :sched_id, 'Scheduled action ID' do |arg|
+        if arg.match?(/\A\d+\z/)
+            [0, arg]
+        else
+            [-1, 'Scheduled action ID must be an integer number']
+        end
+    end
+
     set :format,
         :vm_action,
         'Actions supported: #{Role::SCHEDULE_ACTIONS.join(', ')}' do |arg|
@@ -338,8 +351,9 @@ CommandParser::CmdParser.new(ARGV) do
 
             json   = Service.build_json_action(args[2], params)
             client = helper.client(options)
+            role   = path_escape(args[1])
 
-            client.post("#{RESOURCE_PATH}/#{service_id}/role/#{args[1]}/action",
+            client.post("#{RESOURCE_PATH}/#{service_id}/role/#{role}/action",
                         json)
         end
     end
@@ -371,6 +385,43 @@ CommandParser::CmdParser.new(ARGV) do
 
     ###
 
+    sched_delete_desc = <<-EOT.unindent
+        Delete a scheduled action from all the Virtual Machines of a given role.
+    EOT
+
+    command :'sched-delete',
+            sched_delete_desc,
+            :service_id,
+            :role_name,
+            :sched_id do
+        Service.perform_action(args[0]) do |service_id|
+            role = path_escape(args[1])
+
+            helper.client(options).delete(
+                "#{RESOURCE_PATH}/#{service_id}/role/#{role}/sched_action/#{args[2]}"
+            )
+        end
+    end
+
+    ###
+
+    sched_delete_desc = <<-EOT.unindent
+        Delete a scheduled action from all the Virtual Machines of a given service.
+    EOT
+
+    command [:service, :'sched-delete'],
+            sched_delete_desc,
+            :service_id,
+            :sched_id do
+        Service.perform_action(args[0]) do |service_id|
+            helper.client(options).delete(
+                "#{RESOURCE_PATH}/#{service_id}/sched_action/#{args[1]}"
+            )
+        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/bin/onegroup

@@ -260,4 +260,37 @@ CommandParser::CmdParser.new(ARGV) do
 
         exit 0
     end
+
+    vlan_desc = <<-EOT.unindent
+        Set the VLAN rules for the group. If a path is not provided the
+        editor will be launched to modify the current rules.
+    EOT
+
+    command :vlan, vlan_desc, :groupid, [:file, nil] do
+        helper.perform_action(args[0], options, 'modified') do |group|
+            rc = group.info
+
+            if OpenNebula.is_error?(rc)
+                puts rc.message
+                exit(-1)
+            end
+
+            if args[1]
+                str = File.read(args[1])
+            else
+                group.delete_element('VLAN_RULES/ID')
+
+                current_rules = group.template_like_str('VLAN_RULES')
+
+                str = OpenNebulaHelper.editor_input(current_rules)
+            end
+
+            rc = group.set_vlan_rules(str)
+
+            if OpenNebula.is_error?(rc)
+                puts rc.message
+                exit(-1)
+            end
+        end
+    end
 end

data/bin/oneimage

@@ -255,7 +255,7 @@ CommandParser::CmdParser.new(ARGV) do
             if !OpenNebula.is_error?(res)
                 puts "ID: #{res}"
             else
-                puts res.message
+                STDERR.puts res.message
                 exit(-1)
             end
         end
@@ -543,8 +543,13 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :orphans, show_desc do
-        puts helper.check_orphans
+        orphans = helper.check_orphans
+        if OpenNebula.is_error?(orphans)
+            STDERR.puts orphans.message
+            return -1
+        end
 
+        puts orphans
         return 0
     end
 end

data/bin/onesecgroup

@@ -122,7 +122,8 @@ CommandParser::CmdParser.new(ARGV) do
             if !OpenNebula.is_error?(res)
                 puts "ID: #{res}"
             else
-                puts res.message
+                STDERR.puts res.message
+                exit(-1)
             end
         end
     end

data/bin/onevm

@@ -345,6 +345,10 @@ CommandParser::CmdParser.new(ARGV) do
         format_int(arg)
     end
 
+    set :format, :vmgroupid, OpenNebulaHelper.rname_to_id_desc('VMGROUP') do |arg|
+        OpenNebulaHelper.rname_to_id(arg, 'VMGROUP')
+    end
+
     ########################################################################
     # Commands
     ########################################################################
@@ -1410,7 +1414,6 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :backupmode, backupmode_set_desc, :vmid, :mode do
-        vm_ref = args[0]
         backup_mode = args[1]
 
         if !helper.backup_mode_valid?(backup_mode)
@@ -1421,8 +1424,9 @@ CommandParser::CmdParser.new(ARGV) do
             exit(-1)
         end
 
-        # TODO: Ensure other BACKUP_CONFIG is not overwritten
-        helper.set_backup_mode(vm_ref, backup_mode)
+        helper.perform_action(args[0], options, 'Updating backup mode') do |vm|
+            vm.updateconf("BACKUP_CONFIG = [\"MODE\"=\"#{backup_mode}\"]", true)
+        end
     end
 
     updateconf_desc = <<-EOT.unindent
@@ -1437,13 +1441,13 @@ CommandParser::CmdParser.new(ARGV) do
         The full list of configuration attributes are:
 
         OS        = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT", "KERNEL_CMD", "ROOT", "SD_DISK_BUS", "UUID", "FIRMWARE", "FIRMWARE_FORMAT"]
-        FEATURES  = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT", "VIRTIO_SCSI_QUEUES", "VIRTIO_BLK_QUEUES", "IOTHREADS"]
+        FEATURES  = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT", "VIRTIO_SCSI_QUEUES", "VIRTIO_BLK_QUEUES", "IOTHREADS", "MIGRATE_AUTO_CONVERGE", "MIGRATE_COMPRESSED"]
         INPUT     = ["TYPE", "BUS"]
         GRAPHICS  = ["TYPE", "LISTEN", "PASSWD", "KEYMAP", "COMMAND"]
         VIDEO     = ["TYPE", "IOMMU", "ATS", "VRAM", "RESOLUTION"]
         RAW       = ["DATA", "DATA_VMX", "TYPE", "VALIDATE"]
         CPU_MODEL = ["MODEL", "FEATURES"]
-        BACKUP_CONFIG = ["FS_FREEZE", "KEEP_LAST", "BACKUP_VOLATILE", "MODE", "INCREMENT_MODE"]
+        BACKUP_CONFIG = ["FS_FREEZE", "KEEP_LAST", "BACKUP_VOLATILE", "MODE", "INCREMENT_MODE", "INTERACTIVE"]
         CONTEXT (any value, ETH* if CONTEXT_ALLOW_ETH_UPDATES set in oned.conf, **variable substitution will be made**)
     EOT
 
@@ -1902,8 +1906,23 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    # Deprecated commands, remove these commands in release 8.x
+    vmgroup_add_desc = <<-EOT.unindent
+        Adds the VM to a VM group and role.
+    EOT
 
-    deprecated_command(:'delete-chart', 'sched-delete')
-    deprecated_command(:'update-chart', 'sched-update')
+    command :"vmgroup-add", vmgroup_add_desc, :vmid, :vmgroupid, :role do
+        helper.perform_action(args[0], options, 'VM added to group') do |vm|
+            vm.vmgroup_add(args[1].to_i, args[2])
+        end
+    end
+
+    vmgroup_del_desc = <<-EOT.unindent
+        Removes the VM from its VM group.
+    EOT
+
+    command :"vmgroup-del", vmgroup_del_desc, :vmid do
+        helper.perform_action(args[0], options, 'VM removed from group') do |vm|
+            vm.vmgroup_del
+        end
+    end
 end

data/bin/onevnet

@@ -197,16 +197,6 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    addleases_desc = <<-EOT.unindent
-        (DEPRECATED, use addar) Adds a lease to the Virtual Network
-    EOT
-
-    command :addleases, addleases_desc, :vnetid, :ip, [:mac, nil] do
-        helper.perform_action(args[0], options, 'lease added') do |vn|
-            vn.addleases(args[1], args[2])
-        end
-    end
-
     rmar_desc = <<-EOT.unindent
         Removes an address range from the Virtual Network
     EOT
@@ -217,16 +207,6 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    rmleases_desc = <<-EOT.unindent
-        (DEPRECATED, use rmar) Removes a lease from the Virtual Network
-    EOT
-
-    command :rmleases, rmleases_desc, :vnetid, :ip do
-        helper.perform_action(args[0], options, 'lease removed') do |vn|
-            vn.rmleases(args[1])
-        end
-    end
-
     free_desc = <<-EOT.unindent
         Frees a reserved address range from the Virtual Network
     EOT
@@ -445,8 +425,13 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :orphans, show_desc do
-        puts helper.check_orphans
+        orphans = helper.check_orphans
+        if OpenNebula.is_error?(orphans)
+            STDERR.puts orphans.message
+            return -1
+        end
 
+        puts orphans
         return 0
     end
 

data/bin/onevntemplate

@@ -252,10 +252,10 @@ CommandParser::CmdParser.new(ARGV) do
                     end
 
                     extra_template = res.last
+                end
 
-                    if OneVNetHelper.add_ar_options_used?(options)
-                        extra_template << OpenNebulaHelper.create_ar(options)
-                    end
+                if OneVNetHelper.add_ar_options_used?(options)
+                    extra_template << OpenNebulaHelper.create_ar(options)
                 end
 
                 if c_i