opennebula-cli 6.6.1 → 6.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37f8dd6d06bf545de5c8bcf9d9e8197856b452034d22554ed16e3229ecefbec2
-  data.tar.gz: 2ad8583c107fc4ee73cab873c87f1a8ff6e8973f6bf1b230fda8ac09890f0f1b
+  metadata.gz: 7e74dc25cf00cc6c901701dcfef74bb0d5f34145ca4ce12d3a2aae23f4f0ce83
+  data.tar.gz: fabdc4659737fb9adc7219d04b0057034ad04503f1c28e68912c748f02405952
 SHA512:
-  metadata.gz: e1faa197784299af5b92897d19ea3defef548567c0106bec432cd37e7cd8487be6c1d00efcc886283a3387ffc9d77ad528f62e09ea63ba99a8cc2a9b14f30f6f
-  data.tar.gz: 6c34366bfa1e4917ad1f930915bc229b1fae6af303ad7a1c050977dadac9b991cc0b2f8016ec67c23fd7122e7bf8cd471aa17a00b1e205332a81bc2b39d343a7
+  metadata.gz: a2cd0831f008fb2b52ea545c2d1615a8cc0e31e376199e6b52dab49553b1677e6628dbafd0fde22544562d4c8bea00572ce1b20e353dc45e096e5f721d5a35c9
+  data.tar.gz: 10d16e841304506cb3978fd67d8349e7f7684bbe70fc2f7351a2fcc1129f41af9a626a8580099f24415d879d280b1e085ce7b29ff523e35b13e6c04d66e0a71d

data/bin/oneacl

@@ -113,7 +113,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists the ACL rule set
+        Lists the ACL rule set. #{OneAclHelper.list_layout_help}
     EOT
 
     command :list, list_desc, :options => [CLIHelper::OPTIONS,

data/bin/onecluster

@@ -121,7 +121,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Clusters in the pool
+        Lists Clusters in the pool. #{OneClusterHelper.list_layout_help}
     EOT
 
     command :list, list_desc, :options => list_options do

data/bin/onedatastore

@@ -163,7 +163,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Datastores in the pool
+        Lists Datastores in the pool. #{OneDatastoreHelper.list_layout_help}
     EOT
 
     command :list, list_desc, :options => list_options do

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/onegroup

@@ -168,7 +168,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Groups in the pool
+        Lists Groups in the pool. #{OneGroupHelper.list_layout_help}
     EOT
 
     command :list, list_desc, :options => list_options do

data/bin/onehook

@@ -229,7 +229,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Hooks in the pool
+        Lists Hooks in the pool. #{OneHookHelper.list_layout_help}
     EOT
 
     command :list, list_desc, [:filterflag, nil], :options => list_options do

data/bin/onehost

@@ -297,7 +297,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Hosts in the pool
+        Lists Hosts in the pool. #{OneHostHelper.list_layout_help}
     EOT
 
     command :list, list_desc,

data/bin/oneimage

@@ -478,7 +478,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Images in the pool
+        Lists Images in the pool. #{OneImageHelper.list_layout_help}
     EOT
 
     command :list, list_desc, [:filterflag, nil], :options => list_options do

data/bin/onemarket

@@ -156,7 +156,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Marketplaces
+        Lists Marketplaces. #{OneMarketPlaceHelper.list_layout_help}
     EOT
 
     command :list, list_desc, :options => list_options do

data/bin/onemarketapp

@@ -403,7 +403,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists marketplace apps
+        Lists marketplace apps. #{OneMarketPlaceAppHelper.list_layout_help}
     EOT
 
     command :list, list_desc, [:filterflag, nil], :options => list_options do

data/bin/onesecgroup

@@ -224,7 +224,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Security Group in the pool
+        Lists Security Group in the pool. #{OneSecurityGroupHelper.list_layout_help}
     EOT
 
     command :list, list_desc, [:filterflag, nil], :options => list_options do

data/bin/onetemplate

@@ -404,7 +404,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Templates in the pool
+        Lists Templates in the pool. #{OneTemplateHelper.list_layout_help}
     EOT
 
     rename_desc = <<-EOT.unindent

data/bin/oneuser

@@ -562,7 +562,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Users in the pool
+        Lists Users in the pool. #{OneUserHelper.list_layout_help}
     EOT
 
     command :list, list_desc, :options => list_options do

data/bin/onevdc

@@ -300,7 +300,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists VDCs in the pool
+        Lists VDCs in the pool. #{OneVdcHelper.list_layout_help}
     EOT
 
     command :list, list_desc, :options => list_options do

data/bin/onevm

@@ -1278,7 +1278,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists VMs in the pool
+        Lists VMs in the pool. #{OneVMHelper.list_layout_help}
     EOT
 
     command :list, list_desc, [:filterflag, nil],
@@ -1485,11 +1485,11 @@ CommandParser::CmdParser.new(ARGV) do
     create_chart_desc = <<-EOT.unindent
         Adds a charter to the VM, these are some consecutive scheduled actions
 
-        You can configure the actions in /etc/one/cli/onevm.yaml
+        You can configure the actions in #{OneVMHelper.conf_file}
     EOT
 
     command :'create-chart', create_chart_desc, :vmid do
-        charters = helper.get_charters
+        charters = helper.charters
 
         if charters.nil?
             STDERR.puts 'No charters found on configuration file'
@@ -1512,10 +1512,7 @@ CommandParser::CmdParser.new(ARGV) do
                                              action.to_s,
                                              time[:warning][:time] + acc_w)
 
-                if OpenNebula.is_error?(rc)
-                    STDERR.puts rc.message
-                    exit(-1)
-                end
+                exit(-1) if rc < 0
 
                 acc_t += time[:time].to_i
                 acc_w += time[:warning][:time].to_i
@@ -1578,7 +1575,7 @@ CommandParser::CmdParser.new(ARGV) do
         reset = options[:reset] == true
 
         if !options[:schedule].nil?
-            options[:args] = options[:datastore]
+            options[:args] = "#{options[:datastore]},#{reset ? 1 : 0}"
 
             helper.schedule_actions([args[0]], options, @comm_name)
         else
@@ -1594,6 +1591,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/bin/onevmgroup

@@ -151,7 +151,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists VM Group in the pool
+        Lists VM Group in the pool. #{OneVMGroupHelper.list_layout_help}
     EOT
 
     command :list, list_desc, [:filterflag, nil], :options => list_options do

data/bin/onevnet

@@ -347,7 +347,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Virtual Networks in the pool
+        Lists Virtual Networks in the pool. #{OneVNetHelper.list_layout_help}
     EOT
 
     command :list, list_desc, [:filterflag, nil],

data/bin/onevntemplate

@@ -340,7 +340,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists VN Templates in the pool
+        Lists VN Templates in the pool. #{OneVNTemplateHelper.list_layout_help}
     EOT
 
     rename_desc = <<-EOT.unindent

data/bin/onevrouter

@@ -341,7 +341,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists the Virtual Routers in the pool
+        Lists the Virtual Routers in the pool. #{OneVirtualRouterHelper.list_layout_help}
     EOT
 
     command :list, list_desc, [:filterflag, nil], :options => list_options do

data/bin/onezone

@@ -211,7 +211,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     list_desc = <<-EOT.unindent
-        Lists Zones in the pool
+        Lists Zones in the pool. #{OneZoneHelper.list_layout_help}
     EOT
 
     command :list, list_desc, :options => list_options do

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"