smartos-manager 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0871eeb3678ada4eb8003cbfad9b58e51a99276
-  data.tar.gz: 9a1468c77e3d5e63a0cf68fa8fcf987092c0e019
+  metadata.gz: 0c8b9fa9ed2240ea8a6f977e6dfd43e8d4c91b12
+  data.tar.gz: 88740a81716a7722b83917f3dfbd372e5306ae18
 SHA512:
-  metadata.gz: edffed69085bc2892f0ab771aa3c9f5bdd9e758bef82a03fabf5ecbc0e8deeca572ea260ba5feba770414d78e499735951df775dacb316ed2379aec1b32d3833
-  data.tar.gz: be161467db32d7722ce049a709518855a0e87b92be1d072c2d18001b4d77025f94b0428ce37e28d282b5f79944efb470f3437f91ecd58c7f382b8c6bac580a73
+  metadata.gz: 0fe8a42cb0ac1e8a885a2dc231fb856eda427e2efd7c66b3db5234d490c0df05a07840b27dad46a9d4bb61e8c8a8f4fa668006d5c4bcace23b84108e589d43c8
+  data.tar.gz: dfea46cad804fff9afe5e6a8f97f5a6f4e6e69580aa4a8ce8c472a63238a66ad5508d12f59ec6256426ab83d57b545262a824859fd2211d23e5401092b105219

data/lib/smartos-manager/cli.rb

@@ -77,7 +77,9 @@ class AppCLI < Thor
           vm_disk_label = "#{vm_disk[:quota]}"
         end
         
-        p_vm_list(vm.memory.human_size(1), vm.name, vm.type, vm.uuid, vm.state, vm.admin_ip, vm_disk_label, *user_columns)
+        formatted_mem = "#{vm.rss.human_size(1).ljust(5)} / #{vm.memory.human_size(1).ljust(5)}"
+        
+        p_vm_list(formatted_mem, vm.name, vm.type, vm.uuid, vm.state, vm.admin_ip, vm_disk_label, *user_columns)
       end
       
       if vms.empty?
@@ -133,7 +135,7 @@ class AppCLI < Thor
           name,
           disk_label,
           uuid,
-          format_generic(admin_ip).cyan,
+          format_generic(admin_ip).ljust(15).cyan,
           tmp
         )
       #line = "  [ #{size.rjust(6)}  #{name.ljust(35)} - #{disk_label.rjust(5)} - #{uuid.ljust(37)}][ #{format_generic(admin_ip).ljust(15).cyan} ]#{tmp}"
@@ -142,7 +144,7 @@ class AppCLI < Thor
     end
     
     def build_vm_list_string(size, name, disk_label, uuid, admin_ip, rest)
-      "  [ #{size.rjust(6)}  #{name.ljust(35)} - #{disk_label.rjust(5)} - #{uuid.ljust(37)}][ #{admin_ip.ljust(15)} ]#{rest}"
+      "  [ #{size.rjust(14)}  #{name.ljust(35)} - #{disk_label.rjust(5)} - #{uuid.ljust(37)}][ #{admin_ip} ]#{rest}"
     end
     
     def printable_state(state)

data/lib/smartos-manager/core.rb

@@ -46,15 +46,16 @@ end
 
 
 class VirtualMachine
-  attr_reader :uuid, :type, :memory, :state, :name, :admin_ip
+  attr_reader :uuid, :type, :memory, :rss, :state, :name, :admin_ip
     
-  def initialize(data = {})
+  def initialize(data = {}, rss = {})
     @uuid = data.delete('uuid')
     @type = data.delete('type')
     @memory = data.delete('ram').to_i.megabytes
     @state = data.delete('state')
     @name = data.delete('alias')
     @admin_ip = data.delete('nics.0.ip')
+    @rss = rss[@uuid]
     
     @user_data = data
   end
@@ -139,6 +140,19 @@ class HostRegistry
   def list_vms
     columns = LIST_COLUMNS + @user_columns.values
     
+    rss = {}
+    
+    # Memory used for each VM
+    run_on_all("zonememstat").each do |host, data|
+      data.split("\n").each do |line|
+        # ignore headers / global
+        unless line.start_with?('  ')
+          uuid, used_mem, cap, _, _ = line.gsub(/\s+/, ' ').split(" ")
+          rss[uuid] = used_mem.to_i.megabytes
+        end
+      end
+    end
+    
     vms = run_on_all("vmadm list -o #{columns.join(',')} -p")
     vms.each do |host, data|
       if data
@@ -148,7 +162,7 @@ class HostRegistry
             data[columns[n]] = val
           end
           
-          VirtualMachine.new(data)
+          VirtualMachine.new(data, rss)
         end
       else
         vms[host] = []

data/lib/smartos-manager/version.rb

@@ -1,3 +1,3 @@
 module SmartosManager
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartos-manager
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb