From 53461b86d7d4f924be82f55a60f944700de34033 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Fri, 12 May 2023 09:22:30 +0200
Subject: [PATCH] fix(xo-web/new/network): correct type for vlan

BREAKING CHANGE: API method `network.create` no longer accepts a `string` for `vlan` param.

Fixes https://xcp-ng.org/forum/post/62090

Either `number` or `undefined`, not an empty string.
---
 CHANGELOG.unreleased.md                         | 2 ++
 packages/xo-server/src/api/network.mjs          | 4 ++--
 packages/xo-web/src/xo-app/new/network/index.js | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 1aab93af45e..fb2ac9b7c3a 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -12,6 +12,7 @@
 > Users must be able to say: “I had this issue, happy to know it's fixed”
 
 - [VM] Fix `VBD_IS_EMPTY` error when converting to template [Forum#61653](https://xcp-ng.org/forum/post/61653) (PR [#6808](https://github.com/vatesfr/xen-orchestra/pull/6808))
+- -[New/Network] Fix `invalid parameter error` when not providing a VLAN [Forum#62090](https://xcp-ng.org/forum/post/62090) (PR [#6829](https://github.com/vatesfr/xen-orchestra/pull/6829))
 
 ### Packages to release
 
@@ -30,5 +31,6 @@
 <!--packages-start-->
 
 - xo-server patch
+- xo-web patch
 
 <!--packages-end-->
diff --git a/packages/xo-server/src/api/network.mjs b/packages/xo-server/src/api/network.mjs
index ab01e1f91d2..5d8494523a5 100644
--- a/packages/xo-server/src/api/network.mjs
+++ b/packages/xo-server/src/api/network.mjs
@@ -10,7 +10,7 @@ export async function create({ pool, name, description, pif, mtu = 1500, vlan =
     description,
     pifId: pif && this.getObject(pif, 'PIF')._xapiId,
     mtu: +mtu,
-    vlan: +vlan,
+    vlan,
   })
 
   if (nbd) {
@@ -27,7 +27,7 @@ create.params = {
   description: { type: 'string', minLength: 0, optional: true },
   pif: { type: 'string', optional: true },
   mtu: { type: 'integer', optional: true },
-  vlan: { type: ['integer', 'string'], optional: true },
+  vlan: { type: 'integer', optional: true },
 }
 
 create.resolve = {
diff --git a/packages/xo-web/src/xo-app/new/network/index.js b/packages/xo-web/src/xo-app/new/network/index.js
index 7d0717fd340..3cdc0afc919 100644
--- a/packages/xo-web/src/xo-app/new/network/index.js
+++ b/packages/xo-web/src/xo-app/new/network/index.js
@@ -197,11 +197,11 @@ const NewNetwork = decorate([
         networks,
         pif,
         pifs,
-        vlan,
       } = state
 
-      let { mtu } = state
+      let { mtu, vlan } = state
       mtu = mtu === '' ? undefined : +mtu
+      vlan = vlan === '' ? undefined : +vlan
 
       return bonded
         ? createBondedNetwork({