Change to new layout

Change-Id: I403934aa66e7ae0ced33e5bb2f8e2167086f1c66

2 files changed, 79 insertions, 4 deletions

diff --git a/lngmi.csv b/lngmi.csv
new file mode 100755
index 0000000..7f0e4f2
--- /dev/null
+++ b/lngmi.csv
@@ -0,0 +1,75 @@
+Device,Device eth port,Ethernet addr,MAC Addr,sysfs path,Notes,Switch,Switch Port,PDU,PDU Port,Serial,Serial port,Password,Uplink port,dispatcher,location,MAC address,ILO,ILO/PW,ILO Switch,ILO Sw Port

+,,,,,,,,,,,,,,,,,,,,

+lngmaster,eth0,172.27.16.10,2c:59:e5:9a:93:c0,,,2,21,UPS, ---,,,,,,,,,,,

+,eth1,,,,,,,,,,,,,,,,,,,

+lngswitch01,47,172.27.16.2,c4:71:fe:a0:68:40,,,2,22,UPS, ---,,,lngvirtual  / lngenable,,,,,,,,

+lngswitch02,24,172.27.16.3,e4:f4:c6:dd:3f:62,,,UPLINK (???????),,UPS, ---,,,admin / <nopsw>,,,,,,,,

+lngswitch03,12,172.27.16.4,f8:4f:57:03:d1:bf,,,2,23,UPS, ---,,,,,,,,,,,

+,,,,,,,,,,,,,,,,,,,,

+LNG PDU,,172.27.19.254,,,,3,24,,,,,,,,,,,,,

+LNG UPS,,172.27.19.253,,,,,,,,,,,,,,,,,,

+,,,,,,,,,,,,,,,,,,,,

+cavium (see eqpt diagram),octeth0,,02:54:71:69:f3:00,,,3,2,lngpdu01,18,localhost,7402,,,,,,,,,

+cavium*,octeth2,,02:54:71:69:f3:02,,,3,3,,,,,,,,,,,,,

+cavium*,octeth4,,02:54:71:69:f3:04,,,3,4,,,,,,,,,,,,,

+cavium*,octeth6,,02:54:71:69:f3:06,,,3,5,,,,,,,,,,,,,

+cavium*,octrgmii0,,02:54:71:69:f3:08,,,3,6,,,,,,,,,,,,,

+cavium*,octeth1,,02:54:71:69:f3:01,,,3,14,,,,,,,,,,,,,

+cavium*,octeth3,,02:54:71:69:f3:03,,,3,15,,,,,,,,,,,,,

+cavium*,octeth5,,02:54:71:69:f3:05,,,3,16,,,,,,,,,,,,,

+cavium*,octeth7,,02:54:71:69:f3:07,,,3,17,,,,,,,,,,,,,

+lng-d01-01,A,,,,,1,19,lngpdu01,5,localhost,7305,,,,,,,,,

+lng-d01-01*,B,,,,,1,20,,,,,,,,,,,,,

+lng-d01-01*,C,,,,,1,21,,,,,,,,,,,,,

+lng-d01-02,A,,0e:00:ff:0c:ff:fe,,,1,22,lngpdu01,6,localhost,7306,,,,,,,,,

+lng-d01-02*,B,,,,,1,23,,,,,,,,,,,,,

+lng-d01-02*,C,,,,,1,24,,,,,,,,,,,,,

+lng-juno-01,on-board (A),,00:02:F7:00:59:7B,,,1,44,lngpdu01,17,localhost,7315,,,,,,,,,

+lng-juno-01*,usb,,84:e7:14:00:06:36,,,1,45,,,,,,,,,,,,,

+lng-keystone-01,enet0 (A),,c4:ed:ba:9a:67:60,,,1,35,lngpdu01,13,localhost,7312,,,,,,,,,

+lng-keystone-01*,enet1 (B),,80:3f:5d:08:1a:13,,BROKEN,1,36,,,,,,,,,,,,,

+lng-keystone-01*,usb,,c4:a8:1d:6d:a3:c9,,,1,37,,,,,,,,,,,,,

+lng-keystone-02,enet0 (A),,c4:ed:ba:99:f4:09,,,1,38,lngpdu01,14,localhost,7313,,,,,,,,,

+lng-keystone-02*,enet1 (B),,c4:ed:ba:9a:8c:48,,,1,39,,,,,,,,,,,,,

