From 15cfab61ccf0f087011ae7042ae527891e07f4f7 Mon Sep 17 00:00:00 2001 From: rasmus Date: Wed, 23 Dec 2020 06:52:30 +0200 Subject: [PATCH] foo bar --- listServers.py | 4 ++-- prom_servers.py | 2 +- relativeUsage.py | 2 +- scraperMain.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/listServers.py b/listServers.py index e74b105..cabc4e0 100644 --- a/listServers.py +++ b/listServers.py @@ -40,5 +40,5 @@ def listServers(serverName): return(servers) # Testing data: -#serverName = ['Bay Server Name Serial Number Status Power UID Partner\r', '--- ------------------------------------------------- --------------- -------- ------- --- -------\r', ' 1 tty-lab-1 OK On Off \r', ' 2 tty-lab-2 CZ320263P9 OK On Off \r', ' 3 tty-lab-3 CZJ14410KP Failed On Off \r', ' 4 kspve1 CZJ14410KK OK On Off \r', ' 5 kspve2-2 OK On Off \r', ' 6 kspve3 OK On Off \r', ' 7 plaes-blade OK On Off \r', ' 8 Ringly-01 CZ3402Y48C OK On Off \r', ' 9 toomas-lepik CZ3217FNYE OK On Off \r', ' 10 toomas-lepik2 CZ3217FFSS OK On Off \r', ' 11 [Absent] \r', ' 12 erki-naumanis OK On Off \r', ' 13 [Absent] \r', ' 14 [Absent] \r', ' 15 [Absent] \r', ' 16 [Absent] \r'] -#print(listServers(serverName)) \ No newline at end of file +#serverName = ['Bay Server Name Serial Number Status Power UID Partner\r', '--- ------------------------------------------------- --------------- -------- ------- --- -------\r', ' 1 foo-lab-1 OK On Off \r', ' 2 foo-lab-2 CZ302243P9 OK On Off \r', ' 3 foo-lab-3 CZJI441OKP Failed On Off \r', ' 4 kspve1 CZJ18450FK OK On Off \r', ' 5 kspve2-2 OK On Off \r', ' 6 kspve3 OK On Off \r', ' 7 foo-blade OK On Off \r', ' 8 Bar-01 CZ241274CC OK On Off \r', ' 9 baz-sar CZ3217FNYE OK On Off \r', ' 10 baz-sar2 CZ3217FFSS OK On Off \r', ' 11 [Absent] \r', ' 12 bee-bar OK On Off \r', ' 13 [Absent] \r', ' 14 [Absent] \r', ' 15 [Absent] \r', ' 16 [Absent] \r'] +#print(listServers(serverName)) diff --git a/prom_servers.py b/prom_servers.py index 55a53d0..b54e514 100644 --- a/prom_servers.py +++ b/prom_servers.py @@ -103,6 +103,6 @@ def prom_servers(PREFIX, baysInUseCount, servers): #baysInUseCount = 11 # 0~ 1~ 2~ 3~ 4~ 5~ 6~ 7~ 8~ # [BayNumber "Server Name", "Serial Number", "Status", "Power", "UID Partner", presentPowerDirectDC, relativeUsageAC, "enc"] -#servers = [[1, 'tty-lab-1', '', 'OK', 'On', 'Off', 142, 222, "k-space-blade-02"], [2, 'tty-lab-2', 'CZ320263P9', 'OK', 'On', 'Off', 87, 136, "k-space-blade-02"], [3, 'tty-lab-3', 'CZJ14410KP', 'Failed', 'On', 'Off', 127, 198, "k-space-blade-02"], [4, 'kspve1', 'CZJ14410KK', 'OK', 'On', 'Off', 86, 134, "k-space-blade-02"], [5, 'kspve2-2', '', 'OK', 'On', 'Off', 71, 111, "k-space-blade-02"], [6, 'kspve3', '', 'OK', 'On', 'Off', 80, 125, "k-space-blade-02"], [7, 'plaes-blade', '', 'OK', 'On', 'Off', 81, 127, "k-space-blade-02"], [8, 'Ringly-01', 'CZ3402Y48C', 'OK', 'On', 'Off', 126, 197, "k-space-blade-02"], [9, 'toomas-lepik', 'CZ3217FNYE', 'OK', 'On', 'Off', 129, 202, "k-space-blade-02"], [10, 'toomas-lepik2', 'CZ3217FFSS', 'OK', 'On', 'Off', 97, 152, "k-space-blade-02"], [12, 'erki-naumanis', '', 'OK', 'On', 'Off', 86, 134, "k-space-blade-02"]] +#servers = [[1, 'foo-lab-1', '', 'OK', 'On', 'Off', 142, 222, "k-space-blade-02"], [2, 'foo-lab-2', 'CZ302243P9', 'OK', 'On', 'Off', 87, 136, "k-space-blade-02"], [3, 'foo-lab-3', 'CZJI441OKP', 'Failed', 'On', 'Off', 127, 198, "k-space-blade-02"], [4, 'kspve1', 'CZJ18450FK', 'OK', 'On', 'Off', 86, 134, "k-space-blade-02"], [5, 'kspve2-2', '', 'OK', 'On', 'Off', 71, 111, "k-space-blade-02"], [6, 'kspve3', '', 'OK', 'On', 'Off', 80, 125, "k-space-blade-02"], [7, 'foo-blade', '', 'OK', 'On', 'Off', 81, 127, "k-space-blade-02"], [8, 'Bar-01', 'CZ241274CC', 'OK', 'On', 'Off', 126, 197, "k-space-blade-02"], [9, 'baz-sar', 'CZ3217FNYE', 'OK', 'On', 'Off', 129, 202, "k-space-blade-02"], [10, 'baz-sar2', 'CZ3217FFSS', 'OK', 'On', 'Off', 97, 152, "k-space-blade-02"], [12, 'bee-bar', '', 'OK', 'On', 'Off', 86, 134, "k-space-blade-02"]] #print(prom_servers(PREFIX, baysInUseCount, servers)) diff --git a/relativeUsage.py b/relativeUsage.py index 6828b81..f2f06a7 100644 --- a/relativeUsage.py +++ b/relativeUsage.py @@ -32,5 +32,5 @@ def relativeUsage(encPowerUsageAC, baysInUseCount, servers): # Testing data: #encPowerUsageAC = 1775 #baysInUseCount = 11 -#servers = [[1, 'tty-lab-1', '', 'OK', 'On', 'Off', 144], [2, 'tty-lab-2', 'CZ320263P9', 'OK', 'On', 'Off', 86], [3, 'tty-lab-3', 'CZJ14410KP', 'Failed', 'On', 'Off', 129], [4, 'kspve1', 'CZJ14410KK', 'OK', 'On', 'Off', 87], [5, 'kspve2-2', '', 'OK', 'On', 'Off', 87], [6, 'kspve3', '', 'OK', 'On', 'Off', 82], [7, 'plaes-blade', '', 'OK', 'On', 'Off', 81], [8, 'Ringly-01', 'CZ3402Y48C', 'OK', 'On', 'Off', 124], [9, 'toomas-lepik', 'CZ3217FNYE', 'OK', 'On', 'Off', 132], [10, 'toomas-lepik2', 'CZ3217FFSS', 'OK', 'On', 'Off', 101], [12, 'erki-naumanis', '', 'OK', 'On', 'Off', 88]] +#servers = [[1, 'foo-lab-1', '', 'OK', 'On', 'Off', 144], [2, 'foo-lab-2', 'CZ302243P9', 'OK', 'On', 'Off', 86], [3, 'foo-lab-3', 'CZJI441OKP', 'Failed', 'On', 'Off', 129], [4, 'kspve1', 'CZJ18450FK', 'OK', 'On', 'Off', 87], [5, 'kspve2-2', '', 'OK', 'On', 'Off', 87], [6, 'kspve3', '', 'OK', 'On', 'Off', 82], [7, 'foo-blade', '', 'OK', 'On', 'Off', 81], [8, 'Bar-01', 'CZ241274CC', 'OK', 'On', 'Off', 124], [9, 'baz-sar', 'CZ3217FNYE', 'OK', 'On', 'Off', 132], [10, 'baz-sar2', 'CZ3217FFSS', 'OK', 'On', 'Off', 101], [12, 'bee-bar', '', 'OK', 'On', 'Off', 88]] #print(relativeUsage(encPowerUsageAC, baysInUseCount, servers)) \ No newline at end of file diff --git a/scraperMain.py b/scraperMain.py index 5e67306..d6c44e8 100644 --- a/scraperMain.py +++ b/scraperMain.py @@ -76,7 +76,7 @@ def scraperMain(hostname, enc, sshkeypath): ## Get list of blades with some added info ## - serverName = ssh_runcmd('show server names') # Testing data: serverName = ['Bay Server Name Serial Number Status Power UID Partner\r', '--- ------------------------------------------------- --------------- -------- ------- --- -------\r', ' 1 tty-lab-1 OK On Off \r', ' 2 tty-lab-2 CZ320263P9 OK On Off \r', ' 3 tty-lab-3 CZJ14410KP Failed On Off \r', ' 4 kspve1 CZJ14410KK OK On Off \r', ' 5 kspve2-2 OK On Off \r', ' 6 kspve3 OK On Off \r', ' 7 plaes-blade OK On Off \r', ' 8 Ringly-01 CZ3402Y48C OK On Off \r', ' 9 toomas-lepik CZ3217FNYE OK On Off \r', ' 10 toomas-lepik2 CZ3217FFSS OK On Off \r', ' 11 [Absent] \r', ' 12 erki-naumanis OK On Off \r', ' 13 [Absent] \r', ' 14 [Absent] \r', ' 15 [Absent] \r', ' 16 [Absent] \r'] + serverName = ssh_runcmd('show server names') # Testing data: serverName = ['Bay Server Name Serial Number Status Power UID Partner\r', '--- ------------------------------------------------- --------------- -------- ------- --- -------\r', ' 1 foo-lab-1 OK On Off \r', ' 2 foo-lab-2 CZ302243P9 OK On Off \r', ' 3 foo-lab-3 CZJI441OKP Failed On Off \r', ' 4 kspve1 CZJ18450FK OK On Off \r', ' 5 kspve2-2 OK On Off \r', ' 6 kspve3 OK On Off \r', ' 7 foo-blade OK On Off \r', ' 8 Bar-01 CZ241274CC OK On Off \r', ' 9 baz-sar CZ3217FNYE OK On Off \r', ' 10 baz-sar2 CZ3217FFSS OK On Off \r', ' 11 [Absent] \r', ' 12 bee-bar OK On Off \r', ' 13 [Absent] \r', ' 14 [Absent] \r', ' 15 [Absent] \r', ' 16 [Absent] \r'] servers = listServers.listServers(serverName) baysInUse = [x[0] for x in servers] # List of blades in use.