Add related object context to Zabbix tag and hostgroup templates

nbxsync/models/zabbixhostgroupassignment.py

@@ -51,9 +51,20 @@ def save(self, *args, **kwargs):
     def get_context(self, **extra_context):
         context = {
             'object': self.assigned_object,
+            'device': self.assigned_object,
             'value': self.zabbixhostgroup.value,
             'name': self.zabbixhostgroup.name,
         }
+        if hasattr(self.assigned_object, 'site'):
+            context['site'] = self.assigned_object.site
+        if hasattr(self.assigned_object, 'tenant'):
+            context['tenant'] = self.assigned_object.tenant
+        if hasattr(self.assigned_object, 'role'):
+            context['role'] = self.assigned_object.role
+        if hasattr(self.assigned_object, 'device_type'):
+            context['device_type'] = self.assigned_object.device_type
+            if hasattr(self.assigned_object.device_type, 'manufacturer'):
+                context['manufacturer'] = self.assigned_object.device_type.manufacturer
         context.update(extra_context)
         return context
 

nbxsync/models/zabbixtagassignment.py

@@ -80,11 +80,22 @@ def save(self, *args, **kwargs):
     def get_context(self, **extra_context):
         context = {
             'object': self.assigned_object,
+            'device': self.assigned_object,
             'tag': self.zabbixtag.tag,
             'value': self.zabbixtag.value,
             'name': self.zabbixtag.name,
             'description': self.zabbixtag.description,
         }
+        if hasattr(self.assigned_object, 'site'):
+            context['site'] = self.assigned_object.site
+        if hasattr(self.assigned_object, 'tenant'):
+            context['tenant'] = self.assigned_object.tenant
+        if hasattr(self.assigned_object, 'role'):
+            context['role'] = self.assigned_object.role
+        if hasattr(self.assigned_object, 'device_type'):
+            context['device_type'] = self.assigned_object.device_type
+            if hasattr(self.assigned_object.device_type, 'manufacturer'):
+                context['manufacturer'] = self.assigned_object.device_type.manufacturer
         context.update(extra_context)
         return context
 

nbxsync/tests/models/test_zabbixhostgroupassignment.py

@@ -88,8 +88,20 @@ def test_get_context_keys(self):
         assignment = ZabbixHostgroupAssignment.objects.create(zabbixhostgroup=self.group, assigned_object_type=self.device_ct, assigned_object_id=self.device.id)
         context = assignment.get_context()
         self.assertIn('object', context)
+        self.assertIn('device', context)
         self.assertIn('value', context)
         self.assertIn('name', context)
+        self.assertEqual(context['device'], self.device)
+
+    def test_render_can_use_related_device_context(self):
+        self.group.value = '{{ site.name }}/{{ device.name }}'
+        self.group.save()
+
+        assignment = ZabbixHostgroupAssignment.objects.create(zabbixhostgroup=self.group, assigned_object_type=self.device_ct, assigned_object_id=self.device.id)
+        rendered, success = assignment.render()
+
+        self.assertTrue(success)
+        self.assertEqual(rendered, f'{self.device.site.name}/{self.device.name}')
 
     def test_render_unexpected_exception(self):
         self.group.value = '{{ object.name }}'

nbxsync/tests/models/test_zabbixtagassignment.py

@@ -83,12 +83,36 @@ def test_get_context_values(self):
         assignment = ZabbixTagAssignment.objects.create(zabbixtag=self.tag, assigned_object_type=self.device_ct, assigned_object_id=self.device.id)
         context = assignment.get_context(extra='extra_val')
         self.assertEqual(context['object'], self.device)
+        self.assertEqual(context['device'], self.device)
         self.assertEqual(context['tag'], self.tag.tag)
         self.assertEqual(context['value'], self.tag.value)
         self.assertEqual(context['name'], self.tag.name)
         self.assertEqual(context['description'], self.tag.description)
         self.assertEqual(context['extra'], 'extra_val')
 
+    def test_get_context_includes_related_device_objects(self):
+        self.device.device_type = self.device_type
+        self.device.save()
+
+        assignment = ZabbixTagAssignment.objects.create(zabbixtag=self.tag, assigned_object_type=self.device_ct, assigned_object_id=self.device.id)
+        context = assignment.get_context()
+
+        self.assertEqual(context['site'], self.device.site)
+        self.assertEqual(context['device_type'], self.device_type)
+        self.assertEqual(context['manufacturer'], self.manufacturer)
+
+    def test_render_can_use_related_device_context(self):
+        self.device.device_type = self.device_type
+        self.device.save()
+        self.tag.value = '{{ site.name }} - {{ device_type.model }} - {{ manufacturer.name }}'
+        self.tag.save()
+
+        assignment = ZabbixTagAssignment.objects.create(zabbixtag=self.tag, assigned_object_type=self.device_ct, assigned_object_id=self.device.id)
+        rendered, success = assignment.render()
+
+        self.assertTrue(success)
+        self.assertEqual(rendered, f'{self.device.site.name} - {self.device_type.model} - {self.manufacturer.name}')
+
     def test_str_method_with_name(self):
         assignment = ZabbixTagAssignment.objects.create(zabbixtag=self.tag, assigned_object_type=self.device_ct, assigned_object_id=self.device.id)
         expected = f'{self.tag.name} - {self.device.name}'

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nbxsync"
-version = "1.0.3"
+version = "1.0.4"
 authors = [
   { name="Opensource ICT Solutions", email="info@oicts.com" },
 ]