From e5cb2860f5ddd80554ac2d64522668a58766be8f Mon Sep 17 00:00:00 2001 From: Pizzosaure Date: Mon, 30 Oct 2023 10:40:49 +0100 Subject: [PATCH 1/4] feat(xo-app/PIFs): check if PIF is bondSlave or bondMaster --- packages/xo-web/src/xo-app/new/network/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3cdc0afc919..3b78eace079 100644 --- a/packages/xo-web/src/xo-app/new/network/index.js +++ b/packages/xo-web/src/xo-app/new/network/index.js @@ -156,7 +156,7 @@ const NewNetwork = decorate([ pifPredicate: (_, { pool }) => pif => - !pif.isBondSlave && pif.vlan === -1 && pif.$host === (pool && pool.master), + !pif.isBondSlave && !pif.isBondMaster && pif.vlan === -1 && pif.$host === (pool && pool.master), pifPredicateSdnController: (_, { pool }) => pif => From e715a3b01151264b659d691c331bf8408c5559a6 Mon Sep 17 00:00:00 2001 From: Pizzosaure Date: Mon, 30 Oct 2023 13:15:29 +0100 Subject: [PATCH 2/4] feat(xo-web/New network): don't show PIFs that belong to a bond --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8b189ca39d..a88f8df7b3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - [About] For source users, display if their XO is up to date [#5934](https://github.com/vatesfr/xen-orchestra/issues/5934) (PR [#7091](https://github.com/vatesfr/xen-orchestra/pull/7091)) - [Proxy] Ability to open support tunnel on XO Proxy (PRs [#7126](https://github.com/vatesfr/xen-orchestra/pull/7126) [#7127](https://github.com/vatesfr/xen-orchestra/pull/7127)) - [XOSTOR] Ability to create a XOSTOR storage (PR [#6983](https://github.com/vatesfr/xen-orchestra/pull/6983)) +- [XO-WEB] Don't show PIFs that belong to a bond (PR [#7136](https://github.com/vatesfr/xen-orchestra/pull/7136)) ### Bug fixes From e232dcbc55f4f36a5e5e8c7adc187e38628417a9 Mon Sep 17 00:00:00 2001 From: Pizzosaure Date: Mon, 30 Oct 2023 15:03:15 +0100 Subject: [PATCH 3/4] changelog message correction --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a88f8df7b3e..a6177ec65fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ - [About] For source users, display if their XO is up to date [#5934](https://github.com/vatesfr/xen-orchestra/issues/5934) (PR [#7091](https://github.com/vatesfr/xen-orchestra/pull/7091)) - [Proxy] Ability to open support tunnel on XO Proxy (PRs [#7126](https://github.com/vatesfr/xen-orchestra/pull/7126) [#7127](https://github.com/vatesfr/xen-orchestra/pull/7127)) - [XOSTOR] Ability to create a XOSTOR storage (PR [#6983](https://github.com/vatesfr/xen-orchestra/pull/6983)) -- [XO-WEB] Don't show PIFs that belong to a bond (PR [#7136](https://github.com/vatesfr/xen-orchestra/pull/7136)) +- [New network] Remove bonded PIFs from selector when creating bonded network (PR [#7136](https://github.com/vatesfr/xen-orchestra/pull/7136)) ### Bug fixes From ebd5487faa14010a7a1e538d8daea2867e71af63 Mon Sep 17 00:00:00 2001 From: Pizzosaure Date: Mon, 30 Oct 2023 15:41:07 +0100 Subject: [PATCH 4/4] changelog message correction --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6177ec65fa..c6258f57391 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ - [About] For source users, display if their XO is up to date [#5934](https://github.com/vatesfr/xen-orchestra/issues/5934) (PR [#7091](https://github.com/vatesfr/xen-orchestra/pull/7091)) - [Proxy] Ability to open support tunnel on XO Proxy (PRs [#7126](https://github.com/vatesfr/xen-orchestra/pull/7126) [#7127](https://github.com/vatesfr/xen-orchestra/pull/7127)) - [XOSTOR] Ability to create a XOSTOR storage (PR [#6983](https://github.com/vatesfr/xen-orchestra/pull/6983)) -- [New network] Remove bonded PIFs from selector when creating bonded network (PR [#7136](https://github.com/vatesfr/xen-orchestra/pull/7136)) +- [New network] Remove bonded PIFs from selector when creating network (PR [#7136](https://github.com/vatesfr/xen-orchestra/pull/7136)) ### Bug fixes