opennebula-cli 3.8.0 → 3.9.0.beta

data/lib/one_helper/onequota_helper.rb

@@ -20,60 +20,6 @@ class OneQuotaHelper
 
     EDITOR_PATH='/usr/bin/vi'
 
-    #---------------------------------------------------------------------------
-    #  Tables to format user quotas
-    #---------------------------------------------------------------------------
-    TABLE_DS = CLIHelper::ShowTable.new(nil, self) do
-        column :"DATASTORE ID", "", :size=>12 do |d|
-            d["ID"] if !d.nil?
-        end
-
-        column :"IMAGES", "", :right, :size=>20 do |d|
-            "%8d / %8d" % [d["IMAGES_USED"], d["IMAGES"]] if !d.nil?
-        end
-
-        column :"SIZE", "", :right, :size=>19 do |d|
-            "%8s / %8s" % [OpenNebulaHelper.unit_to_str(d["SIZE_USED"].to_i,{},"M"),
-                OpenNebulaHelper.unit_to_str(d["SIZE"].to_i,{},"M")] if !d.nil?
-        end
-    end
-
-    TABLE_NET = CLIHelper::ShowTable.new(nil, self) do
-        column :"NETWORK ID", "", :size=>12 do |d|
-            d["ID"] if !d.nil?
-        end
-
-        column :"LEASES", "", :right, :size=>20 do |d|
-            "%8d / %8d" % [d["LEASES_USED"], d["LEASES"]] if !d.nil?
-        end
-    end
-
-    TABLE_VM = CLIHelper::ShowTable.new(nil, self) do
-
-        column :"NUMBER OF VMS", "", :right, :size=>20 do |d|
-            "%8d / %8d" % [d["VMS_USED"], d["VMS"]] if !d.nil?
-        end
-
-        column :"MEMORY", "", :right, :size=>20 do |d|
-            "%8s / %8s" % [OpenNebulaHelper.unit_to_str(d["MEMORY_USED"].to_i,{},"M"),
-                OpenNebulaHelper.unit_to_str(d["MEMORY"].to_i,{},"M")] if !d.nil?
-        end
-
-        column :"CPU", "", :right, :size=>20 do |d|
-            "%8.2f / %8.2f" % [d["CPU_USED"], d["CPU"]] if !d.nil?
-        end
-    end
-
-    TABLE_IMG = CLIHelper::ShowTable.new(nil, self) do
-        column :"IMAGE ID", "", :size=>12 do |d|
-            d["ID"] if !d.nil?
-        end
-
-        column :"RUNNING VMS", "", :right, :size=>20 do |d|
-            "%8d / %8d" % [d["RVMS_USED"], d["RVMS"]] if !d.nil?
-        end
-    end
-
     HELP_QUOTA = <<-EOT.unindent
         #-----------------------------------------------------------------------
         # Supported quota limits:
@@ -96,18 +42,22 @@ class OneQuotaHelper
         #  ]
         #
         #  IMAGE = [
-        #    ID        = <ID of the image>
-        #    RVMS = <Max. number of VMs using the image>
+        #    ID     = <ID of the image>
+        #    RVMS   = <Max. number of VMs using the image>
         #  ]
         #
-        #  In any quota 0 means unlimited. The usage counters "*_USED" are
-        #  shown for information purposes and will NOT be modified.
+        #  In any quota:
+        #    -1 means use the default limit ('defaultquota' command)
+        #    0 means unlimited.
+        #
+        #  The usage counters "*_USED" are shown for information
+        #  purposes and will NOT be modified.
         #-----------------------------------------------------------------------
     EOT
 
     #  Edits the quota template of a resource
-    #  @param resource [PoolElement] to get the current info from
-    #  @param path [String] path to the new contents. If nil a editor will be 
+    #  @param [XMLElement] resource to get the current info from
+    #  @param [String] path to the new contents. If nil a editor will be 
     #         used
     #  @return [String] contents of the new quotas
     def self.set_quota(resource, path)
@@ -119,13 +69,6 @@ class OneQuotaHelper
             tmp  = Tempfile.new('one-cli')
             path = tmp.path
 
