opennebula-cli 6.3.80.pre → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a1350ce7a3d5d9d6e1b7ffb16f51eaecdf01cd397fa8d1bb0fb87f08b5c0fc4
-  data.tar.gz: fb950f30366562c94cd865adffeae41d7442cf70e20a7ab035c8a40cbb6aec3e
+  metadata.gz: 56b346315b2634a821c776148d1e7e01aa05adfcdb3b4a2e367cae4a29b26857
+  data.tar.gz: 7046877fa9eb556c11b1dc21bcb27576ed801cb0e8ed6f55c50c3a6b72579ee2
 SHA512:
-  metadata.gz: c5d582717725a0da69269abe94e4fb07f429ac58286116a3bf165833c9e894505370fbaf4ca2b7d3d9ebfe26c2c927d8e4a1848c014db13c45550c0d1af9ec8a
-  data.tar.gz: 34127cec5cc3eaf71dc8e4dc479a05d3f5f0760b99725f99c0155a37986d7477ec3879298d11153d79559c091075f698d04145b2d35d86898d63e85aeb017a6a
+  metadata.gz: 3fc21ffc004d6e90f856f49b58164318b365653839009225b77d6074004f24da92d495d6f71669130c47b75648f744e31ae7ff412634198990ff7ec537856203
+  data.tar.gz: 1dc9aef9254b2ef752a9adea4c98f55aec7537842cd62f6fe88f3c8b09a89d0c38f6c2218af2d582e800fe7cc920672316d656e9543ab6d29b77a38c65704d95

data/bin/oneacct

@@ -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/oneacl

@@ -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/onecluster

@@ -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/onedatastore

@@ -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/oneflow

@@ -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    #
@@ -521,4 +521,27 @@ CommandParser::CmdParser.new(ARGV) do
             0
         end
     end
+
+    ###
+
+    release_desc = <<-EOT.unindent
+        Release roles of a service on hold
+    EOT
+
+    command :release, release_desc, :service_id do
+        service_id = args[0]
+        client     = helper.client(options)
+
+        params        = {}
+        json          = Service.build_json_action('release', params)
+
+        response = client.post("#{RESOURCE_PATH}/#{service_id}/action",
+                               json)
+
+        if CloudClient.is_error?(response)
+            [response.code.to_i, response.to_s]
+        else
+            0
+        end
+    end
 end

data/bin/oneflow-template

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

@@ -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/onehook

@@ -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/onehost

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

@@ -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/oneirb

@@ -0,0 +1,131 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# 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    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+ONE_LOCATION = ENV['ONE_LOCATION']
+
+if !ONE_LOCATION
+    RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
+else
+    RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
+            require 'rubygems'
+            Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
+        end
+    end
+end
+# %%RUBYGEMS_SETUP_END%%
+
+$LOAD_PATH << RUBY_LIB_LOCATION
+$LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
+$LOAD_PATH << RUBY_LIB_LOCATION + '/oneflow/lib'
+
+################################################################################
+# Required libraries
+################################################################################
+
+require 'base64'
+require 'csv'
+require 'date'
+require 'digest/md5'
+require 'erb'
+require 'json'
+require 'nokogiri'
+require 'openssl'
+require 'ox'
+require 'pp'
+require 'set'
+require 'socket'
+require 'sqlite3'
+require 'tempfile'
+require 'time'
+require 'uri'
+require 'yaml'
+
+require 'opennebula'
+require 'vcenter_driver'
+
+# Include OpenNebula to avoid having to use OpenNebula:: namespace
+include OpenNebula
+
+################################################################################
+# vCenter helper functions
+################################################################################
+
+# Get VIClient object from host
+#
+# @param id [Integer] Host ID
+def vi_client_host(id)
+    VCenterDriver::VIClient.new_from_host(id)
+end
+
+# Get VM vCenter object
+#
+# @param id [Integer] VM ID
+def vm(id)
+    one_vm = VCenterDriver::VIHelper.one_item(OpenNebula::VirtualMachine, id)
+
+    did = one_vm['DEPLOY_ID']
+    hid = one_vm.retrieve_xmlelements(
+        'HISTORY_RECORDS/HISTORY/HID'
+    ).last.text.to_i
+
+    VCenterDriver::VirtualMachine.new_one(vi_client_host(hid), did, one_vm)
+end
+
+# Get host vCenter object
+#
+# @param id [Integer] Host ID
+def host(id)
+    vi_client = vi_client_host(id)
+    one_h     = VCenterDriver::VIHelper.one_item(OpenNebula::Host, hid)
+
+    VCenterDriver::ClusterComputeResource.new_from_ref(
+        one_h['TEMPLATE/VCENTER_CCR_REF'],
+        vi_client
+    )
+end
+
+################################################################################
+# Open irb session
+################################################################################
+
+puts '* You can use the function vi_client_host(id) to get vCenter client'
+puts '* You can use the function vm(id) to get vCenter VM'
+puts '* You can use the function host(id) to get vCenter host'
+
+@client = Client.new
+version = '>= 0'
+
+gem 'pry', version
+load Gem.bin_path('pry', 'pry', version)

