shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity

feature #700: cache vm_info calls

Browse Source
This commit is contained in:
Jaime Melis 2011-06-27 19:00:21 +02:00
parent 72286ddfe3
commit 24796a077b
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vnm_mad/OpenNebulaNetwork.rb
View File

@ -41,11 +41,12 @@ COMMANDS = {
#
#
class VM
attr_accessor :nics, :filtered_nics
attr_accessor :nics, :filtered_nics, :vm_info
def initialize(vm_root, hypervisor)
@vm_root = vm_root
@hypervisor = hypervisor
@vm_info = Hash.new
nics = Nics.new(@hypervisor)
@ -58,7 +59,7 @@ class VM
end
nic.get_info(self)
nic.get_tap
nic.get_tap(self)
nics << nic
end

37
src/vnm_mad/OpenNebulaNic.rb
View File

@ -83,22 +83,24 @@ end
# that the NIC is using
class NicKVM < Hash
def initialize
@vm_info = Hash.new
super(nil)
end
def get_info(vm)
deploy_id = vm['DEPLOY_ID']
if deploy_id
@vm_info[:dumpxml] = `#{COMMANDS[:virsh]} dumpxml #{deploy_id} 2>/dev/null`
@vm_info.each_key{|k| @vm_info[k] = nil if @vm_info[k].to_s.strip.empty?}
if deploy_id and vm.vm_info[:dumpxml].nil?
vm.vm_info[:dumpxml] = `#{COMMANDS[:virsh]} dumpxml #{deploy_id} \
2>/dev/null`
vm.vm_info.each_key do |k|
vm.vm_info[k] = nil if vm.vm_info[k].to_s.strip.empty?
end
end
end
def get_tap
dumpxml = @vm_info[:dumpxml]
def get_tap(vm)
dumpxml = vm.vm_info[:dumpxml]
if dumpxml
dumpxml_root = REXML::Document.new(dumpxml).root
@ -120,28 +122,27 @@ end
# that the NIC is using
class NicXen < Hash
def initialize
@vm_info = Hash.new
super(nil)
end
def get_info(vm)
deploy_id = vm['DEPLOY_ID']
if deploy_id
@vm_info[:domid] =`#{COMMANDS[:xm]} domid #{deploy_id}`.strip
@vm_info[:networks] =`#{COMMANDS[:xm]} network-list #{deploy_id}`
@vm_info.each_key{|k| @vm_info[k] = nil if @vm_info[k].to_s.strip.empty?}
end
if deploy_id and (vm.vm_info[:domid].nil? or vm.vm_info[:networks].nil?)
vm.vm_info[:domid] =`#{COMMANDS[:xm]} domid #{deploy_id}`.strip
vm.vm_info[:networks] =`#{COMMANDS[:xm]} network-list #{deploy_id}`
@vm_info
vm.vm_info.each_key do |k|
vm.vm_info[k] = nil if vm.vm_info[k].to_s.strip.empty?
end
end
end
def get_tap
domid = @vm_info[:domid]
def get_tap(vm)
domid = vm.vm_info[:domid]
if domid
networks = @vm_info[:networks].split("\n")[1..-1]
networks = vm.vm_info[:networks].split("\n")[1..-1]
networks.each do |net|
n = net.split