fix(xo-server-netbox): compare compact notations of IPv6 (#5822)

XAPI doesn't use IPv6 compact notation while Netbox automatically compacts them
on creation. Comparing those 2 notations makes XO believe that the IPs in
Netbox should be deleted and new ones should be created, even though they're
actually the same IPs. This change compacts the IPs before comparing them.

CHANGELOG.unreleased.md

@@ -24,6 +24,7 @@
 - [New VM] Fix summary section always showing "0 B" for RAM (PR [#5817](https://github.com/vatesfr/xen-orchestra/pull/5817))
 - [Backup/Restore] Fix _start VM after restore_ [5820](https://github.com/vatesfr/xen-orchestra/issues/5820)
 - [Netbox] Fix a bug where some devices' IPs would get deleted from Netbox (PR [#5821](https://github.com/vatesfr/xen-orchestra/pull/5821))
+- [Netbox] Fix an issue where some IPv6 would be deleted just to be immediately created again (PR [#5822](https://github.com/vatesfr/xen-orchestra/pull/5822))
 
 ### Packages to release
 

packages/xo-server-netbox/package.json

@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@xen-orchestra/log": "^0.2.1",
-    "is-in-subnet": "^4.0.1",
+    "ipaddr.js": "^2.0.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {

packages/xo-server-netbox/src/index.js

@@ -1,7 +1,7 @@
 import assert from 'assert'
+import ipaddr from 'ipaddr.js'
 import { createLogger } from '@xen-orchestra/log'
 import { find, flatten, forEach, groupBy, isEmpty, keyBy, mapValues, trimEnd, zipObject } from 'lodash'
-import { isInSubnet } from 'is-in-subnet'
 
 const log = createLogger('xo:netbox')
 
@@ -492,13 +492,22 @@ class Netbox {
         const interfaceOldIps = oldNetboxIps[interface_.id] ?? []
 
         for (const ip of vifIps) {
+          const parsedIp = ipaddr.parse(ip)
+          const ipKind = parsedIp.kind()
+          const ipCompactNotation = parsedIp.toString()
           // FIXME: Should we compare the IPs with their range? ie: can 2 IPs
           // look identical but belong to 2 different ranges?
-          const netboxIpIndex = interfaceOldIps.findIndex(netboxIp => netboxIp.address.split('/')[0] === ip)
+          const netboxIpIndex = interfaceOldIps.findIndex(
+            netboxIp => ipaddr.parse(netboxIp.address.split('/')[0]).toString() === ipCompactNotation
+          )
           if (netboxIpIndex >= 0) {
             interfaceOldIps.splice(netboxIpIndex, 1)
           } else {
-            const prefix = prefixes.find(({ prefix }) => isInSubnet(ip, prefix))
+            const prefix = prefixes.find(({ prefix }) => {
+              const [range, bits] = prefix.split('/')
+              const parsedRange = ipaddr.parse(range)
+              return parsedRange.kind() === ipKind && parsedIp.match(parsedRange, bits)
+            })
             if (prefix === undefined) {
               ignoredIps.push(ip)
               continue

yarn.lock

@@ -8777,6 +8777,11 @@ ipaddr.js@1.9.1, ipaddr.js@^1.9.0, ipaddr.js@^1.9.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
+ipaddr.js@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
+  integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
+
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -9038,11 +9043,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-in-subnet@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-in-subnet/-/is-in-subnet-4.0.1.tgz#7a93bf67636021598dc483e934d8841cb8b7a537"
-  integrity sha512-D3mAuAo6vZ+/AxsLkEIZ3moTx7AIGQLLzLQslV6n0RRO/CzdUemXap+lj3OPAehKCbdkGPikxOVUYqRo0GGJAA==
-
 is-installed-globally@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"