beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Configure each device individually to prevent orphan connections

Browse Source
This commit is contained in:
Chris Roberts 2021-11-04 15:51:08 -07:00
parent 8062242f7f
commit cae807fcf0
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/guests/coreos/cap/configure_networks.rb
View File

@ -61,16 +61,18 @@ module VagrantPlugins
end
end
f.close
comm.sudo("nmcli c delete '#{nm_dev[network[:device]]}'")
comm.sudo("nmcli d disconnect '#{network[:device]}'", error_check: false)
comm.sudo("nmcli c delete '#{nm_dev[network[:device]]}'", error_check: false)
dst = File.join("/var/tmp", "vagrant-#{network[:device]}.conf")
final = File.join(NETWORK_MANAGER_CONN_DIR, "vagrant-#{network[:device]}.conf")
comm.upload(f.path, dst)
comm.sudo("chown root:root '#{dst}'")
comm.sudo("chmod 0600 '#{dst}'")
comm.sudo("mv '#{dst}' '#{final}'")
comm.sudo("nmcli c load '#{final}'")
comm.sudo("nmcli d connect '#{network[:device]}'")
f.delete
end
comm.sudo("nmcli c reload")
end
def self.configure_networks_cloud_init(machine, networks)

28
test/unit/plugins/guests/coreos/cap/configure_networks_test.rb
View File

@ -96,7 +96,7 @@ describe "VagrantPlugins::GuestCoreOS::Cap::ConfigureNetworks" do
it "should remove any previous vagrant configuration" do
expect(comm).to receive(:sudo).
with(/rm .*vagrant-.*conf/)
with(/rm .*vagrant-.*conf/, error_check: false)
described_class.configure_networks(machine, networks)
end
@ -124,11 +124,19 @@ describe "VagrantPlugins::GuestCoreOS::Cap::ConfigureNetworks" do
described_class.configure_networks(machine, networks)
end
it "should delete device from network manager" do
it "should disconnect device in network manager" do
expect(comm).to receive(:sudo).
with("nmcli c delete 'UUID_for_eth1'")
with("nmcli d disconnect 'eth1'", error_check: false)
expect(comm).to receive(:sudo).
with("nmcli c delete 'UUID_for_eth2'")
with("nmcli d disconnect 'eth2'", error_check: false)
described_class.configure_networks(machine, networks)
end
it "should delete connection from network manager" do
expect(comm).to receive(:sudo).
with("nmcli c delete 'UUID_for_eth1'", error_check: false)
expect(comm).to receive(:sudo).
with("nmcli c delete 'UUID_for_eth2'", error_check: false)
described_class.configure_networks(machine, networks)
end
@ -154,9 +162,17 @@ describe "VagrantPlugins::GuestCoreOS::Cap::ConfigureNetworks" do
described_class.configure_networks(machine, networks)
end
it "should reload network manager" do
it "should load the configuration files into network manager" do
expect(comm).to receive(:sudo).
with("nmcli c reload")
with(/nmcli c load .*conf/).twice
described_class.configure_networks(machine, networks)
end
it "should connect the devices in network manager" do
expect(comm).to receive(:sudo).
with("nmcli d connect 'eth1'")
expect(comm).to receive(:sudo).
with("nmcli d connect 'eth2'")
described_class.configure_networks(machine, networks)
end
end