From 7bb1a674e76b09afe53b5e7a925cdfd5d0a92175 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Fri, 9 Nov 2018 13:07:08 +0100
Subject: [PATCH] Fix regressions du to interface mac change
- mac is now a column
- the id of the input field changed from #mac_address to #mac
JIRA INFRA-639
---
app/static/js/hosts.js | 8 ++++----
app/tasks.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/static/js/hosts.js b/app/static/js/hosts.js
index 872d6cb..8336fe3 100644
--- a/app/static/js/hosts.js
+++ b/app/static/js/hosts.js
@@ -74,13 +74,13 @@ $(document).ready(function() {
$.getJSON(
$SCRIPT_ROOT + "/network/_generate_random_mac",
function(json) {
- $("#mac_address").val(json.data.mac);
- $("#mac_address").prop("readonly", true);
+ $("#mac").val(json.data.mac);
+ $("#mac").prop("readonly", true);
}
);
} else {
- $("#mac_address").val("");
- $("#mac_address").prop("readonly", false);
+ $("#mac").val("");
+ $("#mac").prop("readonly", false);
}
}
diff --git a/app/tasks.py b/app/tasks.py
index 3c7d58e..3ba23b1 100644
--- a/app/tasks.py
+++ b/app/tasks.py
@@ -90,7 +90,7 @@ def trigger_vm_creation(name, interface, memory, cores):
f"vcpus={cores}",
f"vlan_name={interface.network.vlan_name}",
f"vlan_id={interface.network.vlan_id}",
- f"mac={interface.mac.address}",
+ f"mac={interface.mac}",
]
if interface.is_ioc:
task_name = "trigger_vioc_creation"
--
GitLab