Skip to content

Commit 308381e

Browse files
zoedtzoedt
committed
Lint
1 parent 0fbd388 commit 308381e

File tree

3 files changed

+106
-17
lines changed

3 files changed

+106
-17
lines changed

‎cisco_aci/datadog_checks/cisco_aci/fabric.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from datadog_checks.base.utils.serialization import json
88
from datadog_checks.cisco_aci.models import DeviceMetadata, Node
9+
910
from . import aci_metrics, exceptions, helpers
1011

1112

@@ -216,12 +217,9 @@ def get_fabric_type(self, obj_type):
216217

217218
def submit_node_metadata(self, node_attrs, tags):
218219
vendor = 'cisco_aci'
219-
namespace='default'
220+
namespace = 'default'
220221
node = Node(attributes=node_attrs)
221-
id_tags = [
222-
f'namespace:{namespace}',
223-
f'system_ip:{node.attributes.address}'
224-
]
222+
id_tags = [f'namespace:{namespace}', f'system_ip:{node.attributes.address}']
225223
device_tags = [
226224
f'device_vendor:{vendor}',
227225
f'device_namespace:{namespace}',
@@ -241,6 +239,6 @@ def submit_node_metadata(self, node_attrs, tags):
241239
adSt=node.attributes.adSt,
242240
vendor=vendor,
243241
version=node.attributes.version,
244-
serial_number=node.attributes.serial
242+
serial_number=node.attributes.serial,
245243
)
246244
self.ndm_metadata(json.dumps(device.model_dump()))

‎cisco_aci/datadog_checks/cisco_aci/models.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
from pydantic import BaseModel, Field, computed_field
66

7+
78
class NodeAttributes(BaseModel):
89
address: str | None = None
910
adSt: str | None = None
@@ -15,14 +16,16 @@ class NodeAttributes(BaseModel):
1516
vendor: str | None = Field(default='cisco_aci')
1617
namespace: str | None = Field(default='default')
1718

19+
1820
class Node(BaseModel):
1921
attributes: NodeAttributes
2022

23+
2124
class DeviceMetadata(BaseModel):
2225
device_id: str | None = Field(default=None)
2326
id_tags: list = Field(default_factory=list)
2427
tags: list = Field(default_factory=list)
25-
name: str | None = Field(default=None)
28+
name: str | None = Field(default=None)
2629
ip_address: str | None = Field(default=None)
2730
model: str | None = Field(default=None)
2831
adSt: str | None = Field(default=None, exclude=True)
@@ -33,7 +36,8 @@ class DeviceMetadata(BaseModel):
3336
@computed_field
3437
@property
3538
def status(self) -> int:
36-
return 1 if self.adSt=='on' else 2
39+
return 1 if self.adSt == 'on' else 2
40+
3741

3842
class DeviceMetadataList(BaseModel):
39-
device_metadata: list = Field(default_factory=list)
43+
device_metadata: list = Field(default_factory=list)

‎cisco_aci/tests/test_fabric.py

Lines changed: 95 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,24 @@
99

1010
from . import common
1111

