From 5a211c0c566f1b9ec64a0cf356672eb776058cf3 Mon Sep 17 00:00:00 2001
From: MisterBlueBear <51129551+MisterBlueBear@users.noreply.github.com>
Date: Wed, 18 Oct 2023 17:34:40 -0400
Subject: [PATCH] Get MAC OUI from settings.py

---
 instances/utils.py                |  2 +-
 vrtManager/util.py                | 12 ++++++++----
 webvirtcloud/settings.py.template |  2 ++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/instances/utils.py b/instances/utils.py
index f9f5dcf..19b2111 100644
--- a/instances/utils.py
+++ b/instances/utils.py
@@ -196,7 +196,7 @@ def get_dhcp_mac_address(vname):
 
 
 def get_random_mac_address():
-    mac = "52:54:00:%02x:%02x:%02x" % (
+    mac = settings.MAC_OUI + ":%02x:%02x:%02x" % (
         random.randint(0x00, 0xFF),
         random.randint(0x00, 0xFF),
         random.randint(0x00, 0xFF),
diff --git a/vrtManager/util.py b/vrtManager/util.py
index ab47f32..81cb3d5 100644
--- a/vrtManager/util.py
+++ b/vrtManager/util.py
@@ -6,6 +6,8 @@ import string
 import libvirt
 import lxml.etree as etree
 
+from django.conf import UserSettingsHolder, settings
+
 
 def is_kvm_available(xml):
     kvm_domains = get_xml_path(xml, "//domain/@type='kvm'")
@@ -15,10 +17,12 @@ def is_kvm_available(xml):
 def randomMAC():
     """Generate a random MAC address."""
     # qemu MAC
-    oui = [0x52, 0x54, 0x00]
-
-    mac = oui + [random.randint(0x00, 0xFF), random.randint(0x00, 0xFF), random.randint(0x00, 0xFF)]
-    return ":".join(map(lambda x: "%02x" % x, mac))
+    mac = settings.MAC_OUI + ":%02x:%02x:%02x" % (
+        random.randint(0x00, 0xFF),
+        random.randint(0x00, 0xFF),
+        random.randint(0x00, 0xFF),
+    )
+    return mac
 
 
 def randomUUID():
diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template
index 88146c1..d3b9fd9 100644
--- a/webvirtcloud/settings.py.template
+++ b/webvirtcloud/settings.py.template
@@ -15,6 +15,8 @@ SECRET_KEY = ""
 
 DEBUG = False
 
+MAC_OUI = '52:54:10'
+
 ALLOWED_HOSTS = ["*"]
 
 CSRF_TRUSTED_ORIGINS = ['http://localhost',]