+lng-keystone-02*,usb,,78:54:2e:e5:f4:49,,,1,40,,,,,,,,,,,,,

+lng-keystone-03,enet0 (A),,c4:ed:ba:9a:8c:47,,,1,41,lngpdu01,15,localhost,7314,,,,,,,,,

+lng-keystone-03*,enet1 (B),,c4:ed:ba:9a:67:61,,,1,42,,,,,,,,,,,,,

+lng-keystone-03*,usb,,c4:a8:1d:6d:a3:c8,,,1,43,,,,,,,,,,,,,

+lng-arndale-01,on-board,,,/sys/devices/12110000.usb/usb1/1-3/1-3.2/1-3.2.3/1-3.2.3:1.0/net/eth0,,1,25,lngpdu01,7,localhost,7307,,,,,,,,,

+lng-arndale-01*,usb,,,/sys/devices/12110000.usb/usb1/1-3/1-3.2/1-3.2.4/1-3.2.4:1.0/net/eth1,,1,26,,,,,,,,,,,,,

+lng-arndale-02,on-board,,,/sys/devices/12110000.usb/usb1/1-3/1-3.2/1-3.2.2/1-3.2.2:1.0/net/eth0,,1,27,lngpdu01,9,localhost,7308,,,,,,,,,

+lng-arndale-02*,usb,,,/sys/devices/12110000.usb/usb1/1-3/1-3.2/1-3.2.4/1-3.2.4:1.0/net/eth1,,1,28,,,,,,,,,,,,,

+lng-arndale-03,on-board,,,/sys/devices/12110000.usb/usb1/1-3/1-3.2/1-3.2.2/1-3.2.2:1.0/net/eth0,,1,29,lngpdu01,10,localhost,7309,,,,,,,,,

+lng-arndale-03*,usb,,,/sys/devices/12110000.usb/usb1/1-3/1-3.2/1-3.2.4/1-3.2.4:1.0/net/eth1,,1,30,,,,,,,,,,,,,

+lng-arndale-04,on-board,,,/sys/devices/12110000.usb/usb1/1-3/1-3.2/1-3.2.2/1-3.2.2:1.0/net/eth0,,1,31,lngpdu01,11,localhost,7310,,,,,,,,,

+lng-arndale-04*,usb,,,/sys/devices/12110000.usb/usb1/1-3/1-3.2/1-3.2.4/1-3.2.4:1.0/net/eth1,,1,32,,,,,,,,,,,,,

+lng-arndale-05,on-board,,,/sys/devices/12110000.usb/usb1/1-3/1-3.2/1-3.2.2/1-3.2.2:1.0/net/eth0,,1,33,lngpdu01,12,localhost,7311,,,,,,,,,

+lng-arndale-05*,usb,,,/sys/devices/12110000.usb/usb1/1-3/1-3.2/1-3.2.4/1-3.2.4:1.0/net/eth1,,1,34,,,,,,,,,,,,,

+lng-d02-01,A (copper),,00:18:82:04:00:15 ,/sys/devices/platform/soc@000000000/soc@000000000\:ethernet@5/net/eth3,UEFI,1,16,lngpdu01,3,localhost,7303,,,,,,,,,

+lng-d02-01*,B (copper),,00:18:82:05:00:15,/sys/devices/platform/soc@000000000/soc@000000000\:ethernet@4/net/eth2,UEFI,1,15,,,,,,,,,,,,,

+lng-d02-01*,C (SFP+),,,/sys/devices/platform/soc@000000000/soc@000000000\:ethernet@0/net/eth0,,2,5,,,,,,,,,,,,,

+lng-d02-01*,D (SFP+),,,/sys/devices/platform/soc@000000000/soc@000000000\:ethernet@1/net/eth1,,2,6,,,,,,,,,,,,,

+lng-d02-02,A (copper),,00:18:82:04:00:10,/sys/devices/platform/soc@000000000/soc@000000000\:ethernet@5/net/eth3,UEFI,1,18,lngpdu01,4,localhost,7304,,,,,,,,,

+lng-d02-02*,B (copper),,00:18:82:05:00:10,/sys/devices/platform/soc@000000000/soc@000000000\:ethernet@4/net/eth2,UEFI,1,17,,,,,,,,,,,,,

+lng-d02-02*,C (SFP+),,,/sys/devices/platform/soc@000000000/soc@000000000\:ethernet@0/net/eth0,,2,7,,,,,,,,,,,,,

