opennebula-cli 6.2.1 → 6.3.85.pre

data/bin/onevm

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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    #
@@ -239,6 +239,10 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'SSH options to use'
     }
 
+    OpenNebulaHelper::TEMPLATE_OPTIONS_VM.delete_if do |v|
+        %w[as_gid as_uid].include?(v[:name])
+    end
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -909,6 +913,36 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    sg_attach_desc = <<-EOT.unindent
+        Attaches a Security Group to a VM.
+
+        States: All, except BOOT, MIGRATE and HOTPLUG_NIC
+    EOT
+
+    command :"sg-attach", sg_attach_desc, :vmid, :nicid, :sgid do
+        nic_id = args[1].to_i
+        sg_id = args[2].to_i
+
+        helper.perform_action(args[0], options, 'Attach SG') do |vm|
+            vm.sg_attach(nic_id, sg_id)
+        end
+    end
+
+    sg_detach_desc = <<-EOT.unindent
+        Detaches a Security Group from a VM.
+
+        States: All, except BOOT, MIGRATE and HOTPLUG_NIC
+    EOT
+
+    command :"sg-detach", sg_detach_desc, :vmid, :nicid, :sgid do
+        nic_id = args[1].to_i
+        sg_id = args[2].to_i
+
+        helper.perform_action(args[0], options, 'Detach SG') do |vm|
+            vm.sg_detach(nic_id, sg_id)
+        end
+    end
+
     chgrp_desc = <<-EOT.unindent
         Changes the VM group
     EOT
@@ -1394,16 +1428,22 @@ CommandParser::CmdParser.new(ARGV) do
         acc_t = 0
         acc_w = 0
 
-        charters.each do |action, time|
-            sched = "+#{time[:time].to_i + acc_t}"
+        helper.perform_action(args[0], {}, 'Charter added') do |vm|
+            vm.info
+
+            diff_stime = Time.now.to_i - vm['/VM/STIME'].to_i
 
-            helper.schedule_actions([args[0]].flatten,
-                                    { :schedule => sched },
-                                    action.to_s,
-                                    time[:warning][:time] + acc_w)
+            charters.each do |action, time|
+                sched = "+#{time[:time].to_i + acc_t + diff_stime}"
 
-            acc_t += time[:time].to_i
-            acc_w += time[:warning][:time].to_i
+                helper.schedule_actions([args[0]].flatten,
+                                        { :schedule => sched },
+                                        action.to_s,
+                                        time[:warning][:time] + acc_w)
+
+                acc_t += time[:time].to_i
+                acc_w += time[:warning][:time].to_i
+            end
         end
 
         0

data/bin/onevmgroup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/onevnet

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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,26 @@ CommandParser::CmdParser.new(ARGV) do
                         'bypass the consistency checks'
     }
 
+    SUCCESS = {
+        :name => 'success',
+        :large => '--success',
+        :description => 'Recover a Virtual Network by succeeding ' \
+                        'the pending action'
+    }
+
+    FAILURE = {
+        :name => 'failure',
+        :large => '--failure',
+        :description => 'Recover a Virtual Network by failing ' \
+                        'the pending action'
+    }
+
+    DELETE = {
+        :name => 'delete',
+        :large => '--delete',
+        :description => 'No recover action possible, delete the Virtual Network'
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -428,4 +448,41 @@ CommandParser::CmdParser.new(ARGV) do
 
         return 0
     end
+
+    recover_desc = <<-EOT.unindent
+        Recovers a Virtual Network in ERROR state or waiting for a driver operation
+        to complete.
+        The recovery may be done by failing, succeeding or retrying the current operation.
+        YOU NEED TO MANUALLY CHECK THE VN STATUS, to decide if the
+        operation was successful or not, or if it can be retried.
+
+        States for success/failure recovers: LOCK_CREATE, LOCK_DELETE state.
+        States for a retry recover: LOCK_CREATE, LOCK_DELETE state
+        States for delete: Any but READY
+    EOT
+
+    command :recover, recover_desc, [:range, :vmid_list],
+            :options => [SUCCESS, FAILURE, DELETE] do
+        if !options[:success].nil?
+            result = 1
+        elsif !options[:failure].nil?
+            result = 0
+        elsif !options[:delete].nil?
+            result = 2
+        else
+            error_message = <<-EOT.unindent
+            Need to specify the result of the pending action.
+            \t--success recover the VN by succeeding the missing action.
+            \t--failure recover the VN by failing the missing action.
+            \t--delete no recover possible, delete the VN.
+            EOT
+
+            STDERR.puts error_message
+            exit(-1)
+        end
+
+        helper.perform_actions(args[0], options, 'recovering') do |vn|
+            vn.recover(result)
+        end
+    end
 end

data/bin/onevntemplate

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/onevrouter

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/onezone

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/cli_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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    #
@@ -61,7 +61,8 @@ module CLIHelper
                         ' ' * 31 << 'column=value pairs.' <<
                         ' ' * 31 << "Valid operators #{FILTER_OPS.join(',')}" <<
                         ' ' * 31 << 'e.g. NAME=test (match name with test)' <<
-                        ' ' * 31 << 'NAME~test (match test, te, tes..)'
+                        ' ' * 31 << 'NAME~test (match every NAME containing' <<
+                        ' ' * 31 << 'the substring \'test\')'
     }
 
     OPERATOR = {
@@ -187,9 +188,17 @@ module CLIHelper
                         error
                         ERROR
                         FAILED_DEPLOYING
+                        FAILED_DEPLOYING_NETS
                         FAILED_UNDEPLOYING
+                        FAILED_UNDEPLOYING_NETS
                         FAILED_SCALING]