data/bin/onelog

@@ -0,0 +1,101 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# 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    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+ONE_LOCATION = ENV['ONE_LOCATION']
+
+if !ONE_LOCATION
+    RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+else
+    RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+end
+
+$LOAD_PATH << RUBY_LIB_LOCATION
+$LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
+
+# Default pager to check logs
+DEFAULT_PAGER = 'less'
+
+# List of OpenNebula services and the logs files
+SERVICES = {
+    'fireedge' => { :log => 'fireedge.log', :error => 'fireedge.error' },
+    'monitor'  => 'monitor.log',
+    'novnc'    => 'novnc.log',
+    'oned'     => 'oned.log',
+    'onehem'   => { :log => 'onehem.log', :error => 'onehem.error' },
+    'sched'    => 'sched.log',
+    'sunstone' => { :log => 'sunstone.log', :error => 'sunstone.error' },
+    'vcenter'  => 'vcenter_monitor.log'
+}
+
+require 'command_parser'
+require 'one_helper'
+
+CommandParser::CmdParser.new(ARGV) do
+    usage '`onelog` <command> [<args>] [<options>]'
+    version OpenNebulaHelper::ONE_VERSION
+
+    TYPE = {
+        :name => 'type',
+        :short => '-t type',
+        :large => '--type type',
+        :format => String,
+        :description => 'Log type (log/error) [default: log]'
+    }
+
+    PAGER = {
+        :name => 'pager',
+        :short => '-p pager',
+        :large => '--pager pager',
+        :format => String,
+        :description => 'Pager to use to read logs [defaul: less]'
+    }
+
+    PAGER_OPTS = {
+        :name => 'pager_opts',
+        :large => '--pager-opts pager_opts',
+        :format => String,
+        :description => 'Pager options'
+    }
+
+    get_desc = <<-EOT.unindent
+        Gets log from an specific OpenNebula service
+    EOT
+
+    command :get, get_desc, :service, :options => [TYPE, PAGER, PAGER_OPTS] do
+        unless SERVICES[args[0]]
+            STDERR.puts "Service '#{args[0]}' not found"
+            exit 1
+        end
+
+        if options[:type] && !SERVICES[args[0]][options[:type].to_sym]
+            STDERR.puts "Log file type '#{options[:type]}' not found"
+            exit 1
+        end
+
+        if (SERVICES[args[0]].is_a? Hash) && !options[:type]
+            options[:type] = :log
+        end
+
+        type  = options[:type].to_sym
+        pager = options[:pager] || DEFAULT_PAGER
+
+        type.nil? ? file = SERVICES[args[0]] : file = SERVICES[args[0]][type]
+
+        system("#{pager} #{options[:pager_opts]} /var/log/one/#{file}")
+    end
+end

data/bin/onemarket

@@ -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/onemarketapp

@@ -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/onesecgroup

@@ -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/oneshowback

@@ -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/onetemplate

@@ -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/oneuser

@@ -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    #
@@ -443,7 +443,7 @@ CommandParser::CmdParser.new(ARGV) do
     command :key, key_desc, :options => [KEY] do
         require 'opennebula/ssh_auth'
 
-        options[:key] ||= ENV['HOME'] + '/.ssh/id_rsa'
+        options[:key] ||= Dir.home + '/.ssh/id_rsa'
 
         begin
             sshauth = SshAuth.new(:private_key => options[:key])

data/bin/onevcenter

@@ -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/onevdc

@@ -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/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    #
@@ -49,6 +49,9 @@ end
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
 
+# Default VNC viewer
+DEFAULT_VNC = 'vinagre'
+
 require 'command_parser'
 require 'one_helper/onevm_helper'
 require 'one_helper/onedatastore_helper'
@@ -239,6 +242,13 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'SSH options to use'
     }
 
+    VNC = {
+        :name => 'vnc',
+        :large => '--vnc vnc',
+        :format => String,
+        :description => 'VNC client to use'
+    }
+
     OpenNebulaHelper::TEMPLATE_OPTIONS_VM.delete_if do |v|
         %w[as_gid as_uid].include?(v[:name])
     end
@@ -1666,6 +1676,30 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    connect_desc = <<-EOT.unindent
+        Opens a VNC session to the VM
+    EOT
+
+    command :vnc, connect_desc, :vmid, :options => [VNC] do
+        helper.perform_action(args[0], options, 'VNC') do |vm|
+            rc = vm.info
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts rc.message
+                exit(1)
+            end
+
+            host = vm['HISTORY_RECORDS/HISTORY[last()]/HOSTNAME']
+            port = vm['TEMPLATE/GRAPHICS/PORT']
+
+            vncviewer = options['vnc'] || DEFAULT_VNC
+
+            cmd = [vncviewer, "#{host}::#{port}"]
+
+            exec(*cmd)
+        end
+    end
+
     # Deprecated commands
 
     deprecated_command(:shutdown, 'terminate')

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    #
@@ -188,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    #
@@ -221,16 +221,14 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
                 exit(-1)
             end
 
