Fix NPM topology rules

entity-types/ext-access_point/definition.stg.yml

@@ -100,8 +100,8 @@ synthesis:
     - attribute: deviceName
       present: true
     tags:
-      deviceName:
-        entityTagName: hostname
+      normalizedDeviceName:
+        entityTagName: normalizedName
       observedMac:
         entityTagName: mac
       managementIp:

entity-types/ext-network_device/definition.stg.yml

@@ -14,8 +14,8 @@ synthesis:
     - attribute: deviceName
       present: true
     tags:
-      deviceName:
-        entityTagName: hostname
+      normalizedDeviceName:
+        entityTagName: normalizedName
       observedMac:
         entityTagName: mac
       managementIp:

entity-types/ext-port/definition.stg.yml

@@ -19,7 +19,9 @@ synthesis:
       present: true
     tags:
       deviceName:
-        entityTagName: deviceHostname       # owning device name as the far-port match tier
+        entityTagName: deviceHostname       # owning device name, case-preserved (display/golden tag)
+      normalizedDeviceName:
+        entityTagName: normalizedDeviceHostname   # owning device name, normalized (far-port match tier)
       observedMac:
         entityTagName: deviceMac            # owning device's MAC (best-effort)
       managementIp:

entity-types/ext-router/definition.stg.yml

@@ -49,8 +49,8 @@ synthesis:
     - attribute: deviceName
       present: true
     tags:
-      deviceName:
-        entityTagName: hostname
+      normalizedDeviceName:
+        entityTagName: normalizedName
       observedMac:
         entityTagName: mac
       managementIp:

entity-types/ext-switch/definition.stg.yml

@@ -32,8 +32,8 @@ synthesis:
     - attribute: deviceName
       present: true
     tags:
-      deviceName:
-        entityTagName: hostname
+      normalizedDeviceName:
+        entityTagName: normalizedName
       observedMac:
         entityTagName: mac
       managementIp:

relationships/candidates/NETWORK_DEVICE.stg.yml

@@ -16,8 +16,8 @@ lookups:
           field: mac
         - tagKeys: ["ipAddress", "managementIp", "device_ip"]
           field: managementIp
-        - tagKeys: ["hostname", "host.name"]
-          field: hostname
+        - tagKeys: ["normalizedName"]
+          field: normalizedName
     onMatch:
       onMultipleMatches: RELATE_ALL
     onMiss:

relationships/candidates/NETWORK_PORT.stg.yml

@@ -36,8 +36,8 @@ lookups:
     tags:
       matchingMode: ALL
       predicates:
-        - tagKeys: ["deviceHostname"]
-          field: deviceHostname
+        - tagKeys: ["normalizedDeviceHostname"]
+          field: normalizedDeviceHostname
         - tagKeys: ["port"]
           field: port
     onMatch:

relationships/synthesis/EXT-NETWORK_DEVICE-to-EXT-NETWORK_DEVICE.stg.yml

@@ -1,5 +1,5 @@
 relationships:
-  - name: extSwitchConnectsToDevice
+  - name: extSwitchConnectsToDeviceByMac
     version: "1"
     origins: [Event API]
     conditions:
@@ -8,6 +8,34 @@ relationships:
       - { attribute: deviceName,        present: true }
       - { attribute: dstName,          present: true }
       - { attribute: dstPort,          present: false }   # fallback: no neighbour port → no port chain
+      - { attribute: dstMac,           present: true }
+    relationship:
+      expires: PT75M
+      relationshipType: CONNECTS_TO
+      source:
+        buildGuid:
+          account: { attribute: accountId }
+          domain:  { value: EXT }
+          type:    { value: SWITCH }
+          identifier:
+            fragments: [ { attribute: deviceName } ]
+            hashAlgorithm: FARM_HASH
+      target:
+        lookupGuid:
+          candidateCategory: NETWORK_DEVICE
+          fields:
+            - { field: mac, attribute: dstMac }
+
+  - name: extSwitchConnectsToDeviceByManagementIp
+    version: "1"
+    origins: [Event API]
+    conditions:
+      - { attribute: eventType,         anyOf: ["NetworkTopology"] }
+      - { attribute: networkEntityType, anyOf: ["SWITCH"] }
+      - { attribute: deviceName,        present: true }
+      - { attribute: dstName,          present: true }
+      - { attribute: dstPort,          present: false }
+      - { attribute: dstIp,            present: true }
     relationship:
       expires: PT75M
       relationshipType: CONNECTS_TO
@@ -23,11 +51,35 @@ relationships:
         lookupGuid:
           candidateCategory: NETWORK_DEVICE
           fields:
