From c3b07bef34fb99a93c61093190a031fa3f5fa969 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Fri, 29 Apr 2011 01:12:13 +0200 Subject: [PATCH] feature #476: draft of vlan hook --- share/hooks/vlan.rb | 83 ++++++++++++++++++++++++++++++++++++++++++ share/hooks/vm_dumpxml | 48 ++++++++++++++++++++++++ share/hooks/vm_xml | 68 ++++++++++++++++++++++++++++++++++ 3 files changed, 199 insertions(+) create mode 100755 share/hooks/vlan.rb create mode 100644 share/hooks/vm_dumpxml create mode 100644 share/hooks/vm_xml diff --git a/share/hooks/vlan.rb b/share/hooks/vlan.rb new file mode 100755 index 0000000000..ac0708b3ed --- /dev/null +++ b/share/hooks/vlan.rb @@ -0,0 +1,83 @@ +#!/usr/bin/env ruby + +require 'base64' +require 'rexml/xpath' +require 'rexml/document' + +#TODO: hypervisor arg? +$hypervisor = "kvm" + +#TODO: start vlan arg? +$start_vlan = 2 + +#TODO: other possible args? + +def tag(nic, hypervisor) + if hypervisor == "kvm" + tag_kvm(nic) + #TODO: + #elsif hypervisor == "xen" + # tag_xen(nic) + end +end + +def tag_kvm(nic) + tag_id = $start_vlan + nic[:network_id].to_i + #TODO: real tag command + puts "sudo ovs-vsctl set Port #{nic[:tap]} tag=#{tag_id}" +end + +#TODO: +#def tag_xen(nic) +#end + +def get_tap(nic, hypervisor) + if hypervisor == "kvm" + get_tap_kvm(nic) + #TODO: + #elsif hypervisor == "xen" + # get_tap_xen(nic) + end +end + +def get_tap_kvm(nic) + dumpxml = File.read('vm_dumpxml') # virsh dumpxml + dumpxml_root = REXML::Document.new(dumpxml).root + + xpath = "devices/interface[@type='bridge']/" + xpath << "mac[@address='#{nic[:mac]}']/../target" + tap = dumpxml_root.elements[xpath] + + if tap + nic[:tap] = tap.attributes['dev'] + end + nic +end + +#TODO: +#def get_tap_xen(nic) +#end + +vm_xml = File.read('vm_xml') # Base64::decode64(ARGV[0]) +vm_doc = REXML::Document.new(vm_xml) +vm_root = vm_doc.root + +vm_id = vm_root.elements["ID"] + +#nics = Array.new #TODO: not needed +vm_root.elements.each("TEMPLATE/NIC") do |nic_element| + nic = Hash.new + nic_element.elements.each('*') do |nic_attribute| + key = nic_attribute.xpath.split('/')[-1].downcase.to_sym + nic[key] = nic_attribute.text + end + + next if !(nic[:bridge] and nic[:network_id]) + + nic = get_tap(nic, $hypervisor) + + if nic[:tap] + tag(nic, $hypervisor) + end + #nics << nic #TODO: not needed +end diff --git a/share/hooks/vm_dumpxml b/share/hooks/vm_dumpxml new file mode 100644 index 0000000000..1f83991158 --- /dev/null +++ b/share/hooks/vm_dumpxml @@ -0,0 +1,48 @@ + + one-1 + 95502733-f45a-aa1e-7a46-d40d0a1c88c6 + 65536 + 65536 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/kvm + + + + + +
+ + + +
+ + + + + + +
+ + + + + + +
+ + + +
+ + + + diff --git a/share/hooks/vm_xml b/share/hooks/vm_xml new file mode 100644 index 0000000000..99d39ecd35 --- /dev/null +++ b/share/hooks/vm_xml @@ -0,0 +1,68 @@ + + 1 + 11 + 0 + oneadmin + ttylinux + 1304001042 + 3 + 3 + 1304000879 + 1304000887 + one-1 + 65536 + 97 + 0 + 1236 + + + 1 + localhost + /home/jmelis/work/git/one/one/var/ + 2 + 1304000924 + 0 + vmm_kvm + tm_nfs + 1304000924 + 1304000924 + 1304000924 + 0 + 0 + 0 + 0 + +