From afa93be904fa0c6356299d1f2df5050603cab866 Mon Sep 17 00:00:00 2001
From: Travis Cotton <trcotton@lanl.gov>
Date: Thu, 4 Apr 2024 13:57:09 -0600
Subject: [PATCH 1/2] added node_prefix as an ENV option
---
dnsmasq-dhcpd-dynamic/smd.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dnsmasq-dhcpd-dynamic/smd.py b/dnsmasq-dhcpd-dynamic/smd.py
index 0c3bc51..ca3ef38 100644
--- a/dnsmasq-dhcpd-dynamic/smd.py
+++ b/dnsmasq-dhcpd-dynamic/smd.py
@@ -11,9 +11,12 @@ def getSMD(url):
return data
def getNID(c_data, xname):
+ node_prefix = os.environ['node_prefix']
+ if not node_prefix:
+ node_prefix="nid"
for c in c_data:
if xname == c['ID']:
- return 'nid'+'%0*d' % (3, c['NID'])
+ return node_prefix+'%0*d' % (3, c['NID'])
else:
return None
From e39bd57f9d9508f7dde29d94403b8ca629193eee Mon Sep 17 00:00:00 2001
From: Travis Cotton <trcotton@lanl.gov>
Date: Thu, 4 Apr 2024 14:07:29 -0600
Subject: [PATCH 2/2] better check for existing prefix
---
dnsmasq-dhcpd-dynamic/smd.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dnsmasq-dhcpd-dynamic/smd.py b/dnsmasq-dhcpd-dynamic/smd.py
index ca3ef38..579370a 100644
--- a/dnsmasq-dhcpd-dynamic/smd.py
+++ b/dnsmasq-dhcpd-dynamic/smd.py
@@ -11,8 +11,9 @@ def getSMD(url):
return data
def getNID(c_data, xname):
- node_prefix = os.environ['node_prefix']
- if not node_prefix:
+ if 'node_prefix' in os.environ:
+ node_prefix = os.environ['node_prefix']
+ else:
node_prefix="nid"
for c in c_data:
if xname == c['ID']: