lib/rvc/extensions/DistributedVirtualSwitch.rb in rvc-1.6.0 vs lib/rvc/extensions/DistributedVirtualSwitch.rb in rvc-1.7.0

- old
+ new

@@ -56,15 +56,15 @@ end elsif vlan.class == VIM::VmwareDistributedVirtualSwitchTrunkVlanSpec 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 = "" if !trunk_ranges.empty? str += "#{trunks} (trunked)" @@ -139,10 +139,10 @@ def children 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, {} } { 'portgroups' => portgroups, 'respools' => RVC::FakeFolder.new(self, :respool_children),