From b5f52d9f6e2b81d44c4b648fbdbe178981bcfca4 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Mon, 20 Aug 2018 22:17:44 +0200
Subject: [PATCH] Add host FQDN in host view
JIRA INFRA-459 #action In Progress
---
app/models.py | 11 +++++++++++
app/templates/network/view_host.html | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/app/models.py b/app/models.py
index 15cfce8..e91ebcd 100644
--- a/app/models.py
+++ b/app/models.py
@@ -943,6 +943,17 @@ class Host(CreatedMixin, db.Model):
except IndexError:
return None
+ @property
+ def fqdn(self):
+ """Return the host fully qualified domain name
+
+ The domain is based on the main interface
+ """
+ if self.main_interface:
+ return f"{self.name}.{self.main_interface.network.domain}"
+ else:
+ return self.name
+
def __str__(self):
return str(self.name)
diff --git a/app/templates/network/view_host.html b/app/templates/network/view_host.html
index 92537b6..589e924 100644
--- a/app/templates/network/view_host.html
+++ b/app/templates/network/view_host.html
@@ -22,7 +22,7 @@
<div class="col-sm-9">
<dl class="row">
<dt class="col-sm-3">Hostname</dt>
- <dd class="col-sm-9">{{ host.name }}</dd>
+ <dd class="col-sm-9">{{ host.fqdn }}</dd>
<dt class="col-sm-3">Device Type</dt>
<dd class="col-sm-9">{{ host.device_type }}</dd>
{% if host.items %}
--
GitLab