opennebula-cli 6.4.7 → 6.5.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35fcf46056dee5465f882c7856dc094b7c302e1b9fa04fbc972463820b7bcb23
-  data.tar.gz: 3c131a42ff47dece967c6c5828d1079ac4dcb290ff996ff8f8a1efc3456f6a74
+  metadata.gz: fcdc66bd05f8d1764a49ddc05846af9544aec14538d28361836286a637db4762
+  data.tar.gz: c29bd48679f35bd2ad33535cb6c89c6d960eb79b9e16c19d4294c0f1646a8b77
 SHA512:
-  metadata.gz: 124a6e98d92a4ee91f76048a1501e80b930e447a6b01a2b13e2c88de6127f516ece23ed57331105be9068ded0dfec3a3643484cfecae772f816b55eb2e31b79d
-  data.tar.gz: 3376a4735e60b64812eafc6bd6ec9146cc3f8d74cf6ade7cdae25d590d7362509ab791c4436f77fde966d4bfbda456ff8be888b46953ca2178758b419661522e
+  metadata.gz: c9dffa57c55ca6b21db509f772754baea08f83e8313d58c76b2655a1cce55e824ef24245b971a04fa77c304ce649e5da7b9cc80e241b5d3e01a2ba22db2e6698
+  data.tar.gz: 3e77e5c5e2b9622c54c60e7bda07767092ab72d33a7563fb164d6da99f7befd398f19ce28b0c92281bda54a795cad5fb34222842e43c37b2d6f4f298518a8e42

data/bin/oneacct

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -75,7 +75,7 @@ CommandParser::CmdParser.new(ARGV) do
             exit(0)
         end
 
-        filter_flag = options[:userfilter] || VirtualMachinePool::INFO_ALL
+        filter_flag = (options[:userfilter] || VirtualMachinePool::INFO_ALL)
         if options[:start_time]
             start_time = options[:start_time].to_i
         else

data/bin/oneacl

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/bin/onecluster

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/bin/onedatastore

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/bin/oneflow

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -79,7 +79,7 @@ CommandParser::CmdParser.new(ARGV) do
     DELETE = {
         :name => 'delete',
         :large => '--delete',
-        :description => 'Force flow recover delete'
+        :description => 'Force flow necover delete'
     }
 
     APPEND = {
@@ -162,7 +162,6 @@ CommandParser::CmdParser.new(ARGV) do
 
     delete_desc = <<-EOT.unindent
         Delete a given service
-        To force service removal please use 'oneflow recover --delete <service_id>' command
     EOT
 
     command :delete, delete_desc, [:range, :service_id_list] do

data/bin/oneflow-template

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -78,7 +78,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     RECURSIVE = {
         :name  => 'recursive',
-        :short => '-R',
+        :short => '-r',
         :large => '--recursive',
         :description => 'Clone the template recursively (templates and images)'
     }

data/bin/onegroup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/bin/onehook

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/bin/onehost

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/bin/oneimage

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -94,6 +94,18 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'Do not add context when building from Dockerfile'
     }
 
+    NO_IP = {
+        :name => 'no_ip',
+        :large => '--no_ip',
+        :description => 'Do not keep NIC addresses (MAC, IP and IP6)'
+    }
+
+    NO_NIC = {
+        :name => 'no_nic',
+        :large => '--no_nic',
+        :description => 'Do not keep network mappings'
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -251,9 +263,11 @@ CommandParser::CmdParser.new(ARGV) do
         Deletes the given Image
     EOT
 
-    command :delete, delete_desc, [:range, :imageid_list] do
+    command :delete, delete_desc, [:range, :imageid_list],
+            :options => [OpenNebulaHelper::FORCE] do
+        force = (options[:force] == true)
         helper.perform_actions(args[0], options, 'deleting') do |image|
-            image.delete
+            image.delete(force)
         end
     end
 
@@ -410,6 +424,41 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    restore_desc = <<-EOT.unindent
+        Restore a backup image. It will restore the associated VM template to the VM template pool and
+        the disk images to the selected image datastore.
+    EOT
+
+    command :restore,
+            restore_desc,
+            :imageid,
+            :options => [OneDatastoreHelper::DATASTORE, NO_NIC, NO_IP] do
+        helper.perform_action(args[0], options, 'vm backup restored') do |o|
+            if options[:datastore].nil?
+                STDERR.puts 'Datastore to restore the backup is mandatory: '
+                STDERR.puts "\t -d datastore_id | name"
+                exit(-1)
+            end
+
+            restore_opts = ''
+
+            restore_opts << "NO_NIC=\"YES\"\n" if options[:no_nic]
+            restore_opts << "NO_IP=\"YES\"\n" if options[:no_ip]
+
+            rc = o.restore(options[:datastore].to_i, restore_opts)
+
+            if !OpenNebula.is_error?(rc)
+                ids = rc.split(' ')
+
+                puts "VM Template: #{ids[0]}" if ids[0]
+                puts "Images: #{ids[1..-1].join(' ')}" if ids.length > 1
+            else
+                puts rc.message
+                exit(-1)
+            end
+        end
+    end
+
     list_desc = <<-EOT.unindent
         Lists Images in the pool
     EOT

data/bin/oneirb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/bin/onelog

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/bin/onemarket

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/bin/onemarketapp

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/bin/onesecgroup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/bin/oneshowback

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -77,7 +77,7 @@ CommandParser::CmdParser.new(ARGV) do
             exit(0)
         end
 
-        filter_flag = options[:userfilter] || VirtualMachinePool::INFO_ALL
+        filter_flag = (options[:userfilter] || VirtualMachinePool::INFO_ALL)
 
         start_month = -1
         start_year  = -1

data/bin/onetemplate

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/bin/oneuser

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -603,7 +603,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :passwdsearch, passwdsearch_desc, :driver, :password,
             :options => [CLIHelper::CSV_OPT, OpenNebulaHelper::XML] do
-        options[:list] = ['ID', 'NAME', 'AUTH', 'PASSWORD']
+        options[:list] = %w[ID NAME AUTH PASSWORD]
         options[:filter] = ["AUTH=#{args[0]}", "PASSWORD=#{args[1]}"]
 
         helper.list_pool(options)
@@ -620,7 +620,7 @@ CommandParser::CmdParser.new(ARGV) do
         Example, request a valid token for a generic driver (e.g. core auth, LDAP...):
           oneuser token-create my_user --time 3600
 
-        Example, request a group specific token (new resources will be created in that
+        Example, request a group spefici token (new resources will be created in that
         group and only resources that belong to that group will be listed):
           oneuser token-create my_user --group <id|group>
 
@@ -708,7 +708,7 @@ CommandParser::CmdParser.new(ARGV) do
 
         tokens = helper.find_token(user, token_hint, group, false)
 
-        if tokens.empty?
+        if tokens.length.zero?
             exit_with_code 1, 'No valid tokens found.'
         end
 

data/bin/onevcenter

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -261,7 +261,7 @@ CommandParser::CmdParser.new(ARGV) do
         Examples:
            - importing first datastore
 
-             onevcenter import -o templates -h <host_id>
+             onevcenter list -o templates -h <host_id>
 
            - importing 2 concrete templates:
 

data/bin/onevdc

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #