Removed tabs in place of simple spaces

Change-Id: I9f5f45b6f78946de8e71f404cdb398d32ce19932
Reviewed-on: https://review.linaro.org/26465
Reviewed-by: lava-bot
Reviewed-by: Luca Di Stefano <luca.distefano@linaro.org>

1 files changed, 53 insertions, 9 deletions

diff --git a/lng.validation.linaro.org/master-configs/lngmaster.lnglab/lava-server/dispatcher-config/devices/lng-generator-04.jinja2 b/lng.validation.linaro.org/master-configs/lngmaster.lnglab/lava-server/dispatcher-config/devices/lng-generator-04.jinja2
index 0e308e900..3ddf9f443 100644
--- a/lng.validation.linaro.org/master-configs/lngmaster.lnglab/lava-server/dispatcher-config/devices/lng-generator-04.jinja2
+++ b/lng.validation.linaro.org/master-configs/lngmaster.lnglab/lava-server/dispatcher-config/devices/lng-generator-04.jinja2
@@ -1,12 +1,56 @@
 {% extends 'x86.jinja2' %}
-{% set map = {'MAC 70 (QSFP+)': {'lngswitch04': 13}, 'MAC 78 (QSFP+)': {'lngswitch04': 15}, 'MAC ED (SFP+)': {'lngswitch02': 11}, 'MAC EC (SFP+)': {'lngswitch02': 19}, 'MAC 1A': {'lngswitch01': 15}, 'MAC 1B': {'lngswitch01': 10}, 'MAC 56 (SFP+)': {'lngswitch04': 3}, 'MAC 57 (SFP+)': {'lngswitch04': 4}} %}
-{% set hard_reset_command = ['ipmitool -U ADMIN -P ADMIN -I lanplus -H 172.27.19.24 chassis power reset', 'sleep 5', 'ipmitool -U ADMIN -P ADMIN -I lanplus -H 172.27.19.24 chassis power on'] %}
-{% set tags = {'MAC 70 (QSFP+)': ['QSFP+', '100G'], 'MAC 78 (QSFP+)': ['QSFP+', '100G'], 'MAC ED (SFP+)': ['SFP+', '10G'], 'MAC EC (SFP+)': ['SFP+', '10G'], 'MAC 1A': ['RJ45', '1G'], 'MAC 1B': ['RJ45', '1G'], 'MAC 56 (SFP+)': ['SFP+', '25G'], 'MAC 57 (SFP+)': ['SFP+', '25G']} %}
-{% set interfaces = ['MAC 1A', 'MAC 1B', 'MAC ED (SFP+)', 'MAC EC (SFP+)', 'MAC 70 (QSFP+)', 'MAC 78 (QSFP+)', 'MAC 56 (SFP+)', 'MAC 57 (SFP+)'] %}
-{% set sysfs = {'MAC 70 (QSFP+)': '/sys/devices/pci0000:b2/0000:b2:00.0/0000:b3:00.4/net/enp179s0f4', 'MAC 78 (QSFP+)': '/sys/devices/pci0000:b2/0000:b2:00.0/0000:b3:00.4/net/enp179s0f4d1', 'MAC ED (SFP+)': '/sys/devices/pci0000:64/0000:64:00.0/0000:65:00.0/net', 'MAC EC (SFP+)': '/sys/devices/pci0000:64/0000:64:00.0/0000:65:00.1/net', 'MAC 1A': '/sys/devices/pci0000:16/0000:16:02.0/0000:18:00.0/0000:19:03.0/0000:1a:00.0/net', 'MAC 1B': '/sys/devices/pci0000:16/0000:16:02.0/0000:18:00.0/0000:19:03.0/0000:1a:00.1/net', 'MAC 56 (SFP+)': '/sys/devices/pci0000:16/0000:16:00.0/0000:17:00.0/net', 'MAC 57 (SFP+)': '/sys/devices/pci0000:16/0000:16:00.0/0000:17:00.1/net'} %}
+{% set power_on_command = 'ipmitool -U ADMIN -P ADMIN -I lanplus -H 172.27.19.24 chassis power on' %}
 {% set power_off_command = 'ipmitool -U ADMIN -P ADMIN -I lanplus -H 172.27.19.24 chassis power off' %}
