From 2197a2467d3c01a24a191be2832dccc5b0d7440b Mon Sep 17 00:00:00 2001
From: davidplunkett <dp7642@att.com>
Date: Thu, 7 Mar 2019 18:17:56 +0000
Subject: [PATCH] make mac optional in template and fix yaml checks

Change-Id: If6dcc008d273b83b7756d2eb20a9de9bc2e0d8f0
Signed-off-by: davidplunkett <dp7642@att.com>
---
 scripts/update_bios_settings.py | 45 +++++++++++++++++++++--------------------
 tools/j2/serverrc.j2            |  2 ++
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/scripts/update_bios_settings.py b/scripts/update_bios_settings.py
index ecd510b..81ca8c1 100644
--- a/scripts/update_bios_settings.py
+++ b/scripts/update_bios_settings.py
@@ -43,25 +43,26 @@ def create_rc_masters(source, target_suffix):
   env.trim_blocks = True
   env.lstrip_blocks = True
 
-  for master in yaml['masters'] and type(yaml['masters']) is list:
-    with open(source) as fd:
-      template = env.from_string(fd.read())
-    data = template.render(yaml=master)
-    target_file = "server-config/"+master['name']+target_suffix
-    print target_file
-    if os.path.exists(target_file):
-      print 'rc file exists maynot be new node'
-      continue
-    if not os.path.exists(os.path.dirname(target_file)):
-      os.makedirs(os.path.dirname(target_file))
-    fd2 = open(target_file,'w')
-    fd2.write(data)
-    fd2.write("\n")
-    fd2.close()
-    print '{0} -> {1}'.format(source, target_file)
-    command = '/opt/akraino/tools/apply_dellxml.sh --rc {0} --template dell_r740_g14_uefi_base.xml.template --no-confirm'.format(target_file)
-    print 'command: {0}'.format(command)
-    os.system(command)
+  if 'masters' in yaml and type(yaml['masters']) is list:
+    for master in yaml['masters']:
+      with open(source) as fd:
+        template = env.from_string(fd.read())
+      data = template.render(yaml=master)
+      target_file = "server-config/"+master['name']+target_suffix
+      print target_file
+      if os.path.exists(target_file):
+        print 'rc file exists maynot be new node'
+        continue
+      if not os.path.exists(os.path.dirname(target_file)):
+        os.makedirs(os.path.dirname(target_file))
+      fd2 = open(target_file,'w')
+      fd2.write(data)
+      fd2.write("\n")
+      fd2.close()
+      print '{0} -> {1}'.format(source, target_file)
+      command = '/opt/akraino/tools/apply_dellxml.sh --rc {0} --template dell_r740_g14_uefi_base.xml.template --no-confirm'.format(target_file)
+      print 'command: {0}'.format(command)
+      os.system(command)
 
 def create_rc_workers(source, target_suffix):
   env = jinja2.Environment()
@@ -69,11 +70,11 @@ def create_rc_workers(source, target_suffix):
   env.lstrip_blocks = True
 
   if 'workers' in yaml and type(yaml['workers']) is list:
-    for master in yaml['workers']:
+    for worker in yaml['workers']:
       with open(source) as fd:
         template = env.from_string(fd.read())
-      data = template.render(yaml=master)
-      target_file = "server-config/"+master['name']+target_suffix
+      data = template.render(yaml=worker)
+      target_file = "server-config/"+worker['name']+target_suffix
       print target_file
       if os.path.exists(target_file):
         print 'rc file exists maynot be new node'
diff --git a/tools/j2/serverrc.j2 b/tools/j2/serverrc.j2
index 873442a..3f68e92 100644
--- a/tools/j2/serverrc.j2
+++ b/tools/j2/serverrc.j2
@@ -31,7 +31,9 @@ SRV_OOB_USR={{yaml.ipmi_admin.username}}
 SRV_OOB_PWD={{yaml.ipmi_admin.password}}
 
 # mac address of server to be used during the build - not required for Dell servers
+{% if 'genesis.mac_address' in yaml %}
 SRV_MAC={{yaml.genesis.mac_address}}
+{% endif %}
 
 # name of network interface used during build when ipxe.efi is booted and when os is booted
 # ipxe numbers ports from 0-n in pci bus order.
-- 
2.16.6