opennebula-cli 5.12.13 → 5.13.80.pre

data/lib/one_helper/onevdc_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -124,8 +124,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :name => 'weekly',
         :large => '--weekly days',
         :description => 'Repeats the schedule action the days of the week ' \
-        'specified, it can be a number between 0 (Sunday) to 6 (Saturday) ' \
-        'separated with commas. ' \
+        'specified, it can be a number between 0,6 separated with commas.' \
         'For example: onevm resume 0 --schedule "09/23 14:15" --weekly 0,2,4',
         :format => String
     }
@@ -134,8 +133,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :name => 'monthly',
         :large => '--monthly days',
         :description => 'Repeats the schedule action the days of the month ' \
-        'specified, it can be a number between 1,31 separated with commas. ' \
-        'For example: onevm resume 0 --schedule "09/23 14:15" --monthly 1,14',
+        'specified, it can be a number between 0,31 separated with commas.' \
+        'For example: onevm resume 0 --schedule "09/23 14:15" --monthly 0,14',
         :format => String
     }
 
@@ -143,7 +142,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :name => 'yearly',
         :large => '--yearly days',
         :description => 'Repeats the schedule action the days of the year ' \
-        'specified, it can be a number between 0,365 separated with commas. ' \
+        'specified, it can be a number between 0,365 separated with commas.' \
         'For example: onevm resume 0 --schedule "09/23 14:15" --yearly 30,60',
         :format => String
     }
@@ -152,7 +151,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :name => 'hourly',
         :large => '--hourly hour',
         :description => 'Repeats the schedule action each hours specified,' \
-        'it can be a number between 0,168 separated with commas. ' \
+        'it can be a number between 0,168 separated with commas.' \
         'For example: onevm resume 0 --schedule "09/23 14:15" --hourly 1,5',
         :format => Numeric
     }
@@ -253,7 +252,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         end
 
         vm_nics.each do |nic|
-            %w[IP IP6_GLOBAL IP6_ULA IP6
+            %w[IP EXTERNAL_IP IP6_GLOBAL IP6_ULA IP6
                VROUTER_IP VROUTER_IP6_GLOBAL VROUTER_IP6_ULA].each do |attr|
                 if nic.key?(attr)
                     ips.push(nic[attr])
@@ -986,7 +985,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             vm_nics.each do |nic|
                 next if nic.key?('CLI_DONE')
 
-                %w[IP6_LINK IP6_ULA IP6_GLOBAL IP6].each do |attr|
+                %w[EXTERNAL_IP IP6_LINK IP6_ULA IP6_GLOBAL IP6].each do |attr|
                     next unless nic.key?(attr)
 
                     shown_ips << nic[attr]
@@ -1014,6 +1013,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 end
 
                 shown_ips << nic['IP'] if nic.key?('IP')
+                shown_ips << nic['EXTERNAL_IP'] if nic.key?('EXTERNAL_IP')
 
                 nic.merge!(nic_default) {|_k, v1, _v2| v1 }
                 array_id += 1

data/lib/one_helper/onevmgroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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/onevntemplate_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -38,25 +38,6 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
         "onevrouter.yaml"
     end
 
-    def show_resource(id, options)
-        resource = retrieve_resource(id)
-
-        if !options[:extended].nil?
-            rc = resource.info(options[:extended])
-        else
-            rc = resource.info
-        end
-
-        return -1, rc.message if OpenNebula.is_error?(rc)
-
-        if options[:xml]
-            return 0, resource.to_xml(true)
-        else
-            format_resource(resource, options)
-            return 0
-        end
-    end
-
     def format_pool(options)
         config_file = self.class.table_conf
 

data/lib/one_helper/onezone_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -470,6 +470,17 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
 
         if options[:xml]
             return 0, resource.to_xml(true)
+        elsif options[:json]
+            # If body is set, the resource contains a JSON inside
+            if options[:body]
+                return 0, check_resource_xsd(resource)
+            else
+                return 0, ::JSON.pretty_generate(
+                    check_resource_xsd(resource)
+                )
+            end
+        elsif options[:yaml]
+            return 0, check_resource_xsd(resource).to_yaml(:indent => 4)
         else
             format_resource(resource, options)
             return 0