From 2eb849ad5eca99c06092dc6aa39d997e51abb7d3 Mon Sep 17 00:00:00 2001
From: Simon Janos <4@2a.hu>
Date: Sun, 25 May 2014 23:29:37 +0200
Subject: [PATCH] =?UTF-8?q?tiszt=C3=A1z=C3=A1s,=20appr=C3=B3bb=20jav=C3=AD?=
 =?UTF-8?q?t=C3=A1s,=20tov=C3=A1bbi=20tesztek?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 irf_2P-1_242/src/getRouteRules.py          | 13 +------------
 irf_2P-1_242/test/{test1 => }/machines.csv |  2 +-
 irf_2P-1_242/test/test1/test.out           |  1 +
 irf_2P-1_242/test/test1/test.sh            |  2 +-
 irf_2P-1_242/test/test2/machines.csv       |  4 ----
 irf_2P-1_242/test/test2/test.out           |  1 +
 irf_2P-1_242/test/test2/test.sh            |  2 +-
 irf_2P-1_242/test/test3/machines.csv       |  4 ----
 irf_2P-1_242/test/test3/test.out           |  1 +
 irf_2P-1_242/test/test3/test.sh            |  2 +-
 irf_2P-1_242/test/test4/machines.csv       |  4 ----
 irf_2P-1_242/test/test4/test.out           |  1 +
 irf_2P-1_242/test/test4/test.sh            |  2 +-
 irf_2P-1_242/test/test5/test.out           |  0
 irf_2P-1_242/test/test5/test.sh            |  3 +++
 irf_2P-1_242/test/test6/test.out           |  1 +
 irf_2P-1_242/test/test6/test.sh            |  3 +++
 irf_2P-1_242/test/test7/test.out           |  0
 irf_2P-1_242/test/test7/test.sh            |  3 +++
 irf_2P-1_242/test/test8/test.out           |  1 +
 irf_2P-1_242/test/test8/test.sh            |  3 +++
 21 files changed, 24 insertions(+), 29 deletions(-)
 rename irf_2P-1_242/test/{test1 => }/machines.csv (75%)
 delete mode 100644 irf_2P-1_242/test/test2/machines.csv
 delete mode 100644 irf_2P-1_242/test/test3/machines.csv
 delete mode 100644 irf_2P-1_242/test/test4/machines.csv
 create mode 100644 irf_2P-1_242/test/test5/test.out
 create mode 100644 irf_2P-1_242/test/test5/test.sh
 create mode 100644 irf_2P-1_242/test/test6/test.out
 create mode 100644 irf_2P-1_242/test/test6/test.sh
 create mode 100644 irf_2P-1_242/test/test7/test.out
 create mode 100644 irf_2P-1_242/test/test7/test.sh
 create mode 100644 irf_2P-1_242/test/test8/test.out
 create mode 100644 irf_2P-1_242/test/test8/test.sh

diff --git a/irf_2P-1_242/src/getRouteRules.py b/irf_2P-1_242/src/getRouteRules.py
index fee2cb7..1831990 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 b9fe4f2..93bb44d 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 959be20..e41f845 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 a448aec..c72f500 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 b9fe4f2..0000000
--- 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 959be20..e41f845 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 92d8be4..002d5ea 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 b9fe4f2..0000000
--- 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 959be20..e41f845 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 af8ec7e..7808add 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 b9fe4f2..0000000
--- 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 959be20..e41f845 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 0c28552..d55df25 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 0000000..e69de29
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 0000000..b36a024
--- /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 0000000..833a63b
--- /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 0000000..b2690e1
--- /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 0000000..e69de29
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 0000000..8de4975
--- /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 0000000..5910d47
--- /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 0000000..4a314bb
--- /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
-- 
GitLab