12-
1312
DATA = [
1413
{
1514
'device_id': 'default:10.0.200.0',
1615
'id_tags': ['namespace:default', 'system_ip:10.0.200.0'],
17-
'tags': ['device_vendor:cisco_aci', 'device_namespace:default', 'device_hostname:topology/pod-1/node-101', 'hostname:topology/pod-1/node-101', 'system_ip:10.0.200.0', 'device_ip:10.0.200.0', 'device_id:default:10.0.200.0', 'switch_role:leaf', 'apic_role:leaf', 'node_id:101', 'fabric_state:active', 'fabric_pod_id:1'],
16+
'tags': [
17+
'device_vendor:cisco_aci',
18+
'device_namespace:default',
19+
'device_hostname:topology/pod-1/node-101',
20+
'hostname:topology/pod-1/node-101',
21+
'system_ip:10.0.200.0',
22+
'device_ip:10.0.200.0',
23+
'device_id:default:10.0.200.0',
24+
'switch_role:leaf',
25+
'apic_role:leaf',
26+
'node_id:101',
27+
'fabric_state:active',
28+
'fabric_pod_id:1',
29+
],
1830
'ip_address': '10.0.200.0',
1931
'model': 'N9K-C93180YC-FX',
2032
'name': 'topology/pod-1/node-101',
@@ -26,7 +38,20 @@
2638
{
2739
'device_id': 'default:10.0.200.1',
2840
'id_tags': ['namespace:default', 'system_ip:10.0.200.1'],
29-
'tags': ['device_vendor:cisco_aci', 'device_namespace:default', 'device_hostname:topology/pod-1/node-102', 'hostname:topology/pod-1/node-102', 'system_ip:10.0.200.1', 'device_ip:10.0.200.1', 'device_id:default:10.0.200.1', 'switch_role:leaf', 'apic_role:leaf', 'node_id:102', 'fabric_state:active', 'fabric_pod_id:1'],
41+
'tags': [
42+
'device_vendor:cisco_aci',
43+
'device_namespace:default',
44+
'device_hostname:topology/pod-1/node-102',
45+
'hostname:topology/pod-1/node-102',
46+
'system_ip:10.0.200.1',
47+
'device_ip:10.0.200.1',
48+
'device_id:default:10.0.200.1',
49+
'switch_role:leaf',
50+
'apic_role:leaf',
51+
'node_id:102',
52+
'fabric_state:active',
53+
'fabric_pod_id:1',
54+
],
3055
'ip_address': '10.0.200.1',
3156
'model': 'N9K-C93180YC-FX',
3257
'name': 'topology/pod-1/node-102',
@@ -38,7 +63,20 @@
3863
{
3964
'device_id': 'default:10.0.200.2',
4065
'id_tags': ['namespace:default', 'system_ip:10.0.200.2'],
41-
'tags': ['device_vendor:cisco_aci', 'device_namespace:default', 'device_hostname:topology/pod-1/node-202', 'hostname:topology/pod-1/node-202', 'system_ip:10.0.200.2', 'device_ip:10.0.200.2', 'device_id:default:10.0.200.2', 'switch_role:spine', 'apic_role:spine', 'node_id:202', 'fabric_state:active', 'fabric_pod_id:1'],
66+
'tags': [
67+
'device_vendor:cisco_aci',
68+
'device_namespace:default',
69+
'device_hostname:topology/pod-1/node-202',
70+
'hostname:topology/pod-1/node-202',
71+
'system_ip:10.0.200.2',
72+
'device_ip:10.0.200.2',
73+
'device_id:default:10.0.200.2',
74+
'switch_role:spine',
75+
'apic_role:spine',
76+
'node_id:202',
77+
'fabric_state:active',
78+
'fabric_pod_id:1',
79+
],
4280
'ip_address': '10.0.200.2',
4381
'model': 'N9K-C9336PQ',
4482
'name': 'topology/pod-1/node-202',
@@ -50,7 +88,19 @@
5088
{
5189
'device_id': 'default:10.0.200.3',
5290
'id_tags': ['namespace:default', 'system_ip:10.0.200.3'],
53-
'tags': ['device_vendor:cisco_aci', 'device_namespace:default', 'device_hostname:topology/pod-1/node-3', 'hostname:topology/pod-1/node-3', 'system_ip:10.0.200.3', 'device_ip:10.0.200.3', 'device_id:default:10.0.200.3', 'apic_role:controller', 'node_id:3', 'fabric_state:unknown', 'fabric_pod_id:1'],
91+
'tags': [
92+
'device_vendor:cisco_aci',
93+
'device_namespace:default',
94+
'device_hostname:topology/pod-1/node-3',
95+
'hostname:topology/pod-1/node-3',
96+
'system_ip:10.0.200.3',
97+
'device_ip:10.0.200.3',
98+
'device_id:default:10.0.200.3',
99+
'apic_role:controller',
100+
'node_id:3',
101+
'fabric_state:unknown',
102+
'fabric_pod_id:1',
103+
],
54104
'ip_address': '10.0.200.3',
55105
'model': 'APIC-SERVER-M1',
56106
'name': 'topology/pod-1/node-3',
@@ -62,7 +112,19 @@
62112
{
63113
'device_id': 'default:10.0.200.4',
64114
'id_tags': ['namespace:default', 'system_ip:10.0.200.4'],
65-
'tags': ['device_vendor:cisco_aci', 'device_namespace:default', 'device_hostname:topology/pod-1/node-1', 'hostname:topology/pod-1/node-1', 'system_ip:10.0.200.4', 'device_ip:10.0.200.4', 'device_id:default:10.0.200.4', 'apic_role:controller', 'node_id:1', 'fabric_state:unknown', 'fabric_pod_id:1'],
115+
'tags': [
116+
'device_vendor:cisco_aci',
117+
'device_namespace:default',
118+
'device_hostname:topology/pod-1/node-1',
119+
'hostname:topology/pod-1/node-1',
120+
'system_ip:10.0.200.4',
121+
'device_ip:10.0.200.4',
122+
'device_id:default:10.0.200.4',
123+
'apic_role:controller',
124+
'node_id:1',
125+
'fabric_state:unknown',
126+
'fabric_pod_id:1',
127+
],
66128
'ip_address': '10.0.200.4',
67129
'model': 'APIC-SERVER-M1',
68130
'name': 'topology/pod-1/node-1',
@@ -74,7 +136,20 @@
74136
{
75137
'device_id': 'default:10.0.200.5',
76138
'id_tags': ['namespace:default', 'system_ip:10.0.200.5'],
77-
'tags': ['device_vendor:cisco_aci', 'device_namespace:default', 'device_hostname:topology/pod-1/node-201', 'hostname:topology/pod-1/node-201', 'system_ip:10.0.200.5', 'device_ip:10.0.200.5', 'device_id:default:10.0.200.5', 'switch_role:spine', 'apic_role:spine', 'node_id:201', 'fabric_state:active', 'fabric_pod_id:1'],
139+
'tags': [
140+
'device_vendor:cisco_aci',
141+
'device_namespace:default',
142+
'device_hostname:topology/pod-1/node-201',
143+
'hostname:topology/pod-1/node-201',
144+
'system_ip:10.0.200.5',
145+
'device_ip:10.0.200.5',
146+
'device_id:default:10.0.200.5',
147+
'switch_role:spine',
148+
'apic_role:spine',
149+
'node_id:201',
150+
'fabric_state:active',
151+
'fabric_pod_id:1',
152+
],
78153
'ip_address': '10.0.200.5',
79154
'model': 'N9K-C9336PQ',
80155
'name': 'topology/pod-1/node-201',
@@ -86,7 +161,19 @@
86161
{
87162
'device_id': 'default:10.0.200.6',
88163
'id_tags': ['namespace:default', 'system_ip:10.0.200.6'],
89-
'tags': ['device_vendor:cisco_aci', 'device_namespace:default', 'device_hostname:topology/pod-1/node-2', 'hostname:topology/pod-1/node-2', 'system_ip:10.0.200.6', 'device_ip:10.0.200.6', 'device_id:default:10.0.200.6', 'apic_role:controller', 'node_id:2', 'fabric_state:unknown', 'fabric_pod_id:1'],
164+
'tags': [
165+
'device_vendor:cisco_aci',
166+
'device_namespace:default',
167+
'device_hostname:topology/pod-1/node-2',
168+
'hostname:topology/pod-1/node-2',
169+
'system_ip:10.0.200.6',
170+
'device_ip:10.0.200.6',
171+
'device_id:default:10.0.200.6',
172+
'apic_role:controller',
173+
'node_id:2',
174+
'fabric_state:unknown',
175+
'fabric_pod_id:1',
176+
],
90177
'ip_address': '10.0.200.6',
91178
'model': 'APIC-SERVER-M1',
92179
'name': 'topology/pod-1/node-2',

0 commit comments

Comments
 (0)