From 169d7b4011aa7a3c0130d749c4ebb72811eaf851 Mon Sep 17 00:00:00 2001 From: sophia Date: Mon, 20 Jul 2020 13:25:41 -0500 Subject: [PATCH] Update photon cap for setting hostname sqash --- plugins/guests/photon/cap/change_host_name.rb | 6 +-- .../photon/cap/change_host_name_test.rb | 37 +++++++++++-------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/plugins/guests/photon/cap/change_host_name.rb b/plugins/guests/photon/cap/change_host_name.rb index effaafb01..269b84eab 100644 --- a/plugins/guests/photon/cap/change_host_name.rb +++ b/plugins/guests/photon/cap/change_host_name.rb @@ -1,11 +1,11 @@ -require 'vagrant/util/guest_hosts' +require_relative '../../linux/cap/change_host_name' module VagrantPlugins module GuestPhoton module Cap class ChangeHostName - extend Vagrant::Util::GuestHosts::Linux - + extend VagrantPlugins::GuestLinux::Cap::ChangeHostName + def self.change_name_command(name) return <<-EOH.gsub(/^ {14}/, "") # Set the hostname diff --git a/test/unit/plugins/guests/photon/cap/change_host_name_test.rb b/test/unit/plugins/guests/photon/cap/change_host_name_test.rb index 581c9bd77..252ad5f32 100644 --- a/test/unit/plugins/guests/photon/cap/change_host_name_test.rb +++ b/test/unit/plugins/guests/photon/cap/change_host_name_test.rb @@ -1,16 +1,17 @@ -# Copyright (c) 2015 VMware, Inc. All Rights Reserved. - require_relative "../../../../base" describe "VagrantPlugins::GuestPhoton::Cap::ChangeHostName" do - let(:caps) do + let(:described_class) do VagrantPlugins::GuestPhoton::Plugin .components .guest_capabilities[:photon] + .get(:change_host_name) end let(:machine) { double("machine") } let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) } + let(:name) { "banana-rama.example.com" } + let(:basename) { "banana-rama" } before do allow(machine).to receive(:communicate).and_return(comm) @@ -21,22 +22,28 @@ describe "VagrantPlugins::GuestPhoton::Cap::ChangeHostName" do end describe ".change_host_name" do - let(:cap) { caps.get(:change_host_name) } + context "minimal network config" do + let(:networks) { [ + [:forwarded_port, {:guest=>22, :host=>2222, :host_ip=>"127.0.0.1", :id=>"ssh", :auto_correct=>true, :protocol=>"tcp"}] + ] } - let(:name) { "banana-rama.example.com" } + before do + allow(machine).to receive_message_chain(:config, :vm, :networks).and_return(networks) + end - it "sets the hostname" do - comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1) + it "sets the hostname" do + comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1) - cap.change_host_name(machine, name) - expect(comm.received_commands[1]).to match(/echo '#{name}' > \/etc\/hostname/) - expect(comm.received_commands[1]).to match(/hostname '#{name}'/) - end + described_class.change_host_name(machine, name) + expect(comm.received_commands[2]).to match(/hostname '#{name}'/) + end - it "does not change the hostname if already set" do - comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 0) - cap.change_host_name(machine, name) - expect(comm.received_commands.size).to eq(1) + it "does not change the hostname if already set" do + comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 0) + + described_class.change_host_name(machine, name) + expect(comm).to_not receive(:sudo).with(/hostname '#{name}'/) + end end end end