forked from yast/yast-network
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'SLE-15-SP3' into SLE-15-SP4
- Loading branch information
Showing
4 changed files
with
55 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,11 @@ | ||
------------------------------------------------------------------- | ||
Tue Jun 13 12:11:42 UTC 2023 - Michal Filka <[email protected]> | ||
|
||
- bsc#1211431 | ||
- Do not crash installation when storing vlan configuration into | ||
NetworkManager | ||
- 4.4.58 | ||
|
||
------------------------------------------------------------------- | ||
Wed May 10 07:29:32 UTC 2023 - Knut Anderssen <[email protected]> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
test/y2network/network_manager/connection_config_writers/vlan_test.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
# Copyright (c) [2021] SUSE LLC | ||
# | ||
# All Rights Reserved. | ||
# | ||
# This program is free software; you can redistribute it and/or modify it | ||
# under the terms of version 2 of the GNU General Public License as published | ||
# by the Free Software Foundation. | ||
# | ||
# This program is distributed in the hope that it will be useful, but WITHOUT | ||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
# more details. | ||
# | ||
# You should have received a copy of the GNU General Public License along | ||
# with this program; if not, contact SUSE LLC. | ||
# | ||
# To contact SUSE LLC about this file by physical or electronic mail, you may | ||
# find current contact information at www.suse.com. | ||
|
||
require_relative "../../../test_helper" | ||
require "y2network/network_manager/connection_config_writers/vlan" | ||
require "cfa/nm_connection" | ||
require "y2network/boot_protocol" | ||
require "y2network/startmode" | ||
require "y2network/connection_config/vlan" | ||
|
||
describe Y2Network::NetworkManager::ConnectionConfigWriters::Vlan do | ||
subject(:handler) { described_class.new(file) } | ||
let(:file) { CFA::NmConnection.new("bond0.nm_connection") } | ||
|
||
let(:conn) do | ||
Y2Network::ConnectionConfig::Vlan.new.tap do |c| | ||
c.interface = "eth0.1006" | ||
c.vlan_id = 1006 | ||
end | ||
end | ||
|
||
describe "#write" do | ||
it "sets device and IP relevant attributes" do | ||
handler.write(conn) | ||
expect(file.vlan["type"]).to eql("vlan") | ||
expect(file.vlan["id"]).to eql("1006") | ||
end | ||
end | ||
end |