-    REGULAR_STATES = %w[PENDING DEPLOYING CONFIGURING WARNING]
+    REGULAR_STATES = %w[PENDING
+                        DEPLOYING
+                        DEPLOYING_NETS
+                        UNDEPLOYING
+                        UNDEPLOYING_NETS
+                        CONFIGURING
+                        WARNING]
 
     # Set state color
     #

data/lib/command_parser.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/oneacct_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/oneacl_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onecluster_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onedatastore_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/oneflow_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/oneflowtemplate_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onegroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onehook_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onehost_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/oneimage_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onemarket_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onemarketapp_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onequota_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onesecgroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onetemplate_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/oneuser_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onevcenter_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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    #
@@ -27,9 +27,10 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
     module VOBJECT
 
         DATASTORE = 1
-        TEMPLATE = 2
-        NETWORK = 3
-        IMAGE = 4
+        TEMPLATE  = 2
+        NETWORK   = 3
+        IMAGE     = 4
+        HOST      = 5
 
     end
 
@@ -85,6 +86,12 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
             :columns => { :IMID => 5, :REF => 35, :PATH => 60 },
             :cli     => [:host, :datastore],
             :dialogue => ->(arg) {}
+        },
+        VOBJECT::HOST => {
+            :struct  => %w[HOST_LIST HOST],
+            :columns => { :DATACENTER => 10, :NAME => 30, :REF => 35 },
+            :cli     => [],
+            :dialogue => ->(arg) {}
         }
     }
 
@@ -143,6 +150,8 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
             @vobject = VOBJECT::NETWORK
         when 'images'
             @vobject = VOBJECT::IMAGE
+        when 'hosts'
+            @vobject = VOBJECT::HOST
         else
             puts "unknown #{type} type option"
             puts '  -o options:'
@@ -150,6 +159,7 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
             puts '      templates'
             puts '      networks'
             puts '      images'
+            puts '      hosts'
 
             exit 0
         end
@@ -186,6 +196,28 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
         }
     end
 
+    # General method to list vCenter objects
+    #
+    # @param options [Hash] User CLI options
+    # @param args    [Hash] Search arguments
+    def list(options, args)
+        if !options[:host]
+            # This case is to list available hosts, instead other object
+            list_hosts(options)
+        else
+            vi_client = VCenterDriver::VIClient.new_from_host(
+                options[:host]
+            )
+            importer = VCenterDriver::VcImporter.new_child(
+                @client,
+                vi_client,
+                options[:object]
+            )
+
+            list_object(options, importer.retrieve_resources(args))
+        end
+    end
+
     # This method will print a list for a vcenter_resource.
     #
     def list_object(options, list)
@@ -198,6 +230,31 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
         table.show(list, options)
     end
 