-            - { field: mac,          attribute: dstMac }
             - { field: managementIp, attribute: dstIp }
-            - { field: hostname,     attribute: dstName }
 
-  - name: extRouterConnectsToDevice
+  - name: extSwitchConnectsToDeviceByNormalizedName
+    version: "1"
+    origins: [Event API]
+    conditions:
+      - { attribute: eventType,         anyOf: ["NetworkTopology"] }
+      - { attribute: networkEntityType, anyOf: ["SWITCH"] }
+      - { attribute: deviceName,        present: true }
+      - { attribute: dstName,          present: true }
+      - { attribute: dstPort,          present: false }
+    relationship:
+      expires: PT75M
+      relationshipType: CONNECTS_TO
+      source:
+        buildGuid:
+          account: { attribute: accountId }
+          domain:  { value: EXT }
+          type:    { value: SWITCH }
+          identifier:
+            fragments: [ { attribute: deviceName } ]
+            hashAlgorithm: FARM_HASH
+      target:
+        lookupGuid:
+          candidateCategory: NETWORK_DEVICE
+          fields:
+            - { field: normalizedName, attribute: dstName }
+
+  - name: extRouterConnectsToDeviceByMac
     version: "1"
     origins: [Event API]
     conditions:
@@ -36,6 +88,34 @@ relationships:
       - { attribute: deviceName,        present: true }
       - { attribute: dstName,          present: true }
       - { attribute: dstPort,          present: false }
+      - { attribute: dstMac,           present: true }
+    relationship:
+      expires: PT75M
+      relationshipType: CONNECTS_TO
+      source:
+        buildGuid:
+          account: { attribute: accountId }
+          domain:  { value: EXT }
+          type:    { value: ROUTER }
+          identifier:
+            fragments: [ { attribute: deviceName } ]
+            hashAlgorithm: FARM_HASH
+      target:
+        lookupGuid:
+          candidateCategory: NETWORK_DEVICE
+          fields:
+            - { field: mac, attribute: dstMac }
+
+  - name: extRouterConnectsToDeviceByManagementIp
+    version: "1"
+    origins: [Event API]
+    conditions:
+      - { attribute: eventType,         anyOf: ["NetworkTopology"] }
+      - { attribute: networkEntityType, anyOf: ["ROUTER"] }
+      - { attribute: deviceName,        present: true }
+      - { attribute: dstName,          present: true }
+      - { attribute: dstPort,          present: false }
+      - { attribute: dstIp,            present: true }
     relationship:
       expires: PT75M
       relationshipType: CONNECTS_TO
@@ -51,11 +131,35 @@ relationships:
         lookupGuid:
           candidateCategory: NETWORK_DEVICE
           fields:
-            - { field: mac,          attribute: dstMac }
             - { field: managementIp, attribute: dstIp }
-            - { field: hostname,     attribute: dstName }
 
-  - name: extAccessPointConnectsToDevice
+  - name: extRouterConnectsToDeviceByNormalizedName
+    version: "1"
+    origins: [Event API]
+    conditions:
+      - { attribute: eventType,         anyOf: ["NetworkTopology"] }
+      - { attribute: networkEntityType, anyOf: ["ROUTER"] }
+      - { attribute: deviceName,        present: true }
+      - { attribute: dstName,          present: true }
+      - { attribute: dstPort,          present: false }
+    relationship:
+      expires: PT75M
+      relationshipType: CONNECTS_TO
+      source:
+        buildGuid:
+          account: { attribute: accountId }
+          domain:  { value: EXT }
+          type:    { value: ROUTER }
+          identifier:
+            fragments: [ { attribute: deviceName } ]
+            hashAlgorithm: FARM_HASH
+      target:
+        lookupGuid:
+          candidateCategory: NETWORK_DEVICE
+          fields:
+            - { field: normalizedName, attribute: dstName }
+
+  - name: extAccessPointConnectsToDeviceByMac
     version: "1"
     origins: [Event API]
     conditions:
@@ -64,6 +168,34 @@ relationships:
       - { attribute: deviceName,        present: true }
       - { attribute: dstName,          present: true }
       - { attribute: dstPort,          present: false }