+{% set hard_reset_command = [
+ 'ipmitool -U ADMIN -P ADMIN -I lanplus -H 172.27.19.24 chassis power reset',
+ 'sleep 5',
+ 'ipmitool -U ADMIN -P ADMIN -I lanplus -H 172.27.19.24 chassis power on']
+%}
 {% set connection_command = 'telnet localhost 7319' %}
-{% set mac_addr = {'MAC 70 (QSFP+)': '00:07:43:3f:6a:70', 'MAC 78 (QSFP+)': '00:07:43:3f:6a:78', 'MAC ED (SFP+)': '38:ea:a7:93:83:ed', 'MAC EC (SFP+)': '38:ea:a7:93:83:ec', 'MAC 1A': 'ac:1f:6b:0d:e7:1a', 'MAC 1B': 'ac:1f:6b:0d:e7:1b', 'MAC 56 (SFP+)': '24:8a:07:1e:2e:56', 'MAC 57 (SFP+)': '24:8a:07:1e:2e:57'} %}
-{% set power_on_command = 'ipmitool -U ADMIN -P ADMIN -I lanplus -H 172.27.19.24 chassis power on' %}
-{% set lava_mac = 'ac:1f:6b:0d:e7:1a' %}
-{% set boot_interface = 'net2' %}
+{% set lava_mac = '68:05:ca:40:16:9c' %}
+{% set boot_interface = 'net0' %}
+{% set map = {
+ 'MAC 70 (QSFP+)': {'lngswitch04': 13},
+ 'MAC 78 (QSFP+)': {'lngswitch04': 15},
+ 'MAC 1A': {'lngswitch01': 15},
+ 'MAC 1B': {'lngswitch01': 10},
+ 'MAC 9C': {'lngswitch01': 11},
+ 'MAC 56 (SFP+)': {'lngswitch04': 3},
+ 'MAC 57 (SFP+)': {'lngswitch04': 4}}
+ %}
+{% set tags = {
+ 'MAC 70 (QSFP+)': ['QSFP+', '100G'],
+ 'MAC 78 (QSFP+)': ['QSFP+', '100G'],
+ 'MAC 1A': ['RJ45', '1G'],
+ 'MAC 1B': ['RJ45', '1G'],
+ 'MAC 9C': ['RJ45', '1G'],
+ 'MAC 56 (SFP+)': ['SFP+', '25G'],
+ 'MAC 57 (SFP+)': ['SFP+', '25G']}
+ %}
+{% set interfaces = [
+ 'MAC 1A',
+ 'MAC 1B',
+ 'MAC 9C',
+ 'MAC 70 (QSFP+)',
+ 'MAC 78 (QSFP+)',
+ 'MAC 56 (SFP+)',
+ 'MAC 57 (SFP+)']
+ %}
+{% set sysfs = {
+ 'MAC 70 (QSFP+)': '/sys/devices/pci0000:b2/0000:b2:00.0/0000:b3:00.4/net/enp179s0f4',
+ 'MAC 78 (QSFP+)': '/sys/devices/pci0000:b2/0000:b2:00.0/0000:b3:00.4/net/enp179s0f4d1',
+ 'MAC 56 (SFP+)': '/sys/devices/pci0000:64/0000:64:00.0/0000:65:00.0/net',
+ 'MAC 57 (SFP+)': '/sys/devices/pci0000:64/0000:64:00.0/0000:65:00.1/net',
+ 'MAC 1A': '/sys/devices/pci0000:16/0000:16:02.0/0000:18:00.0/0000:19:03.0/0000:1a:00.0/net',
+ 'MAC 1B': '/sys/devices/pci0000:16/0000:16:02.0/0000:18:00.0/0000:19:03.0/0000:1a:00.1/net',
+ 'MAC 9C': '/sys/devices/pci0000:16/0000:16:00.0/0000:17:00.0/net'}
+ %}
+{% set mac_addr = {
+ 'MAC 70 (QSFP+)': '00:07:43:3f:6a:70',
+ 'MAC 78 (QSFP+)': '00:07:43:3f:6a:78',
+ 'MAC 1A': 'ac:1f:6b:0d:e7:1a',
+ 'MAC 1B': 'ac:1f:6b:0d:e7:1b',
+ 'MAC 9C': '68:05:ca:40:16:9c',
+ 'MAC 56 (SFP+)': '24:8a:07:1e:2e:56',
+ 'MAC 57 (SFP+)': '24:8a:07:1e:2e:57'}
+ %}