kvm, ui: fix interface when using vlan subnet for storage traffic type #11245
Conversation
Fixes apache#7816 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 4.19 #11245 +/- ##
==========================================
Coverage 15.17% 15.17%
- Complexity 11349 11363 +14
==========================================
Files 5416 5415 -1
Lines 475621 476037 +416
Branches 58054 58117 +63
==========================================
+ Hits 72168 72246 +78
- Misses 395380 395708 +328
- Partials 8073 8083 +10
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Pull Request Overview
This PR fixes an issue where VLAN subnet configurations for storage traffic type were not properly handled in both the KVM hypervisor and the UI. The fix ensures that VLAN-tagged storage networks are correctly created and displayed.
- Updates the UI to display the correct VLAN field for storage IP ranges
- Adds VLAN support for storage traffic type in the KVM bridge VIF driver
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| ui/src/views/infra/network/IpRangesTabStorage.vue | Changes dataIndex from 'vlanid' to 'vlan' to fix VLAN display in storage IP ranges table |
| plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java | Adds VLAN handling logic for storage traffic type to create proper VLAN bridges |
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
Outdated
Show resolved
Hide resolved
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
Outdated
Show resolved
Hide resolved
|
@shwstppr is this ready for review/test? |
|
@sureshanaparti this would need testing with the specific setup. I need to check with @rajujith about that. Will update you next week |
|
@blueorangutan package |
|
@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 14405 |
There was a problem hiding this comment.
LGTM.
Based on my review of the fix, it works fine for VLAN. @shwstppr informed that this works for VLAN but if we need to support VXLAN that could be done separately.
mysql> select * from dc_storage_network_ip_range;
+----+--------------------------------------+-------------+-------------+-----------+------+---------------+----------------+--------+------------+
| id | uuid | start_ip | end_ip | gateway | vlan | netmask | data_center_id | pod_id | network_id |
+----+--------------------------------------+-------------+-------------+-----------+------+---------------+----------------+--------+------------+
| 2 | 24b29069-e174-4d3b-bdc6-72fc71b49c44 | 10.1.96.201 | 10.1.96.205 | 10.1.96.1 | 54 | 255.255.240.0 | 1 | 1 | 203 |
+----+--------------------------------------+-------------+-------------+-----------+------+---------------+----------------+--------+------------+
virsh domiflist s-276-VM
Interface Type Source Model MAC
--------------------------------------------------------------
vnet10 bridge cloud0 virtio 0e:00:a9:fe:8d:f0
vnet11 bridge cloudbr0 virtio 1e:00:5d:00:00:30
vnet12 bridge breth1-51 virtio 1e:00:0f:00:00:01
vnet13 bridge breth1-54 virtio 1e:00:1b:00:00:44
ip link show master breth1-54
24: eth1.54@eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue master breth1-54 state UP mode DEFAULT group default qlen 1000
link/ether 02:00:72:04:11:7d brd ff:ff:ff:ff:ff:ff
29: vnet13: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue master breth1-54 state UNKNOWN mode DEFAULT group default qlen 1000
link/ether fe:00:1b:00:00:44 brd ff:ff:ff:ff:ff:ff
root@s-276-VM:~# ip -brief addr show dev eth3
eth3 UP 10.1.96.203/20
root@s-276-VM:~# mount -t nfs,nfs4
10.1.96.101:/mnt/NFS/Secondary1 on /mnt/SecStorage/15109707-c712-3a8c-9b60-be7f1fdd4710 type nfs4 (rw,relatime,vers=4.2,rsize=262144,wsize=262144,namlen=255,acdirmin=0,acdirmax=0,soft,proto=tcp,timeo=133,retrans=2147483647,sec=sys,clientaddr=10.1.96.203,local_lock=none,addr=10.1.96.101)
Description
Fixes #7816
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
After adding the changes I was able to see new bridge with vlan tag getting created,
UI shows VLAN correctly,
How did you try to break this feature and the system with this change?