+lng-d02-02*,D (SFP+),,,/sys/devices/platform/soc@000000000/soc@000000000\:ethernet@1/net/eth1,,2,8,,,,,,,,,,,,,

+lng-generator-01,MAC eb,,d8:9d:67:26:ae:e8,,,1,8,lngpdu01,1,localhost,7301,,,,,,,,,

+lng-generator-01*,MAC ea,,d8:9d:67:26:ae:e9,,,1,9,,,,,,,,,,,,,

+lng-generator-01*,MAC e9,,d8:9d:67:26:ae:ea,,,1,10,,,,,,,,,,,,,

+lng-generator-01*,MAC e8,,d8:9d:67:26:ae:eb,,,1,11,,,,,,,,,,,,,

+lng-generator-01*,MAC d6,,a0:36:9f:39:0b:d6,,,1,12,,,,,,,,,,,,,

+lng-generator-01*,MAC d7,,a0:36:9f:39:0b:d7,,,1,13,,,,,,,,,,,,,

+lng-generator-01*,MAC 93 (SFP+),,38:ea:a7:93:98:94,,,2,3,,,,,,,,,,,,,

+lng-generator-01*,MAC 94 (SFP+),,38:ea:a7:93:98:95,,,2,4,,,,,,,,,,,,,

+lng-generator-02,MAC db,,d8:9d:67:26:cd:d8,,,1,1,lngpdu01,2,localhost,7302,,,,,,,,,

+lng-generator-02*,MAC da,,d8:9d:67:26:cd:d9,,,1,2,,,,,,,,,,,,,

+lng-generator-02*,MAC d9,,d8:9d:67:26:cd:da,,,1,3,,,,,,,,,,,,,

+lng-generator-02*,MAC d8,,d8:9d:67:26:cd:db,,,1,4,,,,,,,,,,,,,

+lng-generator-02*,MAC 91,,a0:36:9f:3e:2d:90,,,1,5,,,,,,,,,,,,,

+lng-generator-02*,MAC 90,,a0:36:9f:3e:2d:91,,,1,6,,,,,,,,,,,,,

+lng-generator-02*,MAC a0 (SFP+),,38:ea:a7:93:83:a0,,,2,1,,,,,,,,,,,,,

+lng-generator-02*,MAC a1 (SFP+),,38:ea:a7:93:83:a1,,,2,2,,,,,,,,,,,,,

+lng-seattle-01,A (copper),,00:00:1a:1b:8b:f7,,,3,1,lngpdu01,22,localhost,7316,(main UART),,,,,,,,

+lng-seattle-01*,B (copper),,00:00:1a:1b:8b:f6,,,3,13,,,localhost,7217,(mgmt UART),,,,,,,,

+lng-seattle-01*,C (SFP+),,00:11:0a:68:94:30,,,2,9,,,,,,,,,,,,,

+lng-seattle-01*,D (SFP+),,00:11:0a:68:94:31,,,2,10,,,,,,,,,,,,,
\ No newline at end of file
diff --git a/netmap-csv.py b/netmap-csv.py
index 7c0c54d..7708c81 100755
--- a/netmap-csv.py
+++ b/netmap-csv.py
@@ -83,8 +83,8 @@ def main(args):
                 data = {'port': row['Switch Port']}
                 data['device'] = {
                     'interface': row['Device eth port'],
-                    'mac': row['Device eth MAC/unique ID'],
-                    'sysfs': '',
+                    'mac': row['MAC Addr'],
+                    'sysfs': row['sysfs path'],
                     'hostname': row['Device'].replace('*', '')
                 }
                 network['switches'][str(value)].append(data)
@@ -103,9 +103,9 @@ def main(args):
                 iface = row['Device eth port']
                 devices[name]['interfaces'].append(iface)
                 devices[name].setdefault('sysfs', {})
-                devices[name]['sysfs'][iface] = ''
+                devices[name]['sysfs'][iface] = row['sysfs path']
                 devices[name].setdefault('mac_addr', {})
-                devices[name]['mac_addr'][iface] = row['Device eth MAC/unique ID']
+                devices[name]['mac_addr'][iface] = row['MAC Addr']
                 devices[name].setdefault('tags', {})
                 devices[name]['tags'][iface] = []
                 devices[name].setdefault('map', {})