-            rc = resource.info
-
-            if OpenNebula.is_error?(rc)
-                puts rc.message
-                exit -1
-            end
-
             tmp << HELP_QUOTA
             tmp << resource.template_like_str("DATASTORE_QUOTA") << "\n"
             tmp << resource.template_like_str("VM_QUOTA") << "\n"
@@ -220,8 +163,9 @@ class OneQuotaHelper
 
     #  Outputs formated quota information to stdout
     #  @param qh [Hash] with the quotas for a given resource
+    #  @param default_quotas_hash [XMLElement] with the default quota limits
     #
-    def self.format_quota(qh)
+    def format_quota(qh, default_quotas)
         str_h1="%-80s"
 
         puts
@@ -230,27 +174,145 @@ class OneQuotaHelper
 
         puts
 
+        @default_quotas = default_quotas
+
         vm_quotas = [qh['VM_QUOTA']['VM']].flatten
+
         if !vm_quotas[0].nil?
-            TABLE_VM.show(vm_quotas, {})
+            CLIHelper::ShowTable.new(nil, self) do
+                column :"NUMBER OF VMS", "", :right, :size=>20 do |d|
+                    if !d.nil?
+                        elem = 'VMS'
+                        limit = d[elem]
+                        limit = helper.get_default_limit(
+                            limit, "VM_QUOTA/VM/#{elem}")
+
+                        "%8d / %8d" % [d["VMS_USED"], limit]
+                    end
+                end
+
+                column :"MEMORY", "", :right, :size=>20 do |d|
+                    if !d.nil?
+                        elem = 'MEMORY'
+                        limit = d[elem]
+                        limit = helper.get_default_limit(
+                            limit, "VM_QUOTA/VM/#{elem}")
+
+                        "%8s / %8s" % [
+                            OpenNebulaHelper.unit_to_str(d["MEMORY_USED"].to_i,{},"M"),
+                            OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")
+                        ]
+                    end
+                end
+
+                column :"CPU", "", :right, :size=>20 do |d|
+                    if !d.nil?
+                        elem = 'CPU'
+                        limit = d[elem]
+                        limit = helper.get_default_limit(
+                            limit, "VM_QUOTA/VM/#{elem}")
+
+                        "%8.2f / %8.2f" % [d["CPU_USED"], limit]
+                    end
+                end
+            end.show(vm_quotas, {})
+
             puts
         end
 
         ds_quotas = [qh['DATASTORE_QUOTA']['DATASTORE']].flatten
+
         if !ds_quotas[0].nil?
-            TABLE_DS.show(ds_quotas, {})
+            CLIHelper::ShowTable.new(nil, self) do
+                column :"DATASTORE ID", "", :size=>12 do |d|
+                    d["ID"] if !d.nil?
+                end
+
+                column :"IMAGES", "", :right, :size=>20 do |d|
+                    if !d.nil?
+                        elem = 'IMAGES'
+                        limit = d[elem]
+                        limit = helper.get_default_limit(
+                            limit, "DATASTORE_QUOTA/DATASTORE[ID=#{d['ID']}]/#{elem}")
+
+                        "%8d / %8d" % [d["IMAGES_USED"], limit]
+                    end
+                end
+
+                column :"SIZE", "", :right, :size=>19 do |d|
+                    if !d.nil?
+                        elem = 'SIZE'
+                        limit = d[elem]
+                        limit = helper.get_default_limit(
+                            limit, "DATASTORE_QUOTA/DATASTORE[ID=#{d['ID']}]/#{elem}")
+
+                        "%8s / %8s" % [
+                            OpenNebulaHelper.unit_to_str(d["SIZE_USED"].to_i,{},"M"),
+                            OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")
+                        ]
+                    end
+                end
+            end.show(ds_quotas, {})
+
             puts
         end
 
         net_quotas = [qh['NETWORK_QUOTA']['NETWORK']].flatten
+
         if !net_quotas[0].nil?
