opennebula-cli 6.0.2 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38415d05a5a46b897679a59f395d635b33093e59
-  data.tar.gz: 84e514c15e324cab67b86348274251d747eec436
+  metadata.gz: d71d6197859d846259af7cb730330d8d29a03e89
+  data.tar.gz: 515adb9afa80cf52f7ab93ac9a582af9bc38afc8
 SHA512:
-  metadata.gz: 2923363afe9835b9297e69b77dbd8fc58887ad438f62733f8fb60195e12cc06524d7c324a97688e8666be4eaa5ae1cd23b9e8fd523dded84bc301daaa47b7a63
-  data.tar.gz: 5f278b45143d8e0c8f80538a034ad2af4741c25245d44a292cdd99cc45b73535d66e997e840e5199b0f488d901bcbd5c8ece5eece79227b6019d77166c27d668
+  metadata.gz: 02cfddcd26f6d496448f69653ad05f463eebf60cb5d40a956319faaed2f9b4829db13e75b9154168e3a0597a3cf2f20739229ce9758b2ce537f535c9f5a5e644
+  data.tar.gz: 8409cabd907844035d833f9d37b37dc08c15bf0afd276a1772c303ffa6d1a6e004985f4eefa5d440590d93f5910f209fee68bef5238aa8e206c6f806d82865e4

data/bin/oneflow

@@ -428,4 +428,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/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/onevm

@@ -1616,7 +1616,9 @@ CommandParser::CmdParser.new(ARGV) do
             system("ssh #{opts} #{login}@#{ip} -p #{port} #{cmd}")
         end
 
+        # rubocop:disable Style/SpecialGlobalVars
         $?.exitstatus
+        # rubocop:enable Style/SpecialGlobalVars
     end
 
     port_desc = <<-EOT.unindent
@@ -1670,14 +1672,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/lib/one_helper.rb

@@ -1893,8 +1893,10 @@ EOT
         if options[:size]
             ar << ', SIZE = ' << options[:size]
         else
-            STDERR.puts 'Address range needs to specify size (-s size)'
-            exit(-1)
+            unless options[:ip6]
+                STDERR.puts 'Address range needs to specify size (-s size)'
+                exit(-1)
+            end
         end
 
         if options[:ip6]
@@ -2164,10 +2166,10 @@ EOT
             when 'number', 'number-float'
                 if type == 'number'
                     header += 'Integer: '
-                    exp = INT_EXP
+                    exp = OneTemplateHelper::INT_EXP
                 else
                     header += 'Float: '
-                    exp = FLOAT_EXP
+                    exp = OneTemplateHelper::FLOAT_EXP
                 end
 
                 begin
@@ -2193,13 +2195,13 @@ EOT
                 end
 
                 if type == 'range'
-                    exp = INT_EXP
+                    exp = OneTemplateHelper::INT_EXP
                     min = min.to_i
                     max = max.to_i
 
                     header += "Integer in the range [#{min}..#{max}]: "
                 else
-                    exp = FLOAT_EXP
+                    exp = OneTemplateHelper::FLOAT_EXP
                     min = min.to_f
                     max = max.to_f
 

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

@@ -124,7 +124,8 @@ 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,6 separated with commas.' \
+        'specified, it can be a number between 0 (Sunday) to 6 (Saturday) ' \
+        'separated with commas. ' \
         'For example: onevm resume 0 --schedule "09/23 14:15" --weekly 0,2,4',
         :format => String
     }
@@ -133,8 +134,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 0,31 separated with commas.' \
-        'For example: onevm resume 0 --schedule "09/23 14:15" --monthly 0,14',
+        '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',
         :format => String
     }
 
@@ -142,7 +143,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
     }
@@ -151,7 +152,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
     }

data/share/schemas/xsd/api_info.xsd

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- The information sent to the hook when $API is used in an API Hook follos the following schema   -->
+<!-- The information sent to the hook when $API is used in an API Hook follow the following schema   -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
   <xs:element name="CALL_INFO">
     <xs:complexType>
@@ -13,7 +13,7 @@
                 <xs:complexType>
                   <xs:sequence>
                     <xs:element name="POSITION" type="xs:integer"/>
-                    <xs:element name="TYPE" type="xs:integer">
+                    <xs:element name="TYPE" type="xs:string">
                       <xs:simpleType>
                         <xs:restriction base="xs:string">
                         <xs:enumeration value="IN"/>

data/share/schemas/xsd/hook_message_api.xsd

@@ -6,7 +6,7 @@
       <xs:sequence>
         <xs:element name="HOOK_TYPE" type="xs:string" fixed="API"/>
         <xs:element name="CALL" type="xs:string"/>
-         <!-- CALL_INFO type is defined in call_info.xsd   -->
+         <!-- CALL_INFO type is defined in api_info.xsd   -->
         <xs:element ref="CALL_INFO" maxOccurs="unbounded" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>

