particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vm: clone mac address via xml

Browse source 
Fixes: https://pagure.io/koji/issue/2289
This commit is contained in:
Tomas Kopecek 2020-05-29 08:45:11 +02:00
parent 2778b7ac25
commit bb0ea0d6d5
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
vm/kojivmd
View file

@ -492,6 +492,10 @@ class VMExecTask(BaseTaskHandler):
curr_mem_node = ctx.xpathEval('/domain/currentMemory')[0]
if str(mem) != curr_mem_node.getContent():
curr_mem_node.setContent(str(mem))
if opts.get('static_mac'):
mac = opts['static_mac']
mac_node = ctx.xpathEval('/domain/devices/interface/mac')[0]
mac_node.setProp('address', mac)
fixed_xml = str(doc)
ctx.xpathFreeContext()
doc.freeDoc()
@ -517,7 +521,9 @@ class VMExecTask(BaseTaskHandler):
if opts.get('static_mac'):
orig_mac = self.macAddr(orig_vm)
cmd += ["--mac", orig_mac]
#doesn't work anymore, needs to place mac address inside the xml
#cmd += ["--mac", orig_mac]
opts['static_mac'] = orig_mac
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, close_fds=True)