j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2025-01-15 01:45:17 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: j3d1:58e215f75532af85fd48daf254a11eb0b41bbe42
Branches Tags
j3d1:master
j3d1:v1.0
...
compare: j3d1:9a675918c683d76b621ebd405960fd4c2e3be324
Branches Tags
j3d1:master
j3d1:v1.0

4 commits
58e215f755 ... 9a675918c6

Author SHA1 Message Date
catborise
9a675918c6
Merge pull request #611 from MisterBlueBear/MAC_OUI 
Get MAC OUI from settings.py
 2023-10-20 23:37:53 +03:00
catborise
91aaa93c2b
Merge pull request #612 from MisterBlueBear/base_templates 
Fix base templates
 2023-10-20 23:31:50 +03:00
MisterBlueBear
149044a90c Fix templates - extends base.html 2023-10-18 18:04:00 -04:00
MisterBlueBear
5a211c0c56 Get MAC OUI from settings.py 2023-10-18 17:34:40 -04:00
6 changed files with 15 additions and 9 deletions
Show stats Expand all files Collapse all files

2
accounts/templates/logout.html
View file

@ -1,4 +1,4 @@
{% extends "base_auth.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% block title %} {% block title %}
{% trans "WebVirtCloud" %} - {% trans "Sign Out"%} {% trans "WebVirtCloud" %} - {% trans "Sign Out"%}

2
instances/utils.py
View file

@ -196,7 +196,7 @@ def get_dhcp_mac_address(vname):
def get_random_mac_address(): 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), random.randint(0x00, 0xFF),
random.randint(0x00, 0xFF), random.randint(0x00, 0xFF),

2
templates/403.html
View file

@ -1,4 +1,4 @@
{% extends "base_auth.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "403" %}{% endblock %} {% block title %}{% trans "403" %}{% endblock %}
{% block content %} {% block content %}

2
templates/404.html
View file

@ -1,4 +1,4 @@
{% extends "base_auth.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "404" %}{% endblock %} {% block title %}{% trans "404" %}{% endblock %}
{% block content %} {% block content %}

12
vrtManager/util.py
View file

@ -6,6 +6,8 @@ import string
import libvirt import libvirt
import lxml.etree as etree import lxml.etree as etree
from django.conf import UserSettingsHolder, settings
def is_kvm_available(xml): def is_kvm_available(xml):
kvm_domains = get_xml_path(xml, "//domain/@type='kvm'") kvm_domains = get_xml_path(xml, "//domain/@type='kvm'")
@ -15,10 +17,12 @@ def is_kvm_available(xml):
def randomMAC(): def randomMAC():
"""Generate a random MAC address.""" """Generate a random MAC address."""
# qemu MAC # qemu MAC
oui = [0x52, 0x54, 0x00] mac = settings.MAC_OUI + ":%02x:%02x:%02x" % (
random.randint(0x00, 0xFF),
mac = oui + [random.randint(0x00, 0xFF), random.randint(0x00, 0xFF), random.randint(0x00, 0xFF)] random.randint(0x00, 0xFF),
return ":".join(map(lambda x: "%02x" % x, mac)) random.randint(0x00, 0xFF),
)
return mac
def randomUUID(): def randomUUID():

2
webvirtcloud/settings.py.template
View file

@ -15,6 +15,8 @@ SECRET_KEY = ""
DEBUG = False DEBUG = False
MAC_OUI = '52:54:10'
ALLOWED_HOSTS = ["*"] ALLOWED_HOSTS = ["*"]
CSRF_TRUSTED_ORIGINS = ['http://localhost',] CSRF_TRUSTED_ORIGINS = ['http://localhost',]