opennebula-cli 6.6.1.1 → 6.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0db0908cd3887174cb69d327e1d6354455a14b85c5847b8606c9813e1dc82ba
-  data.tar.gz: b1dd9384099ea0c90fc89aa2760aadbdc8bdc56d40d9f184783b3465f66d1290
+  metadata.gz: 21c8a6e2683191cfb58031afd725ea75ddad8d6034c2002c93e5a5d9f86c61c2
+  data.tar.gz: 8aa8cfbbac6a3f522c7e04646c63681580608b417ab87b1804dd9b28284c0eca
 SHA512:
-  metadata.gz: e06c4c54efdadb7fa2b180a83414596c90e51fc980f3fd8747cadff96f5deea83e77e59ba314508be9a0fb05814b23d52e8c4e66acee6fa23ced99baf4556f11
-  data.tar.gz: 4dfb6f2ca4ac1db251faf965ce430a0c8c3c082f9e8102b0ce061b161436943ec5956f516e81ddcf8c6d03aea46ee55bde4cbab032926b6ef8b256b3f511c808
+  metadata.gz: 784f2bc0129a173ce3ce6e9699544fc835e4999524907a751d160713306744aee8bb3c73987f6af0665a34882fbb8f9ac5792f08f79e505ef7770ab371df5d63
+  data.tar.gz: ac3df996ca1205fc96fc1e0fc23fa66e91f78d75b2cf2d58fc2d7750ff51742c605b896dcc16c07b8e8bb9f0fa04208d0bfe24cb5072fab360930aa26ad69e6f

data/bin/oneflow-template

@@ -61,6 +61,7 @@ require 'command_parser'
 require 'opennebula/oneflow_client'
 require 'cli_helper'
 require 'one_helper/oneflowtemplate_helper'
+require 'one_helper/onetemplate_helper'
 
 USER_AGENT = 'CLI'
 
@@ -78,7 +79,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     RECURSIVE = {
         :name  => 'recursive',
-        :short => '-r',
+        :short => '-R',
         :large => '--recursive',
         :description => 'Clone the template recursively (templates and images)'
     }
@@ -253,14 +254,18 @@ CommandParser::CmdParser.new(ARGV) do
                     break
                 end
 
+                params['merge_template'] = {}
                 body = JSON.parse(response.body)['DOCUMENT']['TEMPLATE']['BODY']
 
-                params['merge_template'] = helper.custom_attrs(
-                    body['custom_attrs']
-                )
+                # Check global custom attributes
+                custom_attrs = helper.custom_attrs(body['custom_attrs'])
+                params['merge_template'].merge!(custom_attrs) unless custom_attrs.nil?
 
-                params['merge_template'] = {} unless params['merge_template']
+                # Check role level custom attributes
+                custom_role_attrs = helper.custom_role_attrs(body['roles'])
+                params['merge_template'].merge!(custom_role_attrs) unless custom_role_attrs.nil?
 
+                # Check vnets attributes
                 vnets = helper.networks(body['networks'])
                 params['merge_template'].merge!(vnets) unless vnets.nil?
             end

data/bin/onevm

@@ -1594,6 +1594,25 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    backup_cancel_desc = <<-EOT.unindent
+        Cancels an active VM backup operation
+
+        States: RUNNING, POWEROFF
+    EOT
+
+    command :'backup-cancel',
+            backup_cancel_desc,
+            :vmid do
+        helper.perform_action(args[0], options, 'Canceling backup') do |vm|
+            rc = vm.backup_cancel
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts "Error canceling VM backup: #{rc.message}"
+                exit(-1)
+            end
+        end
+    end
+
     ssh_desc = <<-EOT.unindent
         SSH into VM
 

data/lib/one_helper/oneflowtemplate_helper.rb

@@ -193,6 +193,35 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
         ret
     end
 
+    # Get custom role attributes values from user
+    #
+    # @param role [Hash] Service role with custom attributes
+    #
+    # @return [Hash] Role with custom attributes values
+    def custom_role_attrs(roles)
+        return if roles.nil? || roles.empty?
+
+        ret = {}
+        role_with_custom_attrs = false
+
+        roles.each do |role|
+            next unless role.key?('custom_attrs')
+
+            ####################################################################
+            # Display Role Information
+            ####################################################################
+            header = "> Please insert the user inputs for the role \"#{role['name']}\""
+            puts header
+
+            role.merge!(custom_attrs(role['custom_attrs']))
+            role_with_custom_attrs = true
+        end
+
+        ret['roles'] = roles if role_with_custom_attrs
+
+        ret
+    end
+
     def networks(vnets)
         return unless vnets
 

data/lib/one_helper/onetemplate_helper.rb

@@ -53,6 +53,7 @@ EOT
 
     RECURSIVE={
         :name => "recursive",
+        :short => "-R",
         :large => "--recursive",
         :description => "Applies the action to the template plus any "+
         "image defined in DISK"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.6.1.1
+  version: 6.6.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.6.1.1
+        version: 6.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.6.1.1
+        version: 6.6.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement