From f9d9d9de5c0fdde2b986d58549813d3bac5fed90 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Tue, 17 Jul 2018 16:25:21 +0200
Subject: [PATCH] Add model to the /network/interfaces endpoint
This is not super clean. The model and device_type belong to the host.
This is for easy access from the API.
But it would be better to have a "expand=true" query parameter and return the
host as a dict.
JIRA INFRA-414
---
app/models.py | 2 ++
tests/functional/test_api.py | 12 ++++++++++++
2 files changed, 14 insertions(+)
diff --git a/app/models.py b/app/models.py
index f01bbe7..0afa49f 100644
--- a/app/models.py
+++ b/app/models.py
@@ -958,8 +958,10 @@ class Interface(CreatedMixin, db.Model):
)
if self.host:
d["device_type"] = str(self.host.device_type)
+ d["model"] = utils.format_field(self.host.model)
else:
d["device_type"] = None
+ d["model"] = None
return d
diff --git a/tests/functional/test_api.py b/tests/functional/test_api.py
index f6b5ede..681af8d 100644
--- a/tests/functional/test_api.py
+++ b/tests/functional/test_api.py
@@ -914,6 +914,17 @@ def test_get_interfaces_by_domain(
check_input_is_subset_of_response(response, (interface3.to_dict(),))
+def test_get_interfaces_with_model(
+ client, model_factory, item_factory, host_factory, interface_factory, readonly_token
+):
+ host1 = host_factory()
+ model1 = model_factory(name="EX3400")
+ item_factory(model=model1, host_id=host1.id)
+ interface_factory(host_id=host1.id)
+ response = get(client, f"{API_URL}/network/interfaces", token=readonly_token)
+ assert response.json[0]["model"] == "EX3400"
+
+
def test_create_interface(client, network_factory, user_token):
network = network_factory(
address="192.168.1.0/24", first_ip="192.168.1.10", last_ip="192.168.1.250"
@@ -950,6 +961,7 @@ def test_create_interface(client, network_factory, user_token):
"domain",
"host",
"device_type",
+ "model",
"cnames",
"tags",
"created_at",
--
GitLab