From e78e0fd224d17e8bb1af565518aa283bfebc6dcf Mon Sep 17 00:00:00 2001 From: Pieter Donker <donker@astron.nl> Date: Tue, 13 Sep 2016 10:00:51 +0000 Subject: [PATCH] Task #9612: made symlinks to new tool names in Tools/Power dir --- .gitattributes | 15 ++++++++++-- LCU/checkhardware/checkhardware_lib/db_new.py | 0 .../checkhardware_lib/reporting.py | 24 +++++++++---------- .../checkhardware_lib/test_db.py | 0 MAC/Tools/Power/ecSetObserving.py | 1 + MAC/Tools/Power/isEcLib.py | 1 + MAC/Tools/Power/isReset48V.py | 1 + MAC/Tools/Power/isResetLCU.py | 1 + MAC/Tools/Power/isResetTrip.py | 1 + MAC/Tools/Power/isStatus.py | 1 + MAC/Tools/Power/isStatusData.py | 1 + MAC/Tools/Power/isTurnOff48V.py | 1 + MAC/Tools/Power/isTurnOffLCU.py | 1 + MAC/Tools/Power/isTurnOn48V.py | 1 + MAC/Tools/Power/nlEcLib.py | 1 + MAC/Tools/Power/nlStatus.py | 1 + MAC/Tools/Power/nlStatusData.py | 1 + 17 files changed, 38 insertions(+), 14 deletions(-) delete mode 100644 LCU/checkhardware/checkhardware_lib/db_new.py delete mode 100644 LCU/checkhardware/checkhardware_lib/test_db.py create mode 120000 MAC/Tools/Power/ecSetObserving.py create mode 120000 MAC/Tools/Power/isEcLib.py create mode 120000 MAC/Tools/Power/isReset48V.py create mode 120000 MAC/Tools/Power/isResetLCU.py create mode 120000 MAC/Tools/Power/isResetTrip.py create mode 120000 MAC/Tools/Power/isStatus.py create mode 120000 MAC/Tools/Power/isStatusData.py create mode 120000 MAC/Tools/Power/isTurnOff48V.py create mode 120000 MAC/Tools/Power/isTurnOffLCU.py create mode 120000 MAC/Tools/Power/isTurnOn48V.py create mode 120000 MAC/Tools/Power/nlEcLib.py create mode 120000 MAC/Tools/Power/nlStatus.py create mode 120000 MAC/Tools/Power/nlStatusData.py diff --git a/.gitattributes b/.gitattributes index d4dd52253b0..cfb6a87b178 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2934,7 +2934,6 @@ LCU/checkhardware/check_hardware.py -text LCU/checkhardware/checkhardware_lib/__init__.py -text LCU/checkhardware/checkhardware_lib/data.py -text LCU/checkhardware/checkhardware_lib/db.py -text -LCU/checkhardware/checkhardware_lib/db_new.py -text LCU/checkhardware/checkhardware_lib/general.py -text LCU/checkhardware/checkhardware_lib/hardware_tests.py -text LCU/checkhardware/checkhardware_lib/hba.py -text @@ -2958,7 +2957,6 @@ LCU/checkhardware/checkhardware_lib/spectrum_checks/summator_noise.py -text LCU/checkhardware/checkhardware_lib/spectrum_checks/tools.py -text LCU/checkhardware/checkhardware_lib/spu.py -text LCU/checkhardware/checkhardware_lib/tbb.py -text -LCU/checkhardware/checkhardware_lib/test_db.py -text LCU/checkhardware/do_station_test.sh -text svneol=unset#application/x-shellscript LCU/checkhardware/rtsm.py -text LCU/checkhardware/show_bad_spectra.py -text @@ -4357,8 +4355,21 @@ MAC/Tools/NTP/timepps.h -text MAC/Tools/NTP/timer.c -text MAC/Tools/NTP/timer.c.patch -text MAC/Tools/NTP/timex.h -text +MAC/Tools/Power/ecSetObserving.py -text MAC/Tools/Power/ec_reset_trip.py -text MAC/Tools/Power/ec_set_observing.py -text +MAC/Tools/Power/isEcLib.py -text +MAC/Tools/Power/isReset48V.py -text +MAC/Tools/Power/isResetLCU.py -text +MAC/Tools/Power/isResetTrip.py -text +MAC/Tools/Power/isStatus.py -text +MAC/Tools/Power/isStatusData.py -text +MAC/Tools/Power/isTurnOff48V.py -text +MAC/Tools/Power/isTurnOffLCU.py -text +MAC/Tools/Power/isTurnOn48V.py -text +MAC/Tools/Power/nlEcLib.py -text +MAC/Tools/Power/nlStatus.py -text +MAC/Tools/Power/nlStatusData.py -text MAC/Tools/Power/reset_48v.py -text MAC/Tools/Power/reset_lcu.py -text MAC/Tools/Power/st_ec_lib.py -text diff --git a/LCU/checkhardware/checkhardware_lib/db_new.py b/LCU/checkhardware/checkhardware_lib/db_new.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/LCU/checkhardware/checkhardware_lib/reporting.py b/LCU/checkhardware/checkhardware_lib/reporting.py index 0d3b51b3f75..428fdb7d99c 100644 --- a/LCU/checkhardware/checkhardware_lib/reporting.py +++ b/LCU/checkhardware/checkhardware_lib/reporting.py @@ -80,18 +80,18 @@ def spu_report(db, date, log): logger.debug("generate spu report") for spu in db.spu: spu.test() - if not spu.voltage_ok: - valstr = '' - if not spu.rcu_ok: - valstr += ",RCU-5.0V=%3.1f" % spu.rcu_5_0_volt - if not spu.lba_ok: - valstr += ",LBA-8.0V=%3.1f" % spu.lba_8_0_volt - if not spu.hba_ok: - valstr += ",HBA-48V=%3.1f" % spu.hba_48_volt - if not spu.spu_ok: - valstr += ",SPU-3.3V=%3.1f" % spu.spu_3_3_volt - if len(valstr): - log.add_line("%s,SPU,%03d,VOLTAGE%s" % (date, spu.nr, valstr)) + if not spu.voltage_ok: + valstr = '' + if not spu.rcu_ok: + valstr += ",RCU-5.0V=%3.1f" % spu.rcu_5_0_volt + if not spu.lba_ok: + valstr += ",LBA-8.0V=%3.1f" % spu.lba_8_0_volt + if not spu.hba_ok: + valstr += ",HBA-48V=%3.1f" % spu.hba_48_volt + if not spu.spu_ok: + valstr += ",SPU-3.3V=%3.1f" % spu.spu_3_3_volt + if len(valstr): + log.add_line("%s,SPU,%03d,VOLTAGE%s" % (date, spu.nr, valstr)) if not spu.temp_ok: log.add_line("%s,SPU,%03d,TEMPERATURE,PCB=%2.0f" % ( diff --git a/LCU/checkhardware/checkhardware_lib/test_db.py b/LCU/checkhardware/checkhardware_lib/test_db.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/MAC/Tools/Power/ecSetObserving.py b/MAC/Tools/Power/ecSetObserving.py new file mode 120000 index 00000000000..28676a0ccd6 --- /dev/null +++ b/MAC/Tools/Power/ecSetObserving.py @@ -0,0 +1 @@ +ec_set_observing.py \ No newline at end of file diff --git a/MAC/Tools/Power/isEcLib.py b/MAC/Tools/Power/isEcLib.py new file mode 120000 index 00000000000..1e65dd3e223 --- /dev/null +++ b/MAC/Tools/Power/isEcLib.py @@ -0,0 +1 @@ +st_ec_lib.py \ No newline at end of file diff --git a/MAC/Tools/Power/isReset48V.py b/MAC/Tools/Power/isReset48V.py new file mode 120000 index 00000000000..6987f263f17 --- /dev/null +++ b/MAC/Tools/Power/isReset48V.py @@ -0,0 +1 @@ +reset_48v.py \ No newline at end of file diff --git a/MAC/Tools/Power/isResetLCU.py b/MAC/Tools/Power/isResetLCU.py new file mode 120000 index 00000000000..729a66dac82 --- /dev/null +++ b/MAC/Tools/Power/isResetLCU.py @@ -0,0 +1 @@ +reset_lcu.py \ No newline at end of file diff --git a/MAC/Tools/Power/isResetTrip.py b/MAC/Tools/Power/isResetTrip.py new file mode 120000 index 00000000000..ca55cad4cda --- /dev/null +++ b/MAC/Tools/Power/isResetTrip.py @@ -0,0 +1 @@ +ec_reset_trip.py \ No newline at end of file diff --git a/MAC/Tools/Power/isStatus.py b/MAC/Tools/Power/isStatus.py new file mode 120000 index 00000000000..65773e96ec5 --- /dev/null +++ b/MAC/Tools/Power/isStatus.py @@ -0,0 +1 @@ +status.py \ No newline at end of file diff --git a/MAC/Tools/Power/isStatusData.py b/MAC/Tools/Power/isStatusData.py new file mode 120000 index 00000000000..95d9f7941c0 --- /dev/null +++ b/MAC/Tools/Power/isStatusData.py @@ -0,0 +1 @@ +status_data.py \ No newline at end of file diff --git a/MAC/Tools/Power/isTurnOff48V.py b/MAC/Tools/Power/isTurnOff48V.py new file mode 120000 index 00000000000..26117b17a3f --- /dev/null +++ b/MAC/Tools/Power/isTurnOff48V.py @@ -0,0 +1 @@ +turn_off_48v.py \ No newline at end of file diff --git a/MAC/Tools/Power/isTurnOffLCU.py b/MAC/Tools/Power/isTurnOffLCU.py new file mode 120000 index 00000000000..11caae5ac99 --- /dev/null +++ b/MAC/Tools/Power/isTurnOffLCU.py @@ -0,0 +1 @@ +turn_off_lcu.py \ No newline at end of file diff --git a/MAC/Tools/Power/isTurnOn48V.py b/MAC/Tools/Power/isTurnOn48V.py new file mode 120000 index 00000000000..b8c3c7c03fd --- /dev/null +++ b/MAC/Tools/Power/isTurnOn48V.py @@ -0,0 +1 @@ +turn_on_48v.py \ No newline at end of file diff --git a/MAC/Tools/Power/nlEcLib.py b/MAC/Tools/Power/nlEcLib.py new file mode 120000 index 00000000000..1e65dd3e223 --- /dev/null +++ b/MAC/Tools/Power/nlEcLib.py @@ -0,0 +1 @@ +st_ec_lib.py \ No newline at end of file diff --git a/MAC/Tools/Power/nlStatus.py b/MAC/Tools/Power/nlStatus.py new file mode 120000 index 00000000000..65773e96ec5 --- /dev/null +++ b/MAC/Tools/Power/nlStatus.py @@ -0,0 +1 @@ +status.py \ No newline at end of file diff --git a/MAC/Tools/Power/nlStatusData.py b/MAC/Tools/Power/nlStatusData.py new file mode 120000 index 00000000000..95d9f7941c0 --- /dev/null +++ b/MAC/Tools/Power/nlStatusData.py @@ -0,0 +1 @@ +status_data.py \ No newline at end of file -- GitLab