Skip to content

Commit 7a22223

Browse files
authored
Merge pull request #20 from KatharaFramework/develop
Version 0.1.7
2 parents 77e4116 + b75ee02 commit 7a22223

38 files changed

+583
-450
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,10 @@ In the following you will find the possible values for the configuration file.
8888
},
8989
"protocols": { # Checks on routing protocols
9090
"bgpd": { # Specific checks for BGP
91-
"peerings": { # Check that a peering is up
91+
"neighbors": { # Check that a peering is up
9292
"<device_name>": [
93-
"<neighbour_ip>", # Check that a peering is up between the device and the specified neighbour ip
93+
{"ip": <neighbour_ip>, "asn": <neighbor_asn>}, # Check that a peering is up between the device and
94+
# the specified neighbour ip
9495
],
9596
},
9697
"networks": {

examples/palabra/correction.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -171,32 +171,32 @@
171171
},
172172
"protocols": {
173173
"bgpd": {
174-
"peerings": {
174+
"neighbors": {
175175
"as1r1": [
176-
"1.0.0.2",
177-
"10.20.0.2"
176+
{"ip": "1.0.0.2", "asn": 1},
177+
{"ip": "10.20.0.2", "asn": 2}
178178
],
179179
"as1r2": [
180-
"1.0.0.1",
181-
"10.20.1.2"
180+
{"ip": "1.0.0.1", "asn": 1},
181+
{"ip": "10.20.1.2", "asn": 2}
182182
],
183183
"as2r1": [
184-
"2.0.0.2",
185-
"10.20.0.1",
186-
"20.30.0.2"
184+
{"ip": "2.0.0.2", "asn": 2},
185+
{"ip": "10.20.0.1", "asn": 1},
186+
{"ip": "20.30.0.2", "asn": 3}
187187
],
188188
"as2r2": [
189-
"2.0.0.1",
190-
"10.20.1.1",
191-
"20.30.1.2"
189+
{"ip": "2.0.0.1", "asn": 2},
190+
{"ip": "10.20.1.1", "asn": 1},
191+
{"ip": "20.30.1.2", "asn": 3}
192192
],
193193
"as3r1": [
194-
"3.0.0.2",
195-
"20.30.0.1"
194+
{"ip": "3.0.0.2", "asn": 3},
195+
{"ip": "20.30.0.1", "asn": 2}
196196
],
197197
"as3r2": [
198-
"3.0.0.1",
199-
"20.30.1.1"
198+
{"ip": "3.0.0.1", "asn": 3},
199+
{"ip": "20.30.1.1", "asn": 2}
200200
]
201201
},
202202
"networks": {
1.65 KB
Binary file not shown.
1.17 KB
Binary file not shown.
1.61 KB
Binary file not shown.
1.17 KB
Binary file not shown.

examples/palabra/labs/results.xlsx

2.58 KB
Binary file not shown.

pyproject.toml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "kathara_lab_checker"
3-
version = "0.1.6"
3+
version = "0.1.7"
44
description = "Tool to automatically check Kathará network scenarios based on a configuration file."
55
readme = "README.md"
66
requires-python = ">=3.11"
@@ -42,4 +42,10 @@ kathara_lab_checker = "kathara_lab_checker.__main__:main"
4242

4343
[build-system]
4444
requires = ["setuptools>=61.2", "wheel"]
45-
build-backend = "setuptools.build_meta"
45+
build-backend = "setuptools.build_meta"
46+
47+
[tool.setuptools.packages.find]
48+
where = ["src/kathara_lab_checker"]
49+
50+
[tool.setuptools.package-data]
51+
schemas = ["*.json"]

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ kathara>=3.7.7
22
jc>=1.24.0
33
openpyxl>=3.1.2
44
tqdm>=4
5-
coloredlogs~=15.0.1
5+
coloredlogs~=15.0.1
6+
jsonschema>=4.23.0

src/kathara_lab_checker/TestCollector.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1+
from .model.CheckResult import CheckResult
2+
3+
14
class TestCollector:
25
def __init__(self):
36
self.tests = {}
47

5-
def add_check_result(self, lab_name: str, check_result: 'CheckResultPackage.CheckResult') -> None:
8+
def add_check_result(self, lab_name: str, check_result: CheckResult) -> None:
69
if lab_name not in self.tests:
710
self.tests[lab_name] = []
811
self.tests[lab_name].append(check_result)
912

10-
def add_check_results(self, lab_name: str, check_results: list['CheckResultPackage.CheckResult']) -> None:
13+
def add_check_results(self, lab_name: str, check_results: list[CheckResult]) -> None:
1114
for result in check_results:
1215
self.add_check_result(lab_name, result)
1316

0 commit comments

Comments
 (0)