+    # List unimported hosts
+    #
+    # @param options [Hash] User CLI options
+    def list_hosts(options)
+        con_ops   = connection_options('hosts', options)
+        vi_client = VCenterDriver::VIClient.new(con_ops)
+        dc_folder = VCenterDriver::DatacenterFolder.new(vi_client)
+        hpool     = VCenterDriver::VIHelper.one_pool(OpenNebula::HostPool,
+                                                     false)
+
+        VCenterDriver::VIHelper.set_client(nil, @client)
+
+        list  = []
+        hosts = dc_folder.get_unimported_hosts(hpool, vi_client.vim.host)
+
+        hosts.each do |key, value|
+            value.each do |v|
+                v[:datacenter] = key
+                list << v
+            end
+        end
+
+        format_list.show(hosts, options)
+    end
+
     # handles :cli section of TABLE
     # used for executing the dialogue in some VOBJECTS
     #
@@ -252,12 +309,18 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
     def format_list
         config = TABLE[@vobject][:columns]
         CLIHelper::ShowTable.new do
+            column :DATACENTER,
+                   'Object datacenter',
+                   :size => config[:DATACENTER] || 15 do |d|
+                d[:datacenter]
+            end
+
             column :IMID, 'identifier for ...', :size=>config[:IMID] || 4 do |d|
                 d[:import_id]
             end
 
             column :REF, 'ref', :left, :adjust, :size=>config[:REF] || 15 do |d|
-                d[:ref]
+                d[:ref] || d[:cluster_ref]
             end
 
             column :NAME, 'Name', :left, :expand,

data/lib/one_helper/onevdc_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onevm_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onevmgroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onevnet_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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    #
@@ -138,6 +138,12 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         'onevnet.yaml'
     end
 
+    def self.state_to_str(id)
+        id = id.to_i
+        state_str = VirtualNetwork::VN_STATES[id]
+        VirtualNetwork::SHORT_VN_STATES[state_str]
+    end
+
     def format_pool(options)
         config_file = self.class.table_conf
 
@@ -170,12 +176,18 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                 d['BRIDGE']
             end
 
+            column :STATE, 'State of the Virtual Network', :left,
+                   :size=>6 do |d|
+                OneVNetHelper.state_to_str(d['STATE'])
+            end
+
             column :LEASES, "Number of this Virtual Network's given leases",
                    :size=>6 do |d|
                 d['USED_LEASES']
             end
 
-            default :ID, :USER, :GROUP, :NAME, :CLUSTERS, :BRIDGE, :LEASES
+            default :ID, :USER, :GROUP, :NAME, :CLUSTERS, :BRIDGE, :STATE,
+                    :LEASES
         end
     end
 
@@ -315,6 +327,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                         vn.retrieve_elements('CLUSTERS/ID')
                     ))
         puts format(str, 'BRIDGE', vn['BRIDGE'])
+        puts format(str, 'STATE', vn.state_str)
         puts format(str, 'VN_MAD', vn['VN_MAD']) unless vn['VN_MAD'].empty?
         puts format(str, 'PHYSICAL DEVICE',
                     vn['PHYDEV']) unless vn['PHYDEV'].empty?

data/lib/one_helper/onevntemplate_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onevrouter_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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/lib/one_helper/onezone_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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    #
@@ -577,7 +577,23 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
             puts "Endpoint changed to \"#{zone['TEMPLATE/ENDPOINT']}\" in " <<
                 "#{ENV['HOME']}/.one/one_endpoint"
         end
-        return 0
+
+        return 0 unless zone['TEMPLATE/ONEFLOW_ENDPOINT']
+
+        # Set ONEFLOW_ENDPOINT
+        if temporary_zone
+            puts "Type: export ONEFLOW_URL=#{zone['TEMPLATE/ONEFLOW_ENDPOINT']}"
+        else
+            File.open(ENV['HOME'] + '/.one/oneflow_endpoint', 'w') do |f|
+                f.puts zone['TEMPLATE/ONEFLOW_ENDPOINT']
+            end
+
+            puts 'OneFlow Endpoint changed to ' \
+                 "\"#{zone['TEMPLATE/ONEFLOW_ENDPOINT']}\" in " <<
+                 "#{ENV['HOME']}/.one/oneflow_endpoint"
+        end
+
+        0
     end
 
     private

data/lib/one_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, 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    #
@@ -30,7 +30,7 @@ include OpenNebula
 module OpenNebulaHelper
     ONE_VERSION=<<-EOT
 OpenNebula #{OpenNebula::VERSION}
-Copyright 2002-2021, OpenNebula Project, OpenNebula Systems
+Copyright 2002-2022, OpenNebula Project, OpenNebula Systems
 EOT
 
     if ONE_LOCATION