From aacc12dc9ab445e020444a5bd32b51f1fb62ddb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Solbj=C3=B8rg?= Date: Mon, 1 Apr 2019 23:52:05 +0200 Subject: =?UTF-8?q?feat:=20Make=20it=20possible=20to=20supply=20a=20list?= =?UTF-8?q?=20of=20switch=20names=20for=20APs=20=F0=9F=99=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cables.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cables.py b/cables.py index a8f6b39..f2b8c79 100644 --- a/cables.py +++ b/cables.py @@ -24,9 +24,9 @@ def generate_label_copies(switch, cable_name, copies=2): return [generate_label(switch, cable_name) for _ in range(0, copies)] -def generate_labels(switches, copies=2, uplinks=3): - print("Generating {} copies of each label for {} uplinks for {} switches ({} labels)".format( - copies, uplinks, len(switches), len(switches) * uplinks * copies)) +def generate_labels(switches, aps=[], copies=2, uplinks=3): + print("Generating {} copies of each label for {} uplinks for {} switches and {} APs ({} labels)".format( + copies, uplinks, len(switches), len(aps), (len(switches) * uplinks + len(aps)) * copies)) labels = [] for i in range(0, len(switches)): @@ -38,6 +38,10 @@ def generate_labels(switches, copies=2, uplinks=3): # Destructure the list of copies into a flat list labels.extend(chain.from_iterable(cable_labels)) + if switch_name in aps: + labels.extend( + generate_label_copies(switch_name, "AP", copies=copies)) + return labels @@ -66,5 +70,5 @@ def write_csv(data, outfile="cable_labels.csv", split_per_num=100): def make_cable_labels(uplinks=3): print("Generating labels for cables") switches = fetch_gondul_switches() - labels = generate_labels(switches, uplinks=uplinks) + labels = generate_labels(switches, uplinks=uplinks, aps=[]) write_csv(labels) -- cgit v1.2.3