mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

add support for regions and vms

Browse Source
This commit is contained in:
John Anderson
2020-10-23 01:18:04 -04:00
parent 3ba18633de
commit 22d2289ed2
9 changed files with 87 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/extras/models/models.py
View File

@@ -542,10 +542,8 @@ class ConfigContextModel(models.Model):
# Compile all config data, overwriting lower-weight values with higher-weight values where a collision occurs
data = OrderedDict()
#for context in ConfigContext.objects.get_for_object(self):
# data = deepmerge(data, context.data)
for context in self.config_contexts:
for context in self.config_context_data:
data = deepmerge(data, context)
# If the object has local config context data defined, merge it last