opennebula-cli 7.2.0 → 7.3.80.pre

data/lib/one_helper/onegroup_helper.rb

@@ -313,6 +313,26 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
         helper = OneQuotaHelper.new(@client)
         helper.format_quota(group_hash['GROUP'], default_quotas, group.id)
+
+        CLIHelper.print_header(str_h1 % 'VLAN RULES', false)
+
+        rules = [group_hash['GROUP']['VLAN_RULES']['RULE']].flatten rescue []
+        rules.compact!
+
+        CLIHelper::ShowTable.new(nil, self) do
+            column :VLAN_ID, 'VLAN Identifier range', :left, :size => 15 do |d|
+                d['ID']
+            end
+
+            column :SCOPE, 'Scope of the rule', :left, :size => 15 do |d|
+                d['SCOPE']
+            end
+
+            column :VNTEMPLATE, 'VN Template ID range', :left, :size => 15 do |d|
+                d['VNTEMPLATE'] || '-'
+            end
+        end.show(rules)
+        puts
     end
 
 end

data/lib/one_helper/onehost_helper.rb

@@ -16,7 +16,6 @@
 
 require 'time'
 require 'fileutils'
-require 'HostSyncManager'
 require 'one_helper'
 require 'one_helper/onevm_helper'
 require 'opennebula/host'
@@ -198,6 +197,16 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
     NUM_THREADS = 15
     def sync(host_ids, options)
+        # HostSyncManager lives in the driver tree and is only shipped with the
+        # server packages. It is required lazily here so that a CLI-only install
+        # (opennebula-tools) keeps working for every other onehost subcommand,
+        # and only 'onehost sync' degrades when the driver libs are absent.
+        begin
+            require 'HostSyncManager'
+        rescue LoadError
+            return -1, "'onehost sync' is only available on the frontend."
+        end
+
         if Process.uid.zero? || Process.gid.zero?
             STDERR.puts("Cannot run 'onehost sync' as root")
             exit(-1)

data/lib/one_helper/oneimage_helper.rb

@@ -18,6 +18,7 @@ require 'one_helper'
 require 'one_helper/onevm_helper'
 require 'opennebula/image'
 require 'opennebula/image_pool'
+require 'opennebula/template_pool'
 
 # CLI helper for oneimage command
 class OneImageHelper < OpenNebulaHelper::OneHelper
@@ -273,8 +274,11 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         pool = factory_pool
         tmpl_pool = OpenNebula::TemplatePool.new(@client, -2)
 
-        pool.info
-        tmpl_pool.info
+        rc = pool.info
+        return rc if OpenNebula.is_error?(rc)
+
+        rc = tmpl_pool.info
+        return rc if OpenNebula.is_error?(rc)
 
         pool.each do |img|
             next if img['TYPE'].to_i == 6 # skip backup images
@@ -366,6 +370,9 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             CLIHelper.print_header(str_h1 % 'BACKUP INFORMATION', false)
             puts format(str, 'VM', vms[0])
 
+            disk_ids = image.retrieve_elements('BACKUP_DISK_IDS/ID')
+            puts format(str, 'DISK IDS', disk_ids.join(',')) if disk_ids
+
             if image.has_elements?('/IMAGE/BACKUP_INCREMENTS/INCREMENT')
                 puts format(str, 'TYPE', 'INCREMENTAL')
 

data/lib/one_helper/onemarket_helper.rb

@@ -18,24 +18,26 @@ require 'one_helper'
 require 'opennebula/marketplace'
 require 'opennebula/marketplace_pool'
 
+# Helper class for Marketplace commands
 class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