-            TABLE_NET.show(net_quotas, {})
+            CLIHelper::ShowTable.new(nil, self) do
+                column :"NETWORK ID", "", :size=>12 do |d|
+                    d["ID"] if !d.nil?
+                end
+
+                column :"LEASES", "", :right, :size=>20 do |d|
+                    if !d.nil?
+                        elem = 'LEASES'
+                        limit = d[elem]
+                        limit = helper.get_default_limit(
+                            limit, "NETWORK_QUOTA/NETWORK[ID=#{d['ID']}]/#{elem}")
+
+                        "%8d / %8d" % [d["LEASES_USED"], limit]
+                    end
+                end
+            end.show(net_quotas, {})
+
             puts
         end
 
         image_quotas = [qh['IMAGE_QUOTA']['IMAGE']].flatten
+
         if !image_quotas[0].nil?
-            TABLE_IMG.show(image_quotas, {})
+            CLIHelper::ShowTable.new(nil, self) do
+                column :"IMAGE ID", "", :size=>12 do |d|
+                    d["ID"] if !d.nil?
+                end
+
+                column :"RUNNING VMS", "", :right, :size=>20 do |d|
+                    if !d.nil?
+                        elem = 'RVMS'
+                        limit = d[elem]
+                        limit = helper.get_default_limit(
+                            limit, "IMAGE_QUOTA/IMAGE[ID=#{d['ID']}]/RVMS")
+
+                        "%8d / %8d" % [d["RVMS_USED"], limit]
+                    end
+                end
+            end.show(image_quotas, {})
         end
     end
+
+    def get_default_limit(limit, xpath)
+        if limit == "-1"
+            if !@default_quotas.nil?
+                limit = @default_quotas[xpath]
+
+                limit = "0" if limit.nil? || limit == ""
+            else
+                limit = "0"
+            end
+        end
+
+        return limit
+    end
 end

data/lib/one_helper/oneuser_helper.rb

@@ -60,10 +60,10 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                 return -1, "You have to specify the --key option"
             end
 
-            require 'ssh_auth'
+            require 'opennebula/ssh_auth'
 
             begin
-                auth = SshAuth.new(:private_key=>options[:key])
+                auth = OpenNebula::SshAuth.new(:private_key=>options[:key])
             rescue Exception => e
                 return -1, e.message
             end
@@ -74,11 +74,11 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                 return -1, "You have to specify the --cert option"
             end
 
-            require 'x509_auth'
+            require 'opennebula/x509_auth'
 
             begin
                 cert = [File.read(options[:cert])]
-                auth = X509Auth.new(:certs_pem=>cert)
+                auth = OpenNebula::X509Auth.new(:certs_pem=>cert)
             rescue Exception => e
                 return -1, e.message
             end
@@ -92,17 +92,17 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
     def self.login(username, options)
         case options[:driver]
         when OpenNebula::User::SSH_AUTH
-            require 'ssh_auth'
+            require 'opennebula/ssh_auth'
 
             options[:key]  ||= ENV['HOME']+'/.ssh/id_rsa'
 
             begin
-                auth = SshAuth.new(:private_key=>options[:key])
+                auth = OpenNebula::SshAuth.new(:private_key=>options[:key])
             rescue Exception => e
                 return -1, e.message
             end
         when OpenNebula::User::X509_AUTH
-            require 'x509_auth'
+            require 'opennebula/x509_auth'
 
             options[:cert] ||= ENV['X509_USER_CERT']
             options[:key]  ||= ENV['X509_USER_KEY']
@@ -111,12 +111,12 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                 certs = [File.read(options[:cert])]
                 key   = File.read(options[:key])
 
-                auth = X509Auth.new(:certs_pem=>certs, :key_pem=>key)
+                auth = OpenNebula::X509Auth.new(:certs_pem=>certs, :key_pem=>key)
             rescue Exception => e
                 return -1, e.message
             end
         when OpenNebula::User::X509_PROXY_AUTH
-            require 'x509_auth'
+            require 'opennebula/x509_auth'
 
             options[:proxy] ||= ENV['X509_PROXY_CERT']
 