-            mandatory, _type, description, _params, initial = input_cfg
-
-            vnet = {}
+            vnet                                  = {}
+            mandatory, _, description, _, initial = input_cfg
 
             if initial && !initial.empty?
                 type, resource_id, extra = initial.split(':', -1)
             end
 
-            if (type.nil? || resource_id.nil?) &&
-               (initial && !initial.empty?)
+            if (!type || !resource_id) && (initial && !initial.empty?)
                 STDERR.puts 'Wrong type for user input default value:'
                 STDERR.puts "  #{key}: #{val}"
                 exit(-1)
@@ -239,7 +237,7 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
             vnet[key] = {}
 
             if get_defaults
-                vnet[key][type] = resource_id
+                vnet[key][type]    = resource_id
                 vnet[key]['extra'] = extra
 
                 answers << vnet unless mandatory == 'M'
@@ -248,22 +246,25 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
 
             puts "  * (#{key}) #{description}"
 
-            #######################################
-            # Asks for type
-            #######################################
-
-            header = '    '
+            ####################################################################
+            # Ask for type
+            ####################################################################
+            header  = '    '
             header += 'TYPE Existing(1), Create(2), Reserve(3). '
-
-            if !type.nil? && type != ''
-                header += 'Press enter for default. '
-            end
+            header += 'Press enter for default. ' if type && !type.empty?
 
             print header
 
             answer = STDIN.readline.chop
 
-            type_a = type
+            if type && !type.empty? && ![1, 2, 3].include?(answer.to_i)
+                type_a = type
+            else
+                until [1, 2, 3].include?(answer.to_i)
+                    print header
+                    answer = STDIN.readline.chop
+                end
+            end
 
             case answer.to_i
             when 1
@@ -274,18 +275,18 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
                 type_a = 'reserve_from'
             end
 
-            #######################################
-            # Asks for resource id
-            #######################################
-
+            ####################################################################
+            # Ask for resource id
+            ####################################################################
             header = '    '
+
             if type_a == 'template_id'
                 header += 'VN Template ID. '
             else
                 header += 'VN ID. '
             end
 
-            if !resource_id.nil? && resource_id != ''
+            if resource_id && !resource_id.empty?
                 header += "Press enter for default (#{resource_id}). "
             end
 
@@ -293,17 +294,23 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
 
             resource_id_a = STDIN.readline.chop
 
-            resource_id_a = resource_id if resource_id_a.empty?
+            if resource_id && !resource_id.empty?
+                resource_id_a = resource_id
+            else
+                while resource_id_a.empty?
+                    print header
+                    resource_id_a = STDIN.readline.chop
+                end
+            end
 
-            #######################################
+            ####################################################################
             # Asks for extra
-            #######################################
-
+            ####################################################################
             if type_a != 'id'
-                header = '    '
+                header  = '    '
                 header += 'EXTRA (Type EMPTY for leaving empty). '
 
-                if !extra.nil? && extra != ''
+                if extra && !extra.empty?
                     header += " Press enter for default (#{extra}). "
                 end
 

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    #

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    #

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

data/share/schemas/xsd/vnet.xsd

@@ -44,6 +44,8 @@
         </xs:element>
         <xs:element name="BRIDGE" type="xs:string"/>
         <xs:element name="BRIDGE_TYPE" type="xs:string" minOccurs="0"/>
+        <xs:element name="STATE" type="xs:integer"/>
+        <xs:element name="PREV_STATE" type="xs:integer"/>
         <xs:element name="PARENT_NETWORK_ID" type="xs:string"/>
         <xs:element name="VN_MAD" type="xs:string"/>
         <xs:element name="PHYDEV" type="xs:string"/>

data/share/schemas/xsd/vnet_pool.xsd

@@ -38,6 +38,8 @@
               </xs:element>
               <xs:element name="BRIDGE" type="xs:string"/>
               <xs:element name="BRIDGE_TYPE" type="xs:string" minOccurs="0"/>
+              <xs:element name="STATE" type="xs:integer"/>
+              <xs:element name="PREV_STATE" type="xs:integer"/>
               <xs:element name="PARENT_NETWORK_ID" type="xs:string"/>
               <xs:element name="VN_MAD" type="xs:string"/>
               <xs:element name="PHYDEV" type="xs:string"/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.3.80.pre
+  version: 6.4.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.3.80.pre
+        version: 6.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.3.80.pre
+        version: 6.4.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -50,6 +50,7 @@ executables:
 - onehook
 - onevdc
 - oneacl
+- oneirb
 - oneflow-template
 - onevrouter
 - oneshowback
@@ -57,6 +58,7 @@ executables:
 - oneacct
 - onesecgroup
 - onecluster
+- onelog
 - onemarketapp
 - onetemplate
 - onemarket
@@ -80,6 +82,8 @@ files:
 - bin/onehook
 - bin/onehost
 - bin/oneimage
+- bin/oneirb
+- bin/onelog
 - bin/onemarket
 - bin/onemarketapp
 - bin/onesecgroup
@@ -185,9 +189,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: