Skip to content

Commit d0788bd

Browse files
author
rwxd
committed
läuft
1 parent 2e177ef commit d0788bd

File tree

22 files changed

+632
-121
lines changed

22 files changed

+632
-121
lines changed

‎data/groups/mycompany/leaf/topology.yml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
type: TopologyConfiguration
2+
3+
interfaces:
4+
- name: swp51
5+
description: "Spine01"
6+
type: ethernet
7+
enabled: true
8+
9+
- name: swp52
10+
description: "Spine02"
11+
type: ethernet
12+
enabled: true
13+
14+
- name: swp53
15+
description: "Spine03"
16+
type: ethernet
17+
enabled: true
18+
19+
- name: swp54
20+
description: "Spine04"
21+
type: ethernet
22+
enabled: true
23+
24+
- name: swp1
25+
description: "Server01"
26+
type: ethernet
27+
enabled: true
28+
untagged_vlan: 10
29+
30+
- name: swp2
31+
description: "Server02"
32+
type: ethernet
33+
enabled: true
34+
untagged_vlan: 10
35+
36+
- name: swp3
37+
description: "Server03"
38+
type: ethernet
39+
enabled: true
40+
untagged_vlan: 11
41+
42+
- name: vlan10
43+
description: Krasses VLAN 10
44+
type: vlan
45+
vlan_id: 10
46+
vrf: lab
47+
addresses:
48+
- address: 192.168.1.1/24
49+
50+
- name: vlan11
51+
description: Krasses VLAN 11
52+
type: vlan
53+
vlan_id: 11
54+
vrf: lab
55+
addresses:
56+
- address: 192.168.2.1/24
57+
58+
- name: vlan12
59+
description: Krasses VLAN 12
60+
type: vlan
61+
vlan_id: 12
62+
vrf: lab
63+
addresses:
64+
- address: 192.168.3.1/24
65+
66+
vxlans:
67+
- vni: 10010
68+
vlan: 10
69+
70+
- vni: 10011
71+
vlan: 11
72+
73+
- vni: 10012
74+
vlan: 12
75+
76+
vrfs:
77+
- name: lab
78+
l3vni: 403346
79+
l3vlan: 3000

‎data/hosts/mycompany/leaf1.example.com/topology.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
type: TopologyConfiguration
33

44
interfaces:
5+
- name: loopback1
6+
description: "Loopback 1"
7+
type: loopback
8+
enabled: true
9+
addresses:
10+
- address: 228.139.233.56
11+
512
- name: GigabitEthernet0/1
613
description: "Port 1"
714
type: ethernet
@@ -10,6 +17,7 @@ interfaces:
1017
- address: 206.12.48.220
1118
- address: 0e92:1d5b:e53e:0bf9:047b:5a9f:10d6:710a
1219
mtu: 1500
20+
1321
- name: GigabitEthernet0/2
1422
description: "Port 2"
1523
type: ethernet

‎data/hosts/mycompany/leaf2.example.com/topology.yml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,8 @@
22
type: TopologyConfiguration
33

44
interfaces:
5-
- name: GigabitEthernet0/1
6-
description: "Port 1"
7-
type: ethernet
8-
enabled: true
9-
connected_to:
10-
hostname: sw1
11-
interface: GigabitEthernet0/2
5+
- name: lo
6+
description: "Loopback"
7+
type: loopback
128
addresses:
13-
- address: 191.246.222.49
14-
- address: 14df:2fc2:ff81:e66b:4fae:086f:3018:ecf0
15-
mtu: 1500
16-
- name: GigabitEthernet0/2
17-
description: "Port 2"
18-
type: ethernet
19-
enabled: true
20-
connected_to:
21-
hostname: sw1
22-
interface: GigabitEthernet0/1
23-
addresses:
24-
- address: 20.252.58.106
25-
- address: 8598:1604:bba7:770e:6344:7926:3778:be7b
9+
- address: 10.0.2.2/32

‎docs/schemas/build.schema.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎docs/schemas/network.definitions.schema.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang=en> <head><link rel=stylesheet type=text/css href="https://fonts.googleapis.com/css?family=Overpass:300,400,600,800"><script src=https://code.jquery.com/jquery-3.4.1.min.js integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin=anonymous></script><link href=https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css rel=stylesheet integrity=sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T crossorigin=anonymous><script src=https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js integrity=sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM crossorigin=anonymous></script><link rel=stylesheet type=text/css href=schema_doc.css><script src=https://use.fontawesome.com/facf9fa52c.js></script><script src=schema_doc.min.js></script><meta charset=utf-8><title>JSON Schema Definitions for Network Objects</title></head> <body onload=anchorOnLoad(); id=root><h1>JSON Schema Definitions for Network Objects</h1> <div class=breadcrumbs></div><span class="badge badge-dark value-type">Type: object</span><br> <footer> <p class=generated-by-footer>Generated using <a href=https://github.com/coveooss/json-schema-for-humans>json-schema-for-humans</a> on 2022-01-09 at 21:00:56 +0100</p> </footer></body> </html>
1+
<!DOCTYPE html><html lang=en> <head><link rel=stylesheet type=text/css href="https://fonts.googleapis.com/css?family=Overpass:300,400,600,800"><script src=https://code.jquery.com/jquery-3.4.1.min.js integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin=anonymous></script><link href=https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css rel=stylesheet integrity=sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T crossorigin=anonymous><script src=https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js integrity=sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM crossorigin=anonymous></script><link rel=stylesheet type=text/css href=schema_doc.css><script src=https://use.fontawesome.com/facf9fa52c.js></script><script src=schema_doc.min.js></script><meta charset=utf-8><title>JSON Schema Definitions for Network Objects</title></head> <body onload=anchorOnLoad(); id=root><h1>JSON Schema Definitions for Network Objects</h1> <div class=breadcrumbs></div><span class="badge badge-dark value-type">Type: object</span><br> <footer> <p class=generated-by-footer>Generated using <a href=https://github.com/coveooss/json-schema-for-humans>json-schema-for-humans</a> on 2022-01-09 at 23:11:44 +0100</p> </footer></body> </html>

‎docs/schemas/routing.schema.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎docs/schemas/system.schema.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎docs/schemas/topology.schema.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎eve/builder/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __init__(
4848
):
4949
self.renderer = TemplateRenderer(
5050
basepath=templates,
51-
devices=devices,
51+
devices=[d.name for d in devices],
5252
cache=cache,
5353
classifier=classifier,
5454
jerakia=jerakia,

‎eve/jerakia.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ def lookup(self, device: str, namespace: str, key: str) -> Any:
3838
The key can be multiple layers deep e.g. "foo.bar.baz"
3939
'''
4040
scope = self.classifier.scope(find_host_dir(device))
41+
searchpaths = self.searchpaths(scope)
4142
found = None
42-
for path in self.searchpaths(scope):
43+
for path in searchpaths:
4344
path = self.datapath.joinpath(path).joinpath(f'{namespace}.yml')
4445
if not path.exists():
4546
logger.warning(f'Could not find {path}')

0 commit comments

Comments
 (0)