smartos-manager 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 620dd7b315db17d02cf399969475a2f39ef226cc
-  data.tar.gz: 746c327581c49a14e9eb609b09031aaa69018ee3
+  metadata.gz: 37214f80056c5a2ba2bd25ecf36ead002011ec77
+  data.tar.gz: 9b7b0d614a7f81c5a9ed370c31fe411c1ed4be51
 SHA512:
-  metadata.gz: a71832d7decd80a3847c3f154fbd3c3840bc73668bc34ab001141b9a0bc3507cd288b4392f10ba1b99152a9928104b3bf004b8b17ec9e6cfe4524b00a0ded201
-  data.tar.gz: 2c91b17d667280f50191a65e5d868f2aea0be061136df3e475727dc3bba6807d9c2b6507747b857b9de226a86728ed268afdd1fc7b680e5d54b1319a84a31927
+  metadata.gz: a5797b5b333c33bb34db357f29aaaa9a369cf20f051b0754d11ba21d76a832884baec693dd933fc58e9034fe3fbbf6fc17c0defb7f452bf6a360082559713dcb
+  data.tar.gz: 3465b613e2e8f7a159e0cad40c99ff1f3b1068c15990a883f753f209cf405ac9dc672f8c8baf2491c69670f3eeb68dfdabc5742b43d82b7e6fdbce3f15a7f58e

data/README.md

@@ -14,6 +14,10 @@ a command line tool to manage SmartOS hosts.
 first you need to create a config file to define your environment:
 
 ```toml
+# show custom properties in the list
+[user_columns]
+  some_property = "customer_metadata.some_property"
+
 [global]
   # gateway_user = "root"
   gateway = "x.x.x.x"

data/lib/smartos-manager/cli.rb

@@ -11,7 +11,9 @@ class AppCLI < Thor
     
     sysinfos = registry.sysinfo()
     
-    p_vm_list("Memory", "Name", "Type", "UUID", "State", "Admin IP")
+    user_columns = registry.user_columns.keys.map{|s| humanize(s) }
+    
+    p_vm_list("Memory", "Name", "Type", "UUID", "State", "Admin IP", *user_columns)
     
     ret.each do |host, vms|
       mem = sysinfos[host][:memory]
@@ -22,7 +24,8 @@ class AppCLI < Thor
       
       puts "\n#{host.name} (#{host.address})  (#{vms.size} vms)  (Total RAM: #{mem.human_size(1).green}, Avail: #{avail.human_size(1).magenta})"
       vms.each do |vm|
-        p_vm_list(vm.memory.human_size(1), vm.name, vm.type, vm.uid, printable_state(vm.state), vm.admin_ip)
+        user_columns = registry.user_columns.values.map{|key| vm[key] }
+        p_vm_list(vm.memory.human_size(1), vm.name, vm.type, vm.uuid, printable_state(vm.state), vm.admin_ip, *user_columns)
       end
       
       if vms.empty?
@@ -38,8 +41,14 @@ class AppCLI < Thor
   
   no_tasks do
     
-    def p_vm_list(size, name, type, uuid, state, admin_ip)
-      puts "  [ #{size.rjust(6)} #{name.rjust(15)} - #{uuid.ljust(37)}][ #{admin_ip.ljust(15).cyan} ][ #{state} ]"
+    def humanize(str)
+      str.split("_").map(&:capitalize).join(' ')
+    end
+    
+    
+    def p_vm_list(size, name, type, uuid, state, admin_ip, *user_columns)
+      tmp = user_columns.map{|val| "[ #{val.to_s.ljust(15).cyan} ]" }.join('')
+      puts "  [ #{size.rjust(6)} #{name.rjust(15)} - #{uuid.ljust(37)}][ #{admin_ip.ljust(15).cyan} ]#{tmp}[ #{state} ]"
     end
     
     def printable_state(state)

data/lib/smartos-manager/core.rb

@@ -41,44 +41,31 @@ class SSHHost
     @gateway_user || user
   end
   
-# private
-#   def connection
-#     unless @connection
-#       if @gateway
-#         @gateway_obj = Net::SSH::Gateway.new(@gateway, @user)
-#         @connection = @gateway_obj.ssh(@address, @gateway_user || @user, SSH_OPTIONS)
-        
-#       else
-#         @connection = Net::SSH.start(@address, @user,  SSH_OPTIONS)
-        
-#       end
-
-#     end
-    
-#     @connection
-#   end
 end
 
 
 class VirtualMachine
-  attr_reader :uid, :type, :memory, :state, :name, :admin_ip
-  
-  def initialize(uid, type, memory, state, name, admin_ip)
-    @uid = uid
-    @type = type
-    @memory = memory.to_i.megabytes
-    @state = state
-    @name = name
-    @admin_ip = admin_ip
+  attr_reader :uuid, :type, :memory, :state, :name, :admin_ip
+    
+  def initialize(data = {})
+    @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')
+    
+    @user_data = data
   end
   
-  # 4c1ae27f-a986-4189-a2b7-5c5e6d2e26ef:OS:300:running:backup
-  def self.from_line(line)
-    new(*line.split(':'))
+  def [](key)
+    @user_data[key]
   end
 end
 
 class HostRegistry
+  attr_reader :user_columns
+  
   def initialize(path)
     @registry = {}
     @gateways = {}
@@ -86,11 +73,10 @@ class HostRegistry
     
     @connection = Net::SSH::Multi.start()
     
-    # data = Psych.load_file(path)
-    # data = TOML::Parser.new( File.read(path) ).parsed
     data = TOML.load_file(path)
     
     global_data = data.delete('global')
+    user_columns = data.delete('user_columns') || {}
     
     data.each do |name, opts|
       host = SSHHost.from_hash(name, opts, global_data)
@@ -103,6 +89,9 @@ class HostRegistry
           user: host.user,
           compression: false
         )
+      
+      # user defined columns
+      @user_columns = user_columns
     end
     
   end
@@ -124,12 +113,28 @@ class HostRegistry
     ret
   end
   
+  LIST_COLUMNS = %w(
+    uuid
+    type
+    ram
+    state
+    alias
+    nics.0.ip
+  )
+  
   def list_vms
-    vms = run_on_all("vmadm list -o uuid,type,ram,state,alias,nics.0.ip -p")
+    columns = LIST_COLUMNS + @user_columns.values
+    
+    vms = run_on_all("vmadm list -o #{columns.join(',')} -p")
     vms.each do |host, data|
       if data
         vms[host] = data.split("\n").map! do |line|
-          VirtualMachine.from_line(line)
+          data = {}
+          line.split(':', 20).each.with_index do |val, n|
+            data[columns[n]] = val
+          end
+          
+          VirtualMachine.new(data)
         end
       else
         vms[host] = []

data/lib/smartos-manager/version.rb

@@ -1,3 +1,3 @@
 module SmartosManager
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartos-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: "... ."