Fix for py2.7 support

Author: zoedt

cisco_aci/datadog_checks/cisco_aci/fabric.py

@@ -220,18 +220,18 @@ def submit_node_metadata(self, node_attrs, tags):
         vendor = 'cisco_aci'
         namespace = 'default'
         node = Node(attributes=node_attrs)
-        id_tags = [f'namespace:{namespace}', f'system_ip:{node.attributes.address}']
+        id_tags = ['namespace:{}'.format(namespace), 'system_ip:{}'.format(node.attributes.address)]
         device_tags = [
-            f'device_vendor:{vendor}',
-            f'device_namespace:{namespace}',
-            f'device_hostname:{node.attributes.dn}',
-            f'hostname:{node.attributes.dn}',
-            f'system_ip:{node.attributes.address}',
-            f'device_ip:{node.attributes.address}',
-            f'device_id:{namespace}:{node.attributes.address}',
+            'device_vendor:{}'.format(vendor),
+            'device_namespace:{}'.format(namespace),
+            'device_hostname:{}'.format(node.attributes.dn),
+            'hostname:{}'.format(node.attributes.dn),
+            'system_ip:{}'.format(node.attributes.address),
+            'device_ip:{}'.format(node.attributes.address),
+            'device_id:{}:{}'.format(namespace, node.attributes.address),
         ]
         device = DeviceMetadata(
-            device_id=f'{namespace}:{node.attributes.address}',
+            device_id='{}:{}'.format(namespace, node.attributes.address),
             id_tags=id_tags,
             tags=device_tags + tags,
             name=node.attributes.dn,
@@ -248,12 +248,12 @@ def submit_interface_metadata(self, eth_attr, address, tags):
         eth = Eth(attributes=eth_attr)
         namespace = 'default'
         interface = InterfaceMetadata(
-            device_id=f'{namespace}:{address}',
+            device_id='{}:{}'.format(namespace, address),
             id_tags=tags,
-            index=f'{eth.attributes.id}',
-            name=f'{eth.attributes.name}',
-            description=f'{eth.attributes.desc}',
-            mac_address=f'{eth.attributes.router_mac}',
-            admin_status=f'{eth.attributes.admin_st}',
+            index=eth.attributes.id,
+            name=eth.attributes.name,
+            description=eth.attributes.desc,
+            mac_address=eth.attributes.router_mac,
+            admin_status=eth.attributes.admin_st,
         )
         self.ndm_metadata(json.dumps(interface.model_dump()))

cisco_aci/datadog_checks/cisco_aci/models.py

@@ -1,49 +1,50 @@
 # (C) Datadog, Inc. 2024-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
+from typing import Optional
 
 from pydantic import BaseModel, Field, computed_field
 
 
 class NodeAttributes(BaseModel):
-    address: str | None = None
-    ad_st: str | None = Field(default=None, alias="adSt")
-    role: str | None = None
-    dn: str | None = None
-    model: str | None = None
-    version: str | None = None
-    serial: str | None = None
-    vendor: str | None = Field(default='cisco_aci')
-    namespace: str | None = Field(default='default')
+    address: Optional[str] = None
+    ad_st: Optional[str] = Field(default=None, alias="adSt")
+    role: Optional[str] = None
+    dn: Optional[str] = None
+    model: Optional[str] = None
+    version: Optional[str] = None
+    serial: Optional[str] = None
+    vendor: Optional[str] = Field(default='cisco_aci')
+    namespace: Optional[str] = Field(default='default')
 
 
 class Node(BaseModel):
     attributes: NodeAttributes
 
 
 class EthAttributes(BaseModel):
-    admin_st: str | None = Field(default=None, alias="adminSt")
-    id: str | None = None
-    name: str | None = None
-    desc: str | None = None
-    router_mac: str | None = Field(default=None, alias="routerMac")
+    admin_st: Optional[str] = Field(default=None, alias="adminSt")
+    id: Optional[str] = None
+    name: Optional[str] = None
+    desc: Optional[str] = None
+    router_mac: Optional[str] = Field(default=None, alias="routerMac")
 
 
 class Eth(BaseModel):
     attributes: EthAttributes
 
 
 class DeviceMetadata(BaseModel):
-    device_id: str | None = Field(default=None)
+    device_id: Optional[str] = Field(default=None)
     id_tags: list = Field(default_factory=list)
     tags: list = Field(default_factory=list)
-    name: str | None = Field(default=None)
-    ip_address: str | None = Field(default=None)
-    model: str | None = Field(default=None)
-    ad_st: str | None = Field(default=None, exclude=True)
-    vendor: str | None = Field(default=None)
-    version: str | None = Field(default=None)
-    serial_number: str | None = Field(default=None)
+    name: Optional[str] = Field(default=None)
+    ip_address: Optional[str] = Field(default=None)
+    model: Optional[str] = Field(default=None)
+    ad_st: Optional[str] = Field(default=None, exclude=True)
+    vendor: Optional[str] = Field(default=None)
+    version: Optional[str] = Field(default=None)
+    serial_number: Optional[str] = Field(default=None)
 
     @computed_field
     @property
@@ -56,13 +57,13 @@ class DeviceMetadataList(BaseModel):
 
 
 class InterfaceMetadata(BaseModel):
-    device_id: str | None = Field(default=None)
+    device_id: Optional[str] = Field(default=None)
     id_tags: list = Field(default_factory=list)
-    index: str | None = Field(default=None)
-    name: str | None = Field(default=None)
-    description: str | None = Field(default=None)
-    mac_address: str | None = Field(default=None)
-    admin_status: str | None = Field(default=None, exclude=True)
+    index: Optional[str] = Field(default=None)
+    name: Optional[str] = Field(default=None)
+    description: Optional[str] = Field(default=None)
+    mac_address: Optional[str] = Field(default=None)
+    admin_status: Optional[str] = Field(default=None, exclude=True)
 
     @computed_field
     @property