diff --git a/irf_2P-1_242/src/getRouteRules.py b/irf_2P-1_242/src/getRouteRules.py index fee2cb7f458428bb1a0636d0747d66ebc9984c40..18319903e0e361130bc3a173da414af4e5a2e268 100644 --- a/irf_2P-1_242/src/getRouteRules.py +++ b/irf_2P-1_242/src/getRouteRules.py @@ -1,7 +1,6 @@ #!/bin/python3 import argparse, csv, subprocess, re -from lxml import etree import xml.etree.ElementTree as xml parser = argparse.ArgumentParser() @@ -49,7 +48,6 @@ for row in machines: if Gateway == "0.0.0.0" or Gateway == "::": Gateway = "On-link" Metric = a.findall(dialect + "RouteMetric")[0].text - #print([IfIndex, DstPrefix, Gateway, Metric]) with open(outfile, 'a') as output: writer = csv.writer(output, delimiter=',') @@ -60,13 +58,4 @@ for row in machines: except FileNotFoundError: print("Cannot write output file, directory does not exist or not writable.") - - - #et = etree.XML(rt.encode('utf-8')) - #print(root.findall("p:Win32_IP4RouteTable")) -# for line in p.stdout.readlines(): -# print(line) -# print(p.stdout.readlines()) -# retval = p.wait() - -#spamWriter = csv.writer(open('eggs.csv', 'w', newline=''), delimiter=' ', quotechar='|', quoting=csv.QUOTE_MINIMAL) + exit(1) diff --git a/irf_2P-1_242/test/test1/machines.csv b/irf_2P-1_242/test/machines.csv similarity index 75% rename from irf_2P-1_242/test/test1/machines.csv rename to irf_2P-1_242/test/machines.csv index b9fe4f20e2281433433b191888123d7c1d3f5cba..93bb44dc6e65ff138bb26c25bc1db418362d4f27 100644 --- a/irf_2P-1_242/test/test1/machines.csv +++ b/irf_2P-1_242/test/machines.csv @@ -1,4 +1,4 @@ -10.6.17.12,5985,75736,RdBF4nnX +10.6.17.12,5985,75736,588jFiFG 10.6.17.141,5985,75736,vCSmdG5v 10.6.17.142,5985,valami,akarmi 10.6.17.143,5985,valami,akarmi diff --git a/irf_2P-1_242/test/test1/test.out b/irf_2P-1_242/test/test1/test.out index 959be2088ad64e6b8235ea6ead92b20f413947fa..e41f84529fe7f753ae2561efaa305ec64f1a4137 100644 --- a/irf_2P-1_242/test/test1/test.out +++ b/irf_2P-1_242/test/test1/test.out @@ -1,2 +1,3 @@ +ERROR: could not connect to 10.6.17.141 ERROR: could not connect to 10.6.17.142 ERROR: could not connect to 10.6.17.143 diff --git a/irf_2P-1_242/test/test1/test.sh b/irf_2P-1_242/test/test1/test.sh index a448aec5bc9a2db5e1cc843f10f9d46a649473fc..c72f500cd7c04c58667b1e20245d5b9647925327 100644 --- a/irf_2P-1_242/test/test1/test.sh +++ b/irf_2P-1_242/test/test1/test.sh @@ -1,3 +1,3 @@ #!/bin/bash -x -/usr/bin/python3 ../src/getRouteRules.py -m test1/machines.csv -o test1 > test1/test.out +/usr/bin/python3 ../src/getRouteRules.py -m machines.csv -o test1 > test1/test.out diff --git a/irf_2P-1_242/test/test2/machines.csv b/irf_2P-1_242/test/test2/machines.csv deleted file mode 100644 index b9fe4f20e2281433433b191888123d7c1d3f5cba..0000000000000000000000000000000000000000 --- a/irf_2P-1_242/test/test2/machines.csv +++ /dev/null @@ -1,4 +0,0 @@ -10.6.17.12,5985,75736,RdBF4nnX -10.6.17.141,5985,75736,vCSmdG5v -10.6.17.142,5985,valami,akarmi -10.6.17.143,5985,valami,akarmi diff --git a/irf_2P-1_242/test/test2/test.out b/irf_2P-1_242/test/test2/test.out index 959be2088ad64e6b8235ea6ead92b20f413947fa..e41f84529fe7f753ae2561efaa305ec64f1a4137 100644 --- a/irf_2P-1_242/test/test2/test.out +++ b/irf_2P-1_242/test/test2/test.out @@ -1,2 +1,3 @@ +ERROR: could not connect to 10.6.17.141 ERROR: could not connect to 10.6.17.142 ERROR: could not connect to 10.6.17.143 diff --git a/irf_2P-1_242/test/test2/test.sh b/irf_2P-1_242/test/test2/test.sh index 92d8be4183fb4f2a7d0ed9f836ce951df07a5ccc..002d5ea5aaf40a0b63656716e8cac569857b2620 100644 --- a/irf_2P-1_242/test/test2/test.sh +++ b/irf_2P-1_242/test/test2/test.sh @@ -1,3 +1,3 @@ #!/bin/bash -x -/usr/bin/python3 ../src/getRouteRules.py -m test2/machines.csv -o test2 -i 1 > test2/test.out +/usr/bin/python3 ../src/getRouteRules.py -m machines.csv -o test2 -i 1 > test2/test.out diff --git a/irf_2P-1_242/test/test3/machines.csv b/irf_2P-1_242/test/test3/machines.csv deleted file mode 100644 index b9fe4f20e2281433433b191888123d7c1d3f5cba..0000000000000000000000000000000000000000 --- a/irf_2P-1_242/test/test3/machines.csv +++ /dev/null @@ -1,4 +0,0 @@ -10.6.17.12,5985,75736,RdBF4nnX -10.6.17.141,5985,75736,vCSmdG5v -10.6.17.142,5985,valami,akarmi -10.6.17.143,5985,valami,akarmi diff --git a/irf_2P-1_242/test/test3/test.out b/irf_2P-1_242/test/test3/test.out index 959be2088ad64e6b8235ea6ead92b20f413947fa..e41f84529fe7f753ae2561efaa305ec64f1a4137 100644 --- a/irf_2P-1_242/test/test3/test.out +++ b/irf_2P-1_242/test/test3/test.out @@ -1,2 +1,3 @@ +ERROR: could not connect to 10.6.17.141 ERROR: could not connect to 10.6.17.142 ERROR: could not connect to 10.6.17.143 diff --git a/irf_2P-1_242/test/test3/test.sh b/irf_2P-1_242/test/test3/test.sh index af8ec7ecf90cd5db2048313ce7183fc36d784f70..7808add1ecab039bbac52723f7165b190568979b 100644 --- a/irf_2P-1_242/test/test3/test.sh +++ b/irf_2P-1_242/test/test3/test.sh @@ -1,3 +1,3 @@ #!/bin/bash -x -/usr/bin/python3 ../src/getRouteRules.py -m test3/machines.csv -o test3 -a IPv6 > test3/test.out +/usr/bin/python3 ../src/getRouteRules.py -m machines.csv -o test3 -a IPv6 > test3/test.out diff --git a/irf_2P-1_242/test/test4/machines.csv b/irf_2P-1_242/test/test4/machines.csv deleted file mode 100644 index b9fe4f20e2281433433b191888123d7c1d3f5cba..0000000000000000000000000000000000000000 --- a/irf_2P-1_242/test/test4/machines.csv +++ /dev/null @@ -1,4 +0,0 @@ -10.6.17.12,5985,75736,RdBF4nnX -10.6.17.141,5985,75736,vCSmdG5v -10.6.17.142,5985,valami,akarmi -10.6.17.143,5985,valami,akarmi diff --git a/irf_2P-1_242/test/test4/test.out b/irf_2P-1_242/test/test4/test.out index 959be2088ad64e6b8235ea6ead92b20f413947fa..e41f84529fe7f753ae2561efaa305ec64f1a4137 100644 --- a/irf_2P-1_242/test/test4/test.out +++ b/irf_2P-1_242/test/test4/test.out @@ -1,2 +1,3 @@ +ERROR: could not connect to 10.6.17.141 ERROR: could not connect to 10.6.17.142 ERROR: could not connect to 10.6.17.143 diff --git a/irf_2P-1_242/test/test4/test.sh b/irf_2P-1_242/test/test4/test.sh index 0c28552f4c66eca4e09599a8ff1ab5fd4d1edf2d..d55df252176d19d7939bb900849badabbb8aadf8 100644 --- a/irf_2P-1_242/test/test4/test.sh +++ b/irf_2P-1_242/test/test4/test.sh @@ -1,3 +1,3 @@ #!/bin/bash -x -/usr/bin/python3 ../src/getRouteRules.py -m test4/machines.csv -o test4 -a IPv4 -i 1 > test4/test.out +/usr/bin/python3 ../src/getRouteRules.py -m machines.csv -o test4 -a IPv4 -i 1 > test4/test.out diff --git a/irf_2P-1_242/test/test5/test.out b/irf_2P-1_242/test/test5/test.out new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/irf_2P-1_242/test/test5/test.sh b/irf_2P-1_242/test/test5/test.sh new file mode 100644 index 0000000000000000000000000000000000000000..b36a024fa0d02547a40d461f061710ebc5794a82 --- /dev/null +++ b/irf_2P-1_242/test/test5/test.sh @@ -0,0 +1,3 @@ +#!/bin/bash -x + +/usr/bin/python3 ../src/getRouteRules.py -m machines.csv > test5/test.out diff --git a/irf_2P-1_242/test/test6/test.out b/irf_2P-1_242/test/test6/test.out new file mode 100644 index 0000000000000000000000000000000000000000..833a63b415cedeb65bd3331339b27b8b7da66629 --- /dev/null +++ b/irf_2P-1_242/test/test6/test.out @@ -0,0 +1 @@ +Cannot write output file, directory does not exist or not writable. diff --git a/irf_2P-1_242/test/test6/test.sh b/irf_2P-1_242/test/test6/test.sh new file mode 100644 index 0000000000000000000000000000000000000000..b2690e1588180bff3e1b7e43678ea758117ab75c --- /dev/null +++ b/irf_2P-1_242/test/test6/test.sh @@ -0,0 +1,3 @@ +#!/bin/bash -x + +/usr/bin/python3 ../src/getRouteRules.py -m machines.csv -o nemletezik > test6/test.out diff --git a/irf_2P-1_242/test/test7/test.out b/irf_2P-1_242/test/test7/test.out new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/irf_2P-1_242/test/test7/test.sh b/irf_2P-1_242/test/test7/test.sh new file mode 100644 index 0000000000000000000000000000000000000000..8de497562679bb3b24a19168488efa049876a318 --- /dev/null +++ b/irf_2P-1_242/test/test7/test.sh @@ -0,0 +1,3 @@ +#!/bin/bash -x + +/usr/bin/python3 ../src/getRouteRules.py -o test7 > test7/test.out diff --git a/irf_2P-1_242/test/test8/test.out b/irf_2P-1_242/test/test8/test.out new file mode 100644 index 0000000000000000000000000000000000000000..5910d471917ffa4b18ca26b88b8d1dbdea111d27 --- /dev/null +++ b/irf_2P-1_242/test/test8/test.out @@ -0,0 +1 @@ +Cannot open input file (nemletezik.csv) diff --git a/irf_2P-1_242/test/test8/test.sh b/irf_2P-1_242/test/test8/test.sh new file mode 100644 index 0000000000000000000000000000000000000000..4a314bb39240bbafb55f9333d9c833dd236aee36 --- /dev/null +++ b/irf_2P-1_242/test/test8/test.sh @@ -0,0 +1,3 @@ +#!/bin/bash -x + +/usr/bin/python3 ../src/getRouteRules.py -m nemletezik.csv -o test8 > test8/test.out