Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge pull request #1188 from yast/qeth_layer2_always #1190

Merged
merged 1 commit into from
Mar 23, 2021
Merged

Merge pull request #1188 from yast/qeth_layer2_always #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions package/yast2-network.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 17 18:26:34 UTC 2021 - Knut Anderssen <kanderssen@suse.com>

- Always provide the layer2 argument when activating a qeth device
(bsc#1183639).
- 4.2.97

-------------------------------------------------------------------
Thu Mar 4 15:41:04 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-network.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-network
Version: 4.2.96
Version: 4.2.97
Release: 0
Summary: YaST2 - Network Configuration
License: GPL-2.0-only
Expand Down
6 changes: 4 additions & 2 deletions src/lib/y2network/s390_device_activators/qeth.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ def configure_attributes
extra_attributes.concat(attributes.split(" ")) if attributes
# Only set if enable
extra_attributes << ipa_takeover_attribute if ipa_takeover
# Only set if enable
extra_attributes << layer2_attribute if layer2
# By default the activation command uses layer2 autodetection but as
# this option is not exposed in the activation dialog we have to add it
# always (bsc#1183639)
extra_attributes << layer2_attribute
extra_attributes << port_attribute if port_number.to_s != "0"
extra_attributes
end
Expand Down
4 changes: 2 additions & 2 deletions test/y2network/s390_device_activators/qeth_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@
describe "#configure" do
it "tries to activate the group device associated with the defined device id" do
expect(Yast::Execute).to receive(:on_target!)
.with("/sbin/chzdev", "qeth", subject.device_id, "-e",
.with("/sbin/chzdev", "qeth", subject.device_id, "-e", "layer2=0",
stdout: :capture, stderr: :capture, allowed_exitstatus: 0..255)
subject.configure
end

it "returns an array with the stdout, stderr, and command status" do
expect(Yast::Execute).to receive(:on_target!)
.with("/sbin/chzdev", "qeth", subject.device_id, "-e",
.with("/sbin/chzdev", "qeth", subject.device_id, "-e", "layer2=0",
stdout: :capture, stderr: :capture, allowed_exitstatus: 0..255)
.and_return(chzdev_output)

Expand Down