Fix AutoYaST dhcp_hostname config

yast · Mar 19, 2020 · 0c622ac · 0c622ac
1 parent f35d96e
commit 0c622ac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/lib/y2network/autoinst/hostname_reader.rb b/src/lib/y2network/autoinst/hostname_reader.rb
@@ -39,7 +39,7 @@ def initialize(section)
       # @return [Hostname] the imported {Hostname} config
       def config
         Y2Network::Hostname.new(
-          dhcp_hostname: section.dhcp_hostname,
+          dhcp_hostname: section.dhcp_hostname ? :any : :none,
           static:        static_hostname,
           installer:     section.hostname
         )

diff --git a/test/y2network/autoinst/config_reader_test.rb b/test/y2network/autoinst/config_reader_test.rb
@@ -58,7 +58,8 @@
         "ipv4_forward" => true,
         "ipv6_forward" => false,
         "routes"       => routes
-      }
+      },
+      "dns"        => dns
     }
   end
 
@@ -67,6 +68,8 @@
       expect(subject.config).to be_a Y2Network::Config
       expect(subject.config.routing).to be_a Y2Network::Routing
       expect(subject.config.dns).to be_a Y2Network::DNS
+      expect(subject.config.hostname.dhcp_hostname).to eq(:any)
+      expect(subject.config.hostname.installer).to eq("host")
     end
   end
 end
diff --git a/test/y2network/autoinst/hostname_reader_test.rb b/test/y2network/autoinst/hostname_reader_test.rb
@@ -40,7 +40,7 @@
     {
       "dns" => {
         "hostname" => "host",
-        "dhcp_hostname" => true, "write_hostname" => true
+        "dhcp_hostname" => false, "write_hostname" => true
       }
     }
   end
@@ -50,7 +50,7 @@
       config = subject.config
       expect(config).to be_a Y2Network::Hostname
       expect(config.installer).to eq("host")
-      expect(config.dhcp_hostname).to eq(true)
+      expect(config.dhcp_hostname).to eq(:none)
       expect(config.static).to eq(current_static_hostname)
     end
   end