data/share/schemas/xsd/hook_message_state.xsd

@@ -16,7 +16,7 @@
         <xs:element name="STATE" type="xs:string"/>
         <xs:element name="LCM_STATE" type="xs:string" maxOccurs="1" minOccurs="0"/>
         <xs:element name="REMOTE_HOST" type="xs:string" maxOccurs="1" minOccurs="0"/>
-         <!-- The template of the resource (VM or Host) is inlcuded here -->
+         <!-- The template of the resource (VM or Host) is included here -->
          <xs:element ref="HOST" maxOccurs="1" minOccurs="0"/>
          <xs:element ref="VM" maxOccurs="1" minOccurs="0"/>
       </xs:sequence>

data/share/schemas/xsd/marketplace.xsd

@@ -10,6 +10,7 @@
         <xs:element name="UNAME" type="xs:string"/>
         <xs:element name="GNAME" type="xs:string"/>
         <xs:element name="NAME" type="xs:string"/>
+        <xs:element name="STATE" type="xs:integer"/>
         <xs:element name="MARKET_MAD" type="xs:string"/>
         <xs:element name="ZONE_ID" type="xs:string"/>
         <xs:element name="TOTAL_MB" type="xs:integer"/>

data/share/schemas/xsd/zone_pool.xsd

@@ -2,7 +2,7 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
   targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
   <xs:element name="ZONE_POOL">
-    <xs:element name="ZONE">
+    <xs:element name="ZONE" minOccurs="1" maxOccurs="unbounded">
       <xs:complexType>
         <xs:sequence>
           <xs:element name="ID" type="xs:integer"/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.3
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +45,7 @@ executables:
 - oneacl
 - onecluster
 - onedatastore
+- oneflow
 - oneflow-template
 - onegroup
 - onehook
@@ -58,12 +59,11 @@ executables:
 - oneuser
 - onevcenter
 - onevdc
-- onevm
 - onevmgroup
 - onevnet
 - onevntemplate
 - onevrouter
-- oneflow
+- onevm
 - onezone
 extensions: []
 extra_rdoc_files: []
@@ -93,7 +93,6 @@ files:
 - share/schemas/xsd/marketplace_pool.xsd
 - share/schemas/xsd/marketplaceapp.xsd
 - share/schemas/xsd/marketplaceapp_pool.xsd
-- share/schemas/xsd/monitoring_data.xsd
 - share/schemas/xsd/opennebula_configuration.xsd
 - share/schemas/xsd/raftstatus.xsd
 - share/schemas/xsd/security_group.xsd
@@ -103,10 +102,8 @@ files:
 - share/schemas/xsd/user_pool.xsd
 - share/schemas/xsd/vdc.xsd
 - share/schemas/xsd/vdc_pool.xsd
-- share/schemas/xsd/vm.xsd
 - share/schemas/xsd/vm_group.xsd
 - share/schemas/xsd/vm_group_pool.xsd
-- share/schemas/xsd/vm_pool.xsd
 - share/schemas/xsd/vmtemplate.xsd
 - share/schemas/xsd/vmtemplate_pool.xsd
 - share/schemas/xsd/vnet.xsd
@@ -115,12 +112,16 @@ files:
 - share/schemas/xsd/vntemplate_pool.xsd
 - share/schemas/xsd/vrouter.xsd
 - share/schemas/xsd/vrouter_pool.xsd
+- share/schemas/xsd/monitoring_data.xsd
+- share/schemas/xsd/vm.xsd
+- share/schemas/xsd/vm_pool.xsd
 - share/schemas/xsd/zone.xsd
 - share/schemas/xsd/zone_pool.xsd
 - bin/oneacct
 - bin/oneacl
 - bin/onecluster
 - bin/onedatastore
+- bin/oneflow
 - bin/oneflow-template
 - bin/onegroup
 - bin/onehook
@@ -134,12 +135,11 @@ files:
 - bin/oneuser
 - bin/onevcenter
 - bin/onevdc
-- bin/onevm
 - bin/onevmgroup
 - bin/onevnet
 - bin/onevntemplate
 - bin/onevrouter
-- bin/oneflow
+- bin/onevm
 - bin/onezone
 - lib/cli_helper.rb
 - lib/command_parser.rb
@@ -162,11 +162,11 @@ files:
 - lib/one_helper/oneuser_helper.rb
 - lib/one_helper/onevcenter_helper.rb
 - lib/one_helper/onevdc_helper.rb
-- lib/one_helper/onevm_helper.rb
 - lib/one_helper/onevmgroup_helper.rb
 - lib/one_helper/onevnet_helper.rb
 - lib/one_helper/onevntemplate_helper.rb
 - lib/one_helper/onevrouter_helper.rb
+- lib/one_helper/onevm_helper.rb
 - lib/one_helper/onezone_helper.rb
 - NOTICE
 - LICENSE