+      - { attribute: dstMac,           present: true }
+    relationship:
+      expires: PT75M
+      relationshipType: CONNECTS_TO
+      source:
+        buildGuid:
+          account: { attribute: accountId }
+          domain:  { value: EXT }
+          type:    { value: ACCESS_POINT }
+          identifier:
+            fragments: [ { attribute: deviceName } ]
+            hashAlgorithm: FARM_HASH
+      target:
+        lookupGuid:
+          candidateCategory: NETWORK_DEVICE
+          fields:
+            - { field: mac, attribute: dstMac }
+
+  - name: extAccessPointConnectsToDeviceByManagementIp
+    version: "1"
+    origins: [Event API]
+    conditions:
+      - { attribute: eventType,         anyOf: ["NetworkTopology"] }
+      - { attribute: networkEntityType, anyOf: ["ACCESS_POINT"] }
+      - { attribute: deviceName,        present: true }
+      - { attribute: dstName,          present: true }
+      - { attribute: dstPort,          present: false }
+      - { attribute: dstIp,            present: true }
     relationship:
       expires: PT75M
       relationshipType: CONNECTS_TO
@@ -79,11 +211,35 @@ relationships:
         lookupGuid:
           candidateCategory: NETWORK_DEVICE
           fields:
-            - { field: mac,          attribute: dstMac }
             - { field: managementIp, attribute: dstIp }
-            - { field: hostname,     attribute: dstName }
 
-  - name: extNetworkDeviceConnectsToDevice
+  - name: extAccessPointConnectsToDeviceByNormalizedName
+    version: "1"
+    origins: [Event API]
+    conditions:
+      - { attribute: eventType,         anyOf: ["NetworkTopology"] }
+      - { attribute: networkEntityType, anyOf: ["ACCESS_POINT"] }
+      - { attribute: deviceName,        present: true }
+      - { attribute: dstName,          present: true }
+      - { attribute: dstPort,          present: false }
+    relationship:
+      expires: PT75M
+      relationshipType: CONNECTS_TO
+      source:
+        buildGuid:
+          account: { attribute: accountId }
+          domain:  { value: EXT }
+          type:    { value: ACCESS_POINT }
+          identifier:
+            fragments: [ { attribute: deviceName } ]
+            hashAlgorithm: FARM_HASH
+      target:
+        lookupGuid:
+          candidateCategory: NETWORK_DEVICE
+          fields:
+            - { field: normalizedName, attribute: dstName }
+
+  - name: extNetworkDeviceConnectsToDeviceByMac
     version: "1"
     origins: [Event API]
     conditions:
@@ -92,6 +248,34 @@ relationships:
       - { attribute: deviceName,        present: true }
       - { attribute: dstName,          present: true }
       - { attribute: dstPort,          present: false }
+      - { attribute: dstMac,           present: true }
+    relationship:
+      expires: PT75M
+      relationshipType: CONNECTS_TO
+      source:
+        buildGuid:
+          account: { attribute: accountId }
+          domain:  { value: EXT }
+          type:    { value: NETWORK_DEVICE }
+          identifier:
+            fragments: [ { attribute: deviceName } ]
+            hashAlgorithm: FARM_HASH
+      target:
+        lookupGuid:
+          candidateCategory: NETWORK_DEVICE
+          fields:
+            - { field: mac, attribute: dstMac }
+
+  - name: extNetworkDeviceConnectsToDeviceByManagementIp
+    version: "1"
+    origins: [Event API]
+    conditions:
+      - { attribute: eventType,         anyOf: ["NetworkTopology"] }
+      - { attribute: networkEntityType, anyOf: ["NETWORK_DEVICE"] }
+      - { attribute: deviceName,        present: true }
+      - { attribute: dstName,          present: true }
+      - { attribute: dstPort,          present: false }
+      - { attribute: dstIp,            present: true }
     relationship:
       expires: PT75M
       relationshipType: CONNECTS_TO
@@ -107,6 +291,30 @@ relationships:
         lookupGuid:
           candidateCategory: NETWORK_DEVICE
           fields:
-            - { field: mac,          attribute: dstMac }
             - { field: managementIp, attribute: dstIp }
-            - { field: hostname,     attribute: dstName }
+
+  - name: extNetworkDeviceConnectsToDeviceByNormalizedName
+    version: "1"
+    origins: [Event API]
+    conditions:
+      - { attribute: eventType,         anyOf: ["NetworkTopology"] }
+      - { attribute: networkEntityType, anyOf: ["NETWORK_DEVICE"] }
+      - { attribute: deviceName,        present: true }
+      - { attribute: dstName,          present: true }
+      - { attribute: dstPort,          present: false }
+    relationship:
+      expires: PT75M
+      relationshipType: CONNECTS_TO
+      source:
+        buildGuid:
+          account: { attribute: accountId }
+          domain:  { value: EXT }
+          type:    { value: NETWORK_DEVICE }
+          identifier:
+            fragments: [ { attribute: deviceName } ]
+            hashAlgorithm: FARM_HASH
+      target:
+        lookupGuid:
+          candidateCategory: NETWORK_DEVICE
+          fields:
+            - { field: normalizedName, attribute: dstName }