Merge pull request #20 from KatharaFramework/develop

Version 0.1.7

Author: tcaiazzi

README.md

@@ -88,9 +88,10 @@ In the following you will find the possible values for the configuration file.
     },
     "protocols": { # Checks on routing protocols
       "bgpd": { # Specific checks for BGP
-        "peerings": { # Check that a peering is up
+        "neighbors": { # Check that a peering is up
           "<device_name>": [
-            "<neighbour_ip>", # Check that a peering is up between the device and the specified neighbour ip
+            {"ip": <neighbour_ip>, "asn": <neighbor_asn>}, # Check that a peering is up between the device and 
+                                                           # the specified neighbour ip
           ],
         },
         "networks": {

examples/palabra/correction.json

@@ -171,32 +171,32 @@
 		},
 		"protocols": {
 			"bgpd": {
-				"peerings": {
+				"neighbors": {
 					"as1r1": [
-						"1.0.0.2",
-						"10.20.0.2"
+						{"ip": "1.0.0.2", "asn":  1},
+						{"ip": "10.20.0.2", "asn":  2}
 					],
 					"as1r2": [
-						"1.0.0.1",
-						"10.20.1.2"
+						{"ip": "1.0.0.1", "asn":  1},
+						{"ip": "10.20.1.2", "asn":  2}
 					],
 					"as2r1": [
-						"2.0.0.2",
-						"10.20.0.1",
-						"20.30.0.2"
+						{"ip": "2.0.0.2", "asn":  2},
+						{"ip": "10.20.0.1", "asn":  1},
+						{"ip": "20.30.0.2", "asn":  3}
 					],
 					"as2r2": [
-						"2.0.0.1",
-						"10.20.1.1",
-						"20.30.1.2"
+						{"ip": "2.0.0.1", "asn":  2},
+						{"ip": "10.20.1.1", "asn":  1},
+						{"ip": "20.30.1.2", "asn":  3}
 					],
 					"as3r1": [
-						"3.0.0.2",
-						"20.30.0.1"
+						{"ip": "3.0.0.2", "asn":  3},
+						{"ip": "20.30.0.1", "asn":  2}
 					],
 					"as3r2": [
-						"3.0.0.1",
-						"20.30.1.1"
+						{"ip": "3.0.0.1", "asn":  3},
+						{"ip": "20.30.1.1", "asn":  2}
 					]
 				},
 				"networks": {

examples/palabra/labs/lab1/lab1_result.xlsx

@@ -1,6 +1,6 @@
 [project]
 name = "kathara_lab_checker"
-    version = "0.1.6"
+    version = "0.1.7"
 description = "Tool to automatically check Kathará network scenarios based on a configuration file."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -42,4 +42,10 @@ kathara_lab_checker = "kathara_lab_checker.__main__:main"
 
 [build-system]
 requires = ["setuptools>=61.2", "wheel"]
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.packages.find]
+where = ["src/kathara_lab_checker"]
+
+[tool.setuptools.package-data]
+schemas = ["*.json"]

examples/palabra/labs/lab2/lab2_result.xlsx

@@ -2,4 +2,5 @@ kathara>=3.7.7
 jc>=1.24.0
 openpyxl>=3.1.2
 tqdm>=4
-coloredlogs~=15.0.1
+coloredlogs~=15.0.1
+jsonschema>=4.23.0

examples/palabra/labs/lab3/lab3_result.xlsx

@@ -1,13 +1,16 @@
+from .model.CheckResult import CheckResult
+
+
 class TestCollector:
     def __init__(self):
         self.tests = {}
 
-    def add_check_result(self, lab_name: str, check_result: 'CheckResultPackage.CheckResult') -> None:
+    def add_check_result(self, lab_name: str, check_result: CheckResult) -> None:
         if lab_name not in self.tests:
             self.tests[lab_name] = []
         self.tests[lab_name].append(check_result)
 
-    def add_check_results(self, lab_name: str, check_results: list['CheckResultPackage.CheckResult']) -> None:
+    def add_check_results(self, lab_name: str, check_results: list[CheckResult]) -> None:
         for result in check_results:
             self.add_check_result(lab_name, result)