From f62da2870adb71226fedb9c43ebc4176dccd5bd4 Mon Sep 17 00:00:00 2001
From: Andreas Karis <akaris@redhat.com>
Date: Wed, 9 Aug 2017 16:07:40 -0400
Subject: [PATCH] Case insentitive MAC address matching in OsNetConfigMappings

OsNetConfigMappings should be case insensitive in
os-net-config-mappings.yaml
This patch casts all MAC addresses to lower case.

Change-Id: Ide18660a3a8063cfdf53500cd727c8f49407b436
Closes-Bug: 1709653
(cherry picked from commit 397a5cc207cf69778d80391f2865619d525b2368)
---
 firstboot/os-net-config-mappings.yaml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/firstboot/os-net-config-mappings.yaml b/firstboot/os-net-config-mappings.yaml
index caf1842176..ae5ca2dc8a 100644
--- a/firstboot/os-net-config-mappings.yaml
+++ b/firstboot/os-net-config-mappings.yaml
@@ -75,6 +75,9 @@ resources:
               with open('/etc/os-net-config/mapping.yaml', 'w') as f:
                 yaml.safe_dump(interface_mapping, f,  default_flow_style=False)
 
+            # cast to lower case for MAC address match
+            eth_addr='$eth_addr'.lower()
+
             input = sys.stdin.readline() or '{}'
             data = json.loads(input)
             for node in data:
@@ -84,10 +87,15 @@ resources:
                 del interface_mapping['interface_mapping']['dmiString']
               if 'id' in interface_mapping['interface_mapping']:
                 del interface_mapping['interface_mapping']['id']
-              # Match on mac addresses first
-              if any(x in '$eth_addr'.split(',') for x in data[node].values()):
-                write_mapping_file(interface_mapping)
+
+              # Match on mac addresses first - cast all to lower case
+              lc_interface_mapping = copy.deepcopy(interface_mapping)
+              for key,x in lc_interface_mapping['interface_mapping'].items():
+                lc_interface_mapping['interface_mapping'][key] = x.lower()
+              if any(x in eth_addr.split(',') for x in lc_interface_mapping['interface_mapping'].values()):
+                write_mapping_file(lc_interface_mapping)
                 break
+
               # If data contain dmiString and id keys, try to match node(group)
               if 'dmiString' in data[node] and 'id' in data[node]:
                 ps = Popen([ 'dmidecode',
@@ -95,7 +103,7 @@ resources:
                              stdout=PIPE)
                 out, err = ps.communicate()
                 if data[node].get('id') == out.rstrip():
-                  write_mapping_file(interface_mapping)
+                  write_mapping_file(lc_interface_mapping)
                   break
             "
           params: