From 13ffaae522160505b75fcfdaea662df19318fda4 Mon Sep 17 00:00:00 2001
From: "Ing. Jan KRCMAR" <honza801@civ.zcu.cz>
Date: Thu, 26 Jul 2018 11:35:37 +0200
Subject: [PATCH] instance/clone: move random_mac logic into
 instances.views.random_mac_address url ^random_mac_address/

fix instance/clone: get random mac if dhcp not found
---
 instances/templates/instance.html | 17 ++++++++---------
 instances/urls.py                 |  2 ++
 instances/views.py                | 23 ++++++++++++++++++++---
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index 13336b5..3dd9190 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -1212,14 +1212,9 @@
 </script>
 <script>
     function random_mac(net) {
-        var hexDigits = "0123456789abcdef";
-        var macAddress="52:54:00:";
-        for (var i=0; i<3; i++) {
-            macAddress+=hexDigits.charAt(Math.round(Math.random()*16));
-            macAddress+=hexDigits.charAt(Math.round(Math.random()*16));
-            if (i != 2) macAddress+=":";
-        }
-        $('input[name="clone-net-mac-'+net+'"]').val(macAddress);
+        $.getJSON('/instance/random_mac_address/', function(data) {
+            $('input[name="clone-net-mac-'+net+'"]').val(data['mac']);
+        });
     };
 </script>
 <script>
@@ -1325,7 +1320,11 @@
             $("#vdi_url").attr("href", data);
         });
     });
-{% if not request.user.is_superuser %}
+{% if request.user.is_superuser %}
+    $(document).ready(function () {
+        random_mac(0);
+    });
+{% else %}
     $('#select_clone_name').on('change', function () {
         update_clone_disk_name($(this).val());
         guess_mac_address('#select_clone_name', 0);
diff --git a/instances/urls.py b/instances/urls.py
index dfba916..4b6cb05 100644
--- a/instances/urls.py
+++ b/instances/urls.py
@@ -8,6 +8,8 @@ urlpatterns = [
         views.inst_graph, name='inst_graph'),
     url(r'^status/(?P<compute_id>[0-9]+)/(?P<vname>[\w\-\.]+)/$',
         views.inst_status, name='inst_status'),
+    url(r'^random_mac_address/$',
+        views.random_mac_address, name='random_mac_address'),
     url(r'^guess_mac_address/(?P<vname>[\w\-\.]+)/$',
         views.guess_mac_address, name='guess_mac_address'),
     url(r'^guess_clone_name/$',
diff --git a/instances/views.py b/instances/views.py
index fbec724..3f35da4 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -5,7 +5,7 @@ import socket
 import crypt
 import re
 import string
-from random import choice
+import random
 from bisect import insort
 from django.http import HttpResponse, HttpResponseRedirect
 from django.core.urlresolvers import reverse
@@ -901,7 +901,7 @@ def inst_graph(request, compute_id, vname):
 
 def _get_dhcp_mac_address(vname):
     dhcp_file = '/srv/webvirtcloud/dhcpd.conf'
-    mac = '52:54:00:'
+    mac = ''
     if os.path.isfile(dhcp_file):
         with open(dhcp_file, 'r') as f:
             name_found = False
@@ -916,7 +916,24 @@ def _get_dhcp_mac_address(vname):
 @login_required
 def guess_mac_address(request, vname):
     data = { 'vname': vname }
-    data['mac'] = _get_dhcp_mac_address(vname)
+    mac = _get_dhcp_mac_address(vname)
+    if not mac:
+        mac = _get_random_mac_address()
+    data['mac'] = mac
+    return HttpResponse(json.dumps(data))
+
+def _get_random_mac_address():
+    mac = '52:54:00:%02x:%02x:%02x' % (
+        random.randint(0x00, 0xff),
+        random.randint(0x00, 0xff),
+        random.randint(0x00, 0xff)
+    )
+    return mac
+
+@login_required
+def random_mac_address(request):
+    data = {}
+    data['mac'] = _get_random_mac_address()
     return HttpResponse(json.dumps(data))
 
 @login_required