opennebula-cli 6.0.2 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38415d05a5a46b897679a59f395d635b33093e59
-  data.tar.gz: 84e514c15e324cab67b86348274251d747eec436
+  metadata.gz: b9047abc8d9178fcb286d57d5b78011953ac28b9
+  data.tar.gz: ed6331618ee88c1858ca45686a3e618347177301
 SHA512:
-  metadata.gz: 2923363afe9835b9297e69b77dbd8fc58887ad438f62733f8fb60195e12cc06524d7c324a97688e8666be4eaa5ae1cd23b9e8fd523dded84bc301daaa47b7a63
-  data.tar.gz: 5f278b45143d8e0c8f80538a034ad2af4741c25245d44a292cdd99cc45b73535d66e997e840e5199b0f488d901bcbd5c8ece5eece79227b6019d77166c27d668
+  metadata.gz: cc9036cd78ef6b9f679d3b572b84e953687f4c1e67efa7c3b82da2010536d84274a309318edc576abc81e58c9662a87c23605d719d9dd059bc13a7c0cc2896cf
+  data.tar.gz: b74774142ddff00b508f990c63c575743493a7e8d7728d117dd46f27705e22143ff9f5180a8cbcd13b3127cfec6ba409a824857e7cdfc4206faae98654d21b03

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]
@@ -428,4 +449,76 @@ CommandParser::CmdParser.new(ARGV) do
             0
         end
     end
+
+    ###
+
+    add_role_desc = <<-EOT.unindent
+        Add new role to running service
+    EOT
+
+    command :'add-role', add_role_desc, :service_id, [:file, nil] do
+        service_id = args[0]
+        client     = helper.client(options)
+
+        if args[1]
+            path = args[1]
+        else
+            tmp  = Tempfile.new(service_id.to_s)
+            path = tmp.path
+
+            if ENV['EDITOR']
+                editor_path = ENV['EDITOR']
+            else
+                editor_path = OpenNebulaHelper::EDITOR_PATH
+            end
+
+            system("#{editor_path} #{path}")
+
+            unless $CHILD_STATUS.exitstatus.zero?
+                STDERR.puts 'Editor not defined'
+                exit(-1)
+            end
+
+            tmp.close
+        end
+
+        params        = {}
+        params[:role] = File.read(path)
+        params[:add]  = true
+        json          = Service.build_json_action('add_role', params)
+
+        response = client.post("#{RESOURCE_PATH}/#{service_id}/role_action",
+                               json)
+
+        if CloudClient.is_error?(response)
+            [response.code.to_i, response.to_s]
+        else
+            0
+        end
+    end
+
+    ###
+
+    remove_role_desc = <<-EOT.unindent
+        Remove role from running service
+    EOT
+
+    command :'remove-role', remove_role_desc, :service_id, :role_name do
+        service_id = args[0]
+        client     = helper.client(options)
+
+        params        = {}
+        params[:role] = args[1]
+        params[:add]  = false
+        json          = Service.build_json_action('remove_role', params)
+
+        response = client.post("#{RESOURCE_PATH}/#{service_id}/role_action",
+                               json)
+
+        if CloudClient.is_error?(response)
+            [response.code.to_i, response.to_s]
+        else
+            0
+        end
+    end
 end

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

@@ -160,8 +160,8 @@ CommandParser::CmdParser.new(ARGV) do
 
             oneimage create -d 1 --name ubuntu --path /tmp/ubuntu.qcow2 \\
                             --prefix sd --type OS --driver qcow2 \\
-                            --description "A OS plain installation \\
-                            --persistent"
+                            --description "A OS plain installation" \\
+                            --persistent
 
           - a datablock image of 400MB:
 

data/bin/onemarket

@@ -199,4 +199,24 @@ CommandParser::CmdParser.new(ARGV) do
             o.rename(args[1])
         end
     end
+
+    enable_desc = <<-EOT.unindent
+        Enables the marketplace
+    EOT
+
+    command :enable, enable_desc, [:range, :marketplaceid_list] do
+        helper.perform_actions(args[0], options, 'enabled') do |obj|
+            obj.enable
+        end
+    end
+
+    disable_desc = <<-EOT.unindent
+        Disables the marketplace. Remove all its apps.
+    EOT
+
+    command :disable, disable_desc, [:range, :marketplaceid_list] do
+        helper.perform_actions(args[0], options, 'disabled') do |obj|
+            obj.disable
+        end
+    end
 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,7 +1333,7 @@ CommandParser::CmdParser.new(ARGV) do
                 template = OpenNebulaHelper.editor_input(template)
             end
 
-            vm.updateconf(template)
+            vm.updateconf(template, options[:append])
         end
     end
 
@@ -1411,22 +1412,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,52 +1557,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
-
-        $?.exitstatus
+        helper.ssh(args, options)
     end
 
     port_desc = <<-EOT.unindent
@@ -1670,14 +1611,16 @@ CommandParser::CmdParser.new(ARGV) do
             i_end_p   = Integer(i_range[1].split('/')[0])
 
             if args[1].nil?
-                [*e_start_p..e_end_p].zip([*i_start_p..i_end_p]) do |p1, p2|
+                start_r = Array(e_start_p..e_end_p)
+                end_r   = Array(i_start_p..i_end_p)
+
+                start_r.zip(end_r) do |p1, p2|
                     puts "#{ip}@#{p1} -> #{p2}"
                 end
             else
                 puts "#{ip}@#{e_start_p + Integer(args[1]) - 1} -> #{args[1]}"
             end
         end
-
     end
 
     # Deprecated commands

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/onemarket_helper.rb

@@ -36,6 +36,12 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
         "onemarket.yaml"
     end
 
+    def self.state_to_str(id)
+        state_str = MarketPlace::MARKETPLACE_STATES[id.to_i]
+
+        MarketPlace::SHORT_MARKETPLACE_STATES[state_str]
+    end
+
     def format_pool(options)
         config_file = self.class.table_conf
 
@@ -86,7 +92,11 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
                 d["ZONE_ID"]
             end
 
-            default :ID, :NAME, :SIZE, :AVAIL, :APPS, :MAD, :ZONE
+            column :STAT, 'Markeplace status', :left, :size => 4 do |d|
+                OneMarketPlaceHelper.state_to_str(d['STATE'])
+            end
+
+            default :ID, :NAME, :SIZE, :AVAIL, :APPS, :MAD, :ZONE, :STAT
         end
 
         table
@@ -116,6 +126,7 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
         puts str % ["NAME",  market.name]
         puts str % ["USER",  market['UNAME']]
         puts str % ["GROUP", market['GNAME']]
+        puts str % ["STATE", market.state_str]
 
         puts str % ["MARKET_MAD", market['MARKET_MAD']]
         puts

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