[Config] Auto detect hostname unless overridden

django_netjsonconfig/models/config.py

@@ -1,6 +1,7 @@
 import json
 import hashlib
 import collections
+from copy import deepcopy
 
 from django.db import models
 from django.core.exceptions import ValidationError
@@ -41,6 +42,8 @@ class AbstractConfig(TimeStampedEditableModel):
                        load_kwargs={'object_pairs_hook': collections.OrderedDict},
                        dump_kwargs={'indent': 4})
 
+    __template__ = False
+
     class Meta:
         abstract = True
 
@@ -63,6 +66,19 @@ def clean(self):
         else:
             self.validate_netjsonconfig_backend(backend)
 
+    def get_config(self):
+        """
+        config preprocessing (skipped for templates):
+            * inserts hostname automatically if not defined
+        """
+        if self.__template__:
+            return self.config
+        c = deepcopy(self.config)
+        c.setdefault('general', {})
+        if 'hostname' not in c['general']:
+            c['general']['hostname'] = self.name
+        return c
+
     @classmethod
     def validate_netjsonconfig_backend(self, backend):
         """
@@ -95,7 +111,7 @@ def get_backend_instance(self, template_instances=None):
         needed for pre validation of m2m
         """
         backend = self.backend_class
-        kwargs = {'config': self.config}
+        kwargs = {'config': self.get_config()}
         # determine if we can pass templates
         # expecting a many2many relationship
         if hasattr(self, 'templates'):

django_netjsonconfig/models/template.py

@@ -9,6 +9,8 @@ class BaseTemplate(AbstractConfig):
     Abstract model implementing a
     netjsonconfig template
     """
+    __template__ = True
+
     class Meta:
         abstract = True
 

django_netjsonconfig/tests/test_config.py

@@ -199,3 +199,18 @@ def test_status_modified_after_templates_changed(self):
         c.templates.remove(t)
         c.refresh_from_db()
         self.assertEqual(c.status, 'modified')
+
+    def test_auto_hostname(self):
+        c = Config(name='automate-me',
+                   backend='netjsonconfig.OpenWrt',
+                   config={'general': {}},
+                   key=self.TEST_KEY)
+        c.full_clean()
+        c.save()
+        expected = {
+            'type': 'DeviceConfiguration',
+            'general': {'hostname': 'automate-me'}
+        }
+        self.assertDictEqual(c.backend_instance.config, expected)
+        c.refresh_from_db()
+        self.assertDictEqual(c.config, {'general': {}})

django_netjsonconfig/tests/test_template.py

@@ -36,7 +36,7 @@ def test_backend_class(self):
         self.assertIs(t.backend_class, OpenWrt)
 
     def test_backend_instance(self):
-        config = {'general':{'hostname':'template'}}
+        config = {'general': {'hostname': 'template'}}
         t = Template(name='test', backend='netjsonconfig.OpenWrt', config=config)
         self.assertIsInstance(t.backend_instance, OpenWrt)
 
@@ -64,3 +64,9 @@ def test_config_status_modified_after_change(self):
         t.save()
         c.refresh_from_db()
         self.assertEqual(c.status, 'modified')
+
+    def test_no_auto_hostname(self):
+        t = self._create_template()
+        self.assertNotIn('general', t.backend_instance.config)
+        t.refresh_from_db()
+        self.assertNotIn('general', t.config)