@@ -129,7 +129,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                 rc = proxy.match(/(-+BEGIN RSA PRIVATE KEY-+\n[^-]*\n-+END RSA PRIVATE KEY-+)/)
                 key= rc[1]
 
-                auth = X509Auth.new(:certs_pem=>certs, :key_pem=>key)
+                auth = OpenNebula::X509Auth.new(:certs_pem=>certs, :key_pem=>key)
             rescue => e
                 return -1, e.message
             end
@@ -147,6 +147,13 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
     def format_pool(options)
         config_file = self.class.table_conf
 
+        system = System.new(@client)
+        default_quotas = system.get_user_quotas()
+
+        if OpenNebula::is_error?(default_quotas)
+            raise "Error retrieving the default user quotas: #{default_quotas.message}"
+        end
+
         table = CLIHelper::ShowTable.new(config_file, self) do
             column :ID, "ONE identifier for the User", :size=>4 do |d|
                 d["ID"]
@@ -166,7 +173,14 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
 
             column :VMS , "Number of VMS", :size=>9 do |d|             
                 if d.has_key?('VM_QUOTA') and d['VM_QUOTA'].has_key?('VM')
-                    "%3d / %3d" % [d['VM_QUOTA']['VM']["VMS_USED"], d['VM_QUOTA']['VM']["VMS"]]
+                    limit = d['VM_QUOTA']['VM']["VMS"]
+
+                    if limit == "-1"
+                        limit = default_quotas['VM_QUOTA/VM/VMS']
+                        limit = "0" if limit.nil? || limit == ""
+                    end
+
+                    "%3d / %3d" % [d['VM_QUOTA']['VM']["VMS_USED"], limit]
                 else
                     "-"
                 end 
@@ -174,9 +188,16 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
 
             column :MEMORY, "Total memory allocated to user VMs", :size=>17 do |d|
                 if d.has_key?('VM_QUOTA') and d['VM_QUOTA'].has_key?('VM')
+                    limit = d['VM_QUOTA']['VM']["MEMORY"]
+
+                    if limit == "-1"
+                        limit = default_quotas['VM_QUOTA/VM/MEMORY']
+                        limit = "0" if limit.nil? || limit == ""
+                    end
+
                     d['VM_QUOTA']['VM']['MEMORY_USED']
                     "%7s / %7s" % [OpenNebulaHelper.unit_to_str(d['VM_QUOTA']['VM']["MEMORY_USED"].to_i,{},"M"),
-                    OpenNebulaHelper.unit_to_str(d['VM_QUOTA']['VM']["MEMORY"].to_i,{},"M")]
+                    OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")]
                 else
                     "-"
                 end
@@ -184,7 +205,14 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
 
             column :CPU, "Total CPU allocated to user VMs", :size=>11 do |d|
                 if d.has_key?('VM_QUOTA') and d['VM_QUOTA'].has_key?('VM')
-                    "%4.0f / %4.0f" % [d['VM_QUOTA']['VM']["CPU_USED"], d['VM_QUOTA']['VM']["CPU"]]
+                    limit = d['VM_QUOTA']['VM']["CPU"]
+
+                    if limit == "-1"
+                        limit = default_quotas['VM_QUOTA/VM/CPU']
+                        limit = "0" if limit.nil? || limit == ""
+                    end
+
+                    "%4.0f / %4.0f" % [d['VM_QUOTA']['VM']["CPU_USED"], limit]
                 else
                     "-"
                 end
@@ -217,6 +245,13 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
     end
 
     def format_resource(user)
+        system = System.new(@client)
+        default_quotas = system.get_user_quotas()
+
+        if OpenNebula::is_error?(default_quotas)
+            raise "Error retrieving the default user quotas: #{default_quotas.message}"
+        end
+
         str="%-15s: %-20s"
         str_h1="%-80s"
 
@@ -237,6 +272,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
 
         user_hash = user.to_hash
 
-        OneQuotaHelper.format_quota(user_hash['USER'])
+        helper = OneQuotaHelper.new
+        helper.format_quota(user_hash['USER'], default_quotas)
     end
 end