+
     MARKETPLACE = {
-        :name   => "marketplace",
-        :short  => "-m id|name",
-        :large  => "--marketplace id|name" ,
-        :description => "Selects the marketplace",
+        :name   => 'marketplace',
+        :short  => '-m id|name',
+        :large  => '--marketplace id|name',
+        :description => 'Selects the marketplace',
         :format => String,
-        :proc   => lambda { |o, options|
-            OpenNebulaHelper.rname_to_id(o, "MARKETPLACE")
+        :proc   => lambda {|o, _options|
+            OpenNebulaHelper.rname_to_id(o, 'MARKETPLACE')
         }
     }
 
     def self.rname
-        "MARKETPLACE"
+        'MARKETPLACE'
     end
 
     def self.conf_file
-        "onemarket.yaml"
+        'onemarket.yaml'
     end
 
     def self.state_to_str(id)
@@ -47,51 +49,51 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
     def format_pool(options)
         config_file = self.class.table_conf
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
-            column :ID, "ONE identifier for the Marketplace", :size=>4 do |d|
-                d["ID"]
+        CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, 'ONE identifier for the Marketplace', :size=>4 do |d|
+                d['ID']
             end
 
-            column :USER, "Username of the Marketplace owner", :left,
-                    :size=>10 do |d|
+            column :USER, 'Username of the Marketplace owner', :left,
+                   :size=>10 do |d|
                 helper.user_name(d, options)
             end
 
-            column :GROUP, "Group of the Marketplace", :left,
-                    :size=>10 do |d|
+            column :GROUP, 'Group of the Marketplace', :left,
+                   :size=>10 do |d|
                 helper.group_name(d, options)
             end
 
-            column :NAME, "Name of the Marketplace", :left, :size=>30 do |d|
-                d["NAME"]
+            column :NAME, 'Name of the Marketplace', :left, :size=>30 do |d|
+                d['NAME']
             end
 
-            column :SIZE, "Marketplace total size", :size =>10 do |d|
+            column :SIZE, 'Marketplace total size', :size =>10 do |d|
                 OpenNebulaHelper.unit_to_str(d['TOTAL_MB'].to_i, {}, 'M')
             end
 
-            column :AVAIL, "Marketplace free size", :left, :size =>10 do |d|
+            column :AVAIL, 'Marketplace free size', :left, :size =>10 do |d|
                 if d['TOTAL_MB'].to_i == 0
-                    "-"
+                    '-'
                 else
-                    "#{((d['FREE_MB'].to_f/d['TOTAL_MB'].to_f) * 100).round()}%"
+                    "#{((d['FREE_MB'].to_f/d['TOTAL_MB'].to_f) * 100).round}%"
                 end
             end
 
-            column :APPS, "Number of marketplace apps", :size=>6 do |d|
-                if d["MARKETPLACEAPPS"]["ID"].nil?
-                    "0"
+            column :APPS, 'Number of marketplace apps', :size=>6 do |d|
+                if d['MARKETPLACEAPPS']['ID'].nil?
+                    '0'
                 else
-                    [d["MARKETPLACEAPPS"]["ID"]].flatten.size
+                    [d['MARKETPLACEAPPS']['ID']].flatten.size
                 end
             end
 
-            column :MAD, "Marketplace driver", :left, :size=>7 do |d|
-                d["MARKET_MAD"]
+            column :MAD, 'Marketplace driver', :left, :size=>7 do |d|
+                d['MARKET_MAD']
             end
 
-            column :ZONE, "Zone ID", :size=>4 do |d|
-                d["ZONE_ID"]
+            column :ZONE, 'Zone ID', :size=>4 do |d|
+                d['ZONE_ID']
             end
 
             column :STAT, 'Markeplace status', :left, :size => 4 do |d|
@@ -100,13 +102,11 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
 
             default :ID, :NAME, :SIZE, :AVAIL, :APPS, :MAD, :ZONE, :STAT
         end
-
-        table
     end
 
     private
 
-    def factory(id=nil)
+    def factory(id = nil)
         if id
             OpenNebula::MarketPlace.new_with_id(id, @client)
         else
@@ -115,51 +115,52 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
         end
     end
 
-    def factory_pool(user_flag=-2)
+    def factory_pool(_user_flag = -2)
         OpenNebula::MarketPlacePool.new(@client)
     end
 
-    def format_resource(market, options = {})
-        str="%-15s: %-20s"
-        str_h1="%-80s"
+    def format_resource(market, _options = {})
+        str='%-15s: %-20s'
+        str_h1='%-80s'
 
         CLIHelper.print_header(str_h1 % "MARKETPLACE #{market['ID']} INFORMATION")
-        puts str % ["ID",    market.id.to_s]
-        puts str % ["NAME",  market.name]
-        puts str % ["USER",  market['UNAME']]
-        puts str % ["GROUP", market['GNAME']]
-        puts str % ["STATE", market.state_str]
+        puts format(str, 'ID', market.id.to_s)
+        puts format(str, 'NAME', market.name)
+        puts format(str, 'USER', market['UNAME'])
+        puts format(str, 'GROUP', market['GNAME'])
+        puts format(str, 'STATE', market.state_str)
 
-        puts str % ["MARKET_MAD", market['MARKET_MAD']]
+        puts format(str, 'MARKET_MAD', market['MARKET_MAD'])
         puts
 
-        CLIHelper.print_header(str_h1 % "MARKETPLACE CAPACITY", false)
+        CLIHelper.print_header(str_h1 % 'MARKETPLACE CAPACITY', false)
 
-        puts str % ["TOTAL:", OpenNebulaHelper.unit_to_str(market['TOTAL_MB'].to_i,{},'M')]
-        puts str % ["FREE:",  OpenNebulaHelper.unit_to_str(market['FREE_MB'].to_i, {},'M')]
-        puts str % ["USED: ", OpenNebulaHelper.unit_to_str(market['USED_MB'].to_i, {},'M')]
+        puts format(str, 'TOTAL:', OpenNebulaHelper.unit_to_str(market['TOTAL_MB'].to_i, {}, 'M'))
+        puts format(str, 'FREE:', OpenNebulaHelper.unit_to_str(market['FREE_MB'].to_i, {}, 'M'))
+        puts format(str, 'USED: ', OpenNebulaHelper.unit_to_str(market['USED_MB'].to_i, {}, 'M'))
         puts
 
-        CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
+        CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
 
-        ["OWNER", "GROUP", "OTHER"].each { |e|
-            mask = "---"
-            mask[0] = "u" if market["PERMISSIONS/#{e}_U"] == "1"
-            mask[1] = "m" if market["PERMISSIONS/#{e}_M"] == "1"
-            mask[2] = "a" if market["PERMISSIONS/#{e}_A"] == "1"
+        ['OWNER', 'GROUP', 'OTHER'].each do |e|
+            mask = '---'
+            mask[0] = 'u' if market["PERMISSIONS/#{e}_U"] == '1'
+            mask[1] = 'm' if market["PERMISSIONS/#{e}_M"] == '1'
+            mask[2] = 'a' if market["PERMISSIONS/#{e}_A"] == '1'
 
-            puts str % [e,  mask]
-        }
+            puts format(str, e, mask)
+        end
         puts
 
-        CLIHelper.print_header(str_h1 % "MARKETPLACE TEMPLATE", false)
+        CLIHelper.print_header(str_h1 % 'MARKETPLACE TEMPLATE', false)
         puts market.template_str
 
         puts
 
-        CLIHelper.print_header("%-15s" % "MARKETAPPS")
+        CLIHelper.print_header(format('%-15s', 'MARKETAPPS'))
         market.marketapp_ids.each do |id|
-            puts "%-15s" % [id]
+            puts format('%-15s', id)
         end
     end
+
 end