rvc 1.6.0 → 1.7.0

data/lib/rvc/connection.rb

@@ -0,0 +1,48 @@
+# Copyright (c) 2012 VMware, Inc.  All Rights Reserved.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module RVC
+
+# This module should be mixed in with all connection classes.
+module Connection
+  include InventoryObject
+
+  module ClassMethods
+    include InventoryObject::ClassMethods
+
+    def folder?
+      true
+    end
+  end
+
+  def self.included m
+    m.extend ClassMethods
+  end
+
+  def _connection
+    self
+  end
+end
+
+class NullConnection
+  include Connection
+end
+
+end

data/lib/rvc/extensions/DistributedVirtualPortgroup.rb

@@ -217,7 +217,7 @@ class RbVmomi::VIM::DistributedVirtualPortgroup
         puts ""
       end
       child.rvc_link self, name
-      CMD.mark.mark i.to_s, [child]
+      $shell.cmds.mark.mark i.to_s, [child]
       i += 1
     end
   end

data/lib/rvc/extensions/DistributedVirtualSwitch.rb

@@ -58,11 +58,11 @@ class RbVmomi::VIM::DistributedVirtualSwitch
           vlan.vlanId.each { |range| trunk_ranges << Range.new(range.start,range.end) }
         end
       end
-      trunks = RVC::MODULES['vds'].merge_ranges(trunk_ranges).map { |r|
+      trunks = $shell.cmds.vds.merge_ranges(trunk_ranges).map { |r|
         if r.begin == r.end then "#{r.begin}" else "#{r.begin}-#{r.end}" end
       }.join ','
 
-      tags = RVC::MODULES['vds'].merge_ranges(tag_ranges).map { |r|
+      tags = $shell.cmds.vds.merge_ranges(tag_ranges).map { |r|
         if r.begin == r.end then "#{r.begin}" else "#{r.begin}-#{r.end}" end
       }.join ','
       str = ""
@@ -141,7 +141,7 @@ class RbVmomi::VIM::DistributedVirtualSwitch
     portgroups = RVC::FakeFolder.new(self, :portgroup_children)
     portgroups.define_singleton_method :display_info, lambda {
       vds = self.rvc_parent
-      RVC::MODULES['basic'].table vds.portgroup, {}
+      $shell.cmds.basic.table vds.portgroup, {}
     }
 
     {

data/lib/rvc/extensions/HostSystem.rb

@@ -31,7 +31,97 @@ class RbVmomi::VIM::HostSystem
     " (host): cpu #{numCpuPkgs}*#{numCpuCores}*#{"%.2f" % (cpuMhz.to_f/1000)} GHz, memory #{"%.2f" % (memorySize/10**9)} GB"
   end
 
+  field 'state.connection' do
+    summary "State of connection to VC."
+    property 'runtime.connectionState'
+  end
+
+  field 'state.power' do
+    summary "Host power state."
+    property 'runtime.powerState'
+  end
+
+  field 'uptime' do
+    summary "Host's uptime in days"
+    properties %w(runtime.bootTime)
+    block { |t| t ? MetricNumber.new(((Time.now-t) / (24 * 60 * 60)), 'd') : nil }
+  end
+
+  field 'num.vms' do
+    summary "Number of VMs on the host"
+    properties %w(vm)
+    block { |t| t ? t.length : nil }
+  end
+
+  field 'num.poweredonvms' do
+    summary "Number of VMs on the host"
+    properties %w(vm)
+    block do |vms|
+      if vms && vms.length > 0
+        conn = vms.first._connection
+        pc = conn.propertyCollector
+        vmsProps = pc.collectMultiple(vms, 'runtime.powerState')
+        vmsProps.select{|vm, p| p['runtime.powerState'] == 'poweredOn'}.length 
+      end 
+    end
+  end
+
+  field 'cpuusage' do
+    summary "Realtime CPU usage in percent"
+    properties %w(summary.hardware.numCpuCores summary.hardware.cpuMhz summary.quickStats)
+    block do |cores, mhz, stats|
+      if cores && mhz && stats
+        value = stats.overallCpuUsage.to_f * 100 / (cores * mhz)
+        MetricNumber.new(value, '%')
+      end 
+    end
+  end
+
+  field 'memusage' do
+    summary "Realtime Mem usage in percent"
+    properties %w(summary.hardware.memorySize summary.quickStats)
+    block do |mem, stats|
+      if mem && stats
+        value = stats.overallMemoryUsage.to_f * 100 / (mem / 1024.0 / 1024.0)
+        MetricNumber.new(value, '%')
+      end 
+    end
+  end
+
+  [['.realtime', 1], ['.5min', 5 * 3], ['.10min', 10 * 3]].each do |label, max_samples|
+    field "cpuusage#{label}" do
+      summary "CPU Usage in Percent"
+      perfmetrics %w(cpu.usage)
+      perfmetric_settings :max_samples => max_samples
+      block do |value|
+        if value
+          value = value.sum.to_f / value.length / 100
+          MetricNumber.new(value, '%')
+        else
+          nil
+        end
+      end
+    end
+  end
+  
+  [['.realtime', 1], ['.5min', 5 * 3], ['.10min', 10 * 3]].each do |label, max_samples|
+    field "memusage#{label}" do
+      summary "Mem Usage in Percent"
+      perfmetrics %w(mem.usage)
+      perfmetric_settings :max_samples => max_samples
+      block do |value|
+        if value
+          value = value.sum.to_f / value.length / 100
+          MetricNumber.new(value, '%')
+        else
+          nil
+        end
+      end
+    end
+  end
+
   def display_info
+    super
     summary = self.summary
     runtime = summary.runtime
     stats = summary.quickStats

data/lib/rvc/extensions/VirtualMachine.rb

@@ -28,26 +28,34 @@ class RbVmomi::VIM::VirtualMachine
   
   field 'storagebw' do
     summary "Storage Bandwidth"
-    perfmetrics %w(disk.read.average disk.write.average)
+    perfmetrics %w(virtualDisk.read virtualDisk.write)
     block do |read, write| 
       if read && write
-        io = (read.sum.to_f / read.length) + (write.sum.to_f / write.length)
-        MetricNumber.new(io * 1024, 'B/s')
+        read = read.select{|x| x != -1}
+        write = write.select{|x| x != -1}
+        if read.length > 0 && write.length > 0
+          io = (read.sum.to_f / read.length) + (write.sum.to_f / write.length)
+          MetricNumber.new(io * 1024, 'B/s')
+        end
       else
         nil
       end
     end
   end
   
-  [['', 5], ['.realtime', 1], ['.5min', 5 * 3], ['.10min', 10 * 3]].each do |label, max_samples|
+  [['', 5], ['.realtime', 3], ['.5min', 5 * 3], ['.10min', 10 * 3]].each do |label, max_samples|
     field "storageiops#{label}" do
       summary "Storage IOPS"
-      perfmetrics %w(disk.numberReadAveraged.average disk.numberWriteAveraged.average)
+      perfmetrics %w(virtualDisk.numberReadAveraged virtualDisk.numberWriteAveraged)
       perfmetric_settings :max_samples => max_samples
       block do |read, write|
         if read && write
-          io = (read.sum.to_f / read.length) + (write.sum.to_f / write.length)
-          MetricNumber.new(io, 'IOPS')
+          read = read.select{|x| x != -1}
+          write = write.select{|x| x != -1}
+          if read.length > 0 && write.length > 0
+            io = (read.sum.to_f / read.length) + (write.sum.to_f / write.length)
+            MetricNumber.new(io, 'IOPS')
+          end
         else
           nil
         end
@@ -55,6 +63,24 @@ class RbVmomi::VIM::VirtualMachine
     end
   end
 
+  ['Read', 'Write'].each do |type|
+  [['', 5], ['.realtime', 1], ['.5min', 5 * 3], ['.10min', 10 * 3]].each do |label, max_samples|
+    field "storagelatency.#{type.downcase}#{label}" do
+      summary "Storage Latency #{type}"
+      perfmetrics ["virtualDisk.total#{type}Latency"]
+      perfmetric_settings :max_samples => max_samples
+      block do |latency|
+        if latency
+          io = (latency.sum.to_f / latency.length)
+          MetricNumber.new(io, 'ms')
+        else
+          nil
+        end
+      end
+    end
+  end
+  end
+
   field 'ip' do
     summary "The guest tools reported IP address."
     property 'guest.ipAddress'
@@ -157,6 +183,10 @@ class RbVmomi::VIM::VirtualMachine
     storage.perDatastoreUsage.map do |usage|
       puts " #{usage.datastore.name}: committed=#{usage.committed.metric}B uncommitted=#{usage.uncommitted.metric}B unshared=#{usage.unshared.metric}B"
     end
+    
+    if runtime.dasVmProtection
+      puts "HA protected: #{runtime.dasVmProtection.dasProtected ? 'yes' : 'no'}"
+    end
   end
 
   def self.ls_properties

data/lib/rvc/field.rb

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'set'
+
 module RVC
 
 module ObjectWithFields
@@ -39,24 +41,69 @@ module ObjectWithFields
       @fields[name] = RVC::Field.new(name).tap { |f| f.instance_eval &b }
     end
   end
+  
+  def field_properties names
+    out = []
+    names.each do |name|
+      name = name.to_s
+      field = self.class.fields[name]
+      if field == nil
+        nil
+      elsif self.class < VIM::ManagedObject
+        out += field.properties
+      end
+    end
+    out.uniq
+  end
+  
+  def perfmetrics names
+    out = []
+    names.each do |name|
+      name = name.to_s
+      field = self.class.fields[name]
+      if field == nil
+        nil
+      else
+        perfmetrics = field.perfmetrics 
+        if perfmetrics.length > 0
+          perfopts = field.perfmetric_settings.dup
+          perfopts[:max_samples] ||= 5
+          out << {:metrics => perfmetrics, :opts => perfopts}
+        end
+      end
+    end
+    out.uniq
+  end
 
-  def field name
+  def field name, props_values = {}, perf_values = {}
     name = name.to_s
     field = self.class.fields[name]
     if field == nil
       return nil
     elsif self.class < VIM::ManagedObject
-      *props = collect *field.properties
-      if field.perfmetrics.length > 0
-        perfmgr = self._connection.serviceContent.perfManager
-        perfopts = field.perfmetric_settings.dup
-        perfopts[:max_samples] ||= 5
-        stats = perfmgr.retrieve_stats [self], field.perfmetrics, perfopts
-        props += field.perfmetrics.map do |x| 
-          if stats[self] 
-            stats[self][:metrics][x]
-          else
-            nil
+      properties = field.properties
+      if properties.all?{|x| props_values.has_key?(x)}
+        props = properties.map{|x| props_values[x]}
+      else
+        *props = collect *field.properties
+      end
+      perfmetrics = field.perfmetrics
+      if perfmetrics.length > 0
+        if perfmetrics.all?{|x| perf_values.has_key?(x)}
+          props += perfmetrics.map do |x| 
+            perf_values[x]
+          end
+        else
+          perfmgr = self._connection.serviceContent.perfManager
+          perfopts = field.perfmetric_settings.dup
+          perfopts[:max_samples] ||= 5
+          stats = perfmgr.retrieve_stats [self], field.perfmetrics, perfopts
+          props += field.perfmetrics.map do |x| 
+            if stats[self] 
+              stats[self][:metrics][x]
+            else
+              nil
+            end
           end
         end
       end

data/lib/rvc/fs.rb

@@ -21,7 +21,7 @@
 module RVC
 
 class FS
-  attr_reader :root, :cur
+  attr_reader :root, :cur, :marks
 
   MARK_PATTERN = /^~(?:([\d\w]*|~|@))$/
   REGEX_PATTERN = /^%/
@@ -31,6 +31,7 @@ class FS
     fail unless root.is_a? RVC::InventoryObject
     @root = root
     @cur = root
+    @marks = {}
   end
 
   def display_path
@@ -39,7 +40,7 @@ class FS
 
   def cd dst
     fail unless dst.is_a? RVC::InventoryObject
-    $shell.session.set_mark '~', [@cur]
+    @marks['~'] = [@cur]
     @cur = dst
   end
 
@@ -70,7 +71,7 @@ class FS
       # XXX shouldnt be nil
       [(cur.respond_to?(:parent) && cur.parent) ? cur.parent : (cur.rvc_parent || cur)]
     when MARK_PATTERN
-      if first and objs = $shell.session.get_mark($1)
+      if first and objs = @marks[$1]
         objs
       else
         []
@@ -83,7 +84,7 @@ class FS
       cur.children.select { |k,v| k =~ regex }.map { |k,v| v.rvc_link(cur, k); v }
     else
       # XXX check for ambiguous child
-      if first and arc =~ /^\d+$/ and objs = $shell.session.get_mark(arc)
+      if first and arc =~ /^\d+$/ and objs = @marks[arc]
         objs
       else
         if child = cur.traverse_one(arc)
@@ -96,6 +97,35 @@ class FS
     end
   end
 
+  def delete_numeric_marks
+    @marks.reject! { |k,v| k =~ /^\d+$/ }
+  end
+
+  # Utility methods
+
+  def lookup_single path
+    objs = lookup path
+    Util.err "Not found: #{path.inspect}" if objs.empty?
+    Util.err "More than one match for #{path.inspect}" if objs.size > 1
+    objs.first
+  end
+
+  def lookup! path, types
+    types = [types] unless types.is_a? Enumerable
+    lookup(path).tap do |objs|
+      objs.each do |obj|
+        Util.err "Expected #{types*'/'} but got #{obj.class} at #{path.inspect}" unless types.any? { |type| obj.is_a? type }
+      end
+    end
+  end
+
+  def lookup_single! path, type
+    objs = lookup!(path, type)
+    Util.err "Not found: #{path.inspect}" if objs.empty?
+    Util.err "More than one match for #{path.inspect}" if objs.size > 1
+    objs.first
+  end
+
 private
 
   def glob_to_regex str

data/lib/rvc/inventory.rb

@@ -139,8 +139,12 @@ end
 class RootNode
   include RVC::InventoryObject
 
+  def initialize shell
+    @shell = shell
+  end
+
   def children
-    $shell.connections
+    @shell.connections
   end
 
   def self.folder?

data/lib/rvc/modules/alarm.rb

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'rvc/vim'
+
 opts :show do
   summary "Show alarms on the given entities"
   arg :entity, nil, :lookup => VIM::ManagedEntity, :multi => true