vmesh 0.1.3 → 0.1.4

data/README.md

@@ -8,6 +8,27 @@ Vmesh is a Command Suite (think git) to make managing VMWare components easier a
 
 Vmesh is currently Alpha, hence the 0-dot version; it is susceptible to methods, classes and modules being renamed, added or deleted.
 
+**Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
+
+- [Command suite for VMWare](#)
+  - [What is Vmesh?](#)
+  - [THIS IS ALPHA!](#)
+  - [Setup](#)
+      - [I don't want to type my connection config every time](#)
+      - [How to setup cloning servers](#)
+      - [AMG It complains about vtypes and stuff](#)
+  - [Usage](#)
+    - [Help](#)
+    - [Create or clone](#)
+          - [IP Handling](#)
+          - [How vmesh deals with datastores](#)
+    - [Power](#)
+        - [Deleting a VM can be done with the command](#)
+    - [List](#)
+    - [Disk Usage](#)
+  - [TODOs](#)
+  - [Copyright](#)
+
 ## Setup
 
 Install the gem
@@ -145,6 +166,22 @@ List directories only
   vmesh ls -d
 ```
 
+### Disk Usage
+
+_Note_ you can use `df` or `diskspace`
+
+Display disk usage for all disks at current dc
+
+```
+  vmesh df
+```
+
+Display disk usage for all disks with 'gold' in the name
+
+```
+  vmesh df gold
+```
+
 ## TODOs
 
 * Sort out problem with upstream rbvmomi/nogokiri

data/bin/vmesh

@@ -17,7 +17,7 @@ include GLI::App
 version Vmesh::VERSION
 Vmesh.logger = Logger.new(STDOUT)
 @logger = Vmesh.logger
-
+@logger.level = Logger::WARN
 
 config_filename = '.vmesh.rc'
 
@@ -71,31 +71,10 @@ desc 'VCenter Resource Pool'
 arg_name 'vcenter resource pool'
 flag [:r,:resource_pool]
 
-commands_from 'vmesh/commands'
-
-desc 'TODO Describe destroy here'
-arg_name 'Describe arguments to destroy here'
-command :destroy do |c|
-  c.action do |global_options,options,args|
-    puts "destroy command ran"
-  end
-end
-
-desc 'TODO Describe run here'
-arg_name 'Describe arguments to run here'
-command :run do |c|
-  c.action do |global_options,options,args|
-    puts "run command ran"
-  end
-end
+desc 'Run in debug mode'
+switch [:debug]
 
-desc 'TODO Describe info here'
-arg_name 'Describe arguments to info here'
-command :info do |c|
-  c.action do |global_options,options,args|
-    puts "info command ran"
-  end
-end
+commands_from 'vmesh/commands'
 
 pre do |global,command,options,args|
   # Pre logic here
@@ -103,6 +82,8 @@ pre do |global,command,options,args|
   # chosen command
   # Use skips_pre before a command to skip this block
   # on that command only
+  @logger.level = Logger::DEBUG if global[:debug]
+
   if global[:user].to_s == ''
     not_so_secret_username = ask("Enter Username please:") {|q| q.echo = true}
     global['u'] = global[:u] = global['user'] = global[:user] = not_so_secret_username

data/lib/vmesh/commands/df.rb

@@ -0,0 +1,21 @@
+
+desc 'report datastore space usage'
+arg_name '[name]'
+
+command [:df,:diskspace] do |c|
+
+  c.action do |global_options,options,args|
+    name = ARGV.shift if ARGV.any?
+    vm_manager = Vmesh::VSphere.new global_options
+    if name.to_s == ''
+      all_datastores = Vmesh::Datastore.get_all(vm_manager.vim, vm_manager.get_datacenter(global_options[:datacenter]))
+    else
+      all_datastores = Vmesh::Datastore.get_all_matching(vm_manager.vim, name, vm_manager.get_datacenter(global_options[:datacenter]))
+    end
+    puts '%-30.30s%15.15s%15.15s%15.15s%8.8s' %  ["Name","Size","Available","Used","Use%"]
+    all_datastores.each do |ds|
+      pc_free = (ds.free_space.to_i * 100) / ds.capacity.to_i
+      puts '%-30.30s%15.15s%15.15s%15.15s%8.8s' % ["#{ds.name}","#{ds.capacity}","#{ds.free_space}","#{ds.capacity}","#{pc_free}%"]
+    end
+  end
+end

data/lib/vmesh/datastore.rb

@@ -8,7 +8,12 @@ module Vmesh
     end
 
     def self.get(vim, name, datacenter)
-      Vmesh::logger.debug "Getting datastore named #{name} at datacenter #{datacenter.name}." 
+      Vmesh::logger.debug "Getting a single datastore named #{name} at datacenter #{datacenter.name}."
+      get_all_matching(vim,name,datacenter).sort_by{ |ds| ds.free_space }.reverse.first
+    end
+
+    def self.get_all_matching(vim, name, datacenter)
+      Vmesh::logger.debug "Getting datastore matching name #{name} at datacenter #{datacenter.name}."
       stores = self.get_all(vim, datacenter).select{ |ds| ds.name == name }
       if stores.nil? or stores.empty?
         Vmesh::logger.info "No exact match found, searching for partial match"
@@ -16,9 +21,10 @@ module Vmesh
         Vmesh::logger.debug "Found #{stores.count} datastores."
         Vmesh::logger.debug "#{stores.map{|ds| "Name #{ds.name}, free space #{ds.free_space}"}}"
       end
-      stores.sort_by{ |ds| ds.free_space }.reverse.first
+      stores
     end
 
+
     def self.get_all(vim, datacenter)
       Vmesh::logger.debug "get_all datastores at #{datacenter.name}."
       vim.serviceContent.viewManager.CreateContainerView({

data/lib/vmesh/version.rb

@@ -1,3 +1,3 @@
 module Vmesh
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/vmesh/vsphere.rb

@@ -6,9 +6,17 @@ module Vmesh
   class VSphere
     attr_accessor :vim, :options
     def initialize(connection_options)
-      Vmesh::logger.debug "Opening connection to #{connection_options['host']}"
-      @vim = RbVmomi::VIM.connect connection_options
-      @options = connection_options
+      Vmesh::logger.debug "Opening connection to #{connection_options['host']} #{connection_options.inspect}"
+      opts = {
+        :host => connection_options[:host],
+        :user => connection_options[:user],
+        :password => connection_options[:password],
+        :datacenter => connection_options[:datacenter],
+        :host => connection_options[:host],
+        :insecure => connection_options[:insecure],
+      }
+      @vim = RbVmomi::VIM.connect opts
+      @options = opts
     end
 
     # Can we search through the datacenters for a machine?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmesh
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -184,6 +184,7 @@ files:
 - lib/vmesh.rb
 - lib/vmesh/commands/create.rb
 - lib/vmesh/commands/create_helpers.rb
+- lib/vmesh/commands/df.rb
 - lib/vmesh/commands/list.rb
 - lib/vmesh/commands/power.rb
 - lib/vmesh/commands/revert.rb