From 46a04048b54dc148d8b5538c0674d56038e00017 Mon Sep 17 00:00:00 2001
From: Dominique Roux <dominique.roux4@gmail.com>
Date: Thu, 23 Jan 2020 21:17:09 +0100
Subject: [PATCH] small changes in vm.py to make it more generic

---
 uncloud/hack/vm.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/uncloud/hack/vm.py b/uncloud/hack/vm.py
index eb75902..e8038cc 100755
--- a/uncloud/hack/vm.py
+++ b/uncloud/hack/vm.py
@@ -32,27 +32,35 @@ class VM(object):
        self.config = config
        self.db = DB(config, prefix="/vm")
 
-       self.hackprefix="/home/nico/vcs/uncloud/uncloud/hack/hackcloud"
-       self.qemu="/usr/bin/qemu-system-x86_64"
-       self.accel="kvm"
+       #TODO: Select generic 
+       self.hackprefix="/home/nico/vcs/uncloud/uncloud/hack/hackcloud" #TODO: Should be removed midterm
+       self.qemu="/usr/bin/qemu-system-x86_64" #TODO: should be in config
+       self.accel="kvm" #TODO: should be config
 
        self.vm = {}
 
 
-       self.owner="nico"
-       self.bridge="br100"
+       #TODO: this should be generic
+       self.vm['owner']="nico" #TODO: Should in config.arguments
+       #self.config['vni_hex'] = "{:x}".format(self.config.vni)
+       #self.config['bridgedev'] = "br{}".format(self.config['vni_hex'])
+       self.vni_hex = "{:x}".format(self.config.arguments['vni'])
+       self.bridgedev = "br{}".format(self.vni_hex)
 
+
+       #TODO: Touch later! (when necessary)
        self.ifup = os.path.join(self.hackprefix, "ifup.sh")
        self.ifdown = os.path.join(self.hackprefix, "ifdown.sh")
 
     def create(self):
        self.uuid = uuid.uuid4()
+       #TODO: This all should be generic
        self.vm['uuid'] = str(self.uuid)
        self.vm['memory'] = 1024
        self.vm['cores'] = 2
        self.vm['os_image'] = os.path.join(self.hackprefix, "alpine-virt-3.11.2-x86_64.iso")
 
-       self.mac=MAC().next()
+       self.mac=MAC(self.config).get_next()
 
        self.vm['commandline' ] = [ "sudo",
                                    "{}".format(self.qemu),
@@ -62,7 +70,7 @@ class VM(object):
                                    "-smp", "{}".format(self.vm['cores']),
                                    "-uuid", "{}".format(self.vm['uuid']),
                                    "-drive", "file={},media=cdrom".format(self.vm['os_image']),
-                                   "-netdev", "tap,id=netmain,script={},downscript={}".format(self.ifup, self.ifdown),
+                                   "-netdev", "tap,id=netmain,script={},downscript={},ifname={}".format(self.ifup, self.ifdown),self.mac,
                                    "-device", "virtio-net-pci,netdev=netmain,id=net0,mac={}".format(self.mac)
        ]