RubocopFix (#746)

diff --git a/spec/unit/puppet/util/firewall_spec.rb b/spec/unit/puppet/util/firewall_spec.rb
index 8a45f45f0313655fe4ed88a206a5403b80a4dd3d..e6cebd6997d83bab91dfe1a8a64adeb685845b14 100644 (file)
--- a/spec/unit/puppet/util/firewall_spec.rb
+++ b/spec/unit/puppet/util/firewall_spec.rb
@@ -12,52 +12,52 @@ describe 'Puppet::Util::Firewall' do
   before(:each) { resource }
 
   describe '#host_to_ip' do
-    subject { resource }
+    subject(:host) { resource }
 
     it { # rubocop:disable RSpec/MultipleExpectations
       allow(Resolv).to receive(:each_address).at_least(:once).with('puppetlabs.com').and_yield('96.126.112.51').and_yield('2001:DB8:4650::13:8A')
-      expect(subject.host_to_ip('puppetlabs.com', :IPv4)).to eql '96.126.112.51/32'
-      expect(subject.host_to_ip('puppetlabs.com', :IPv6)).to eql '2001:db8:4650::13:8a/128'
+      expect(host.host_to_ip('puppetlabs.com', :IPv4)).to eql '96.126.112.51/32'
+      expect(host.host_to_ip('puppetlabs.com', :IPv6)).to eql '2001:db8:4650::13:8a/128'
     }
-    it { expect(subject.host_to_ip('96.126.112.51')).to eql '96.126.112.51/32' }
-    it { expect(subject.host_to_ip('96.126.112.51/32')).to eql '96.126.112.51/32' }
-    it { expect(subject.host_to_ip('2001:db8:85a3:0:0:8a2e:370:7334')).to eql '2001:db8:85a3::8a2e:370:7334/128' }
-    it { expect(subject.host_to_ip('2001:db8:1234::/48')).to eql '2001:db8:1234::/48' }
-    it { expect(subject.host_to_ip('0.0.0.0/0')).to be nil }
-    it { expect(subject.host_to_ip('::/0')).to be nil }
+    it { expect(host.host_to_ip('96.126.112.51')).to eql '96.126.112.51/32' }
+    it { expect(host.host_to_ip('96.126.112.51/32')).to eql '96.126.112.51/32' }
+    it { expect(host.host_to_ip('2001:db8:85a3:0:0:8a2e:370:7334')).to eql '2001:db8:85a3::8a2e:370:7334/128' }
+    it { expect(host.host_to_ip('2001:db8:1234::/48')).to eql '2001:db8:1234::/48' }
+    it { expect(host.host_to_ip('0.0.0.0/0')).to be nil }
+    it { expect(host.host_to_ip('::/0')).to be nil }
   end
 
   describe '#host_to_mask' do
-    subject { resource }
+    subject(:host) { resource }
 
     it { # rubocop:disable RSpec/MultipleExpectations
       allow(Resolv).to receive(:each_address).at_least(:once).with('puppetlabs.com').and_yield('96.126.112.51').and_yield('2001:DB8:4650::13:8A')
-      expect(subject.host_to_mask('puppetlabs.com', :IPv4)).to eql '96.126.112.51/32'
-      expect(subject.host_to_mask('!puppetlabs.com', :IPv4)).to eql '! 96.126.112.51/32'
-      expect(subject.host_to_mask('puppetlabs.com', :IPv6)).to eql '2001:db8:4650::13:8a/128'
-      expect(subject.host_to_mask('!puppetlabs.com', :IPv6)).to eql '! 2001:db8:4650::13:8a/128'
+      expect(host.host_to_mask('puppetlabs.com', :IPv4)).to eql '96.126.112.51/32'
+      expect(host.host_to_mask('!puppetlabs.com', :IPv4)).to eql '! 96.126.112.51/32'
+      expect(host.host_to_mask('puppetlabs.com', :IPv6)).to eql '2001:db8:4650::13:8a/128'
+      expect(host.host_to_mask('!puppetlabs.com', :IPv6)).to eql '! 2001:db8:4650::13:8a/128'
     }
-    it { expect(subject.host_to_mask('96.126.112.51', :IPv4)).to eql '96.126.112.51/32' }
-    it { expect(subject.host_to_mask('!96.126.112.51', :IPv4)).to eql '! 96.126.112.51/32' }
-    it { expect(subject.host_to_mask('96.126.112.51/32', :IPv4)).to eql '96.126.112.51/32' }
-    it { expect(subject.host_to_mask('! 96.126.112.51/32', :IPv4)).to eql '! 96.126.112.51/32' }
-    it { expect(subject.host_to_mask('2001:db8:85a3:0:0:8a2e:370:7334', :IPv6)).to eql '2001:db8:85a3::8a2e:370:7334/128' }
-    it { expect(subject.host_to_mask('!2001:db8:85a3:0:0:8a2e:370:7334', :IPv6)).to eql '! 2001:db8:85a3::8a2e:370:7334/128' }
-    it { expect(subject.host_to_mask('2001:db8:1234::/48', :IPv6)).to eql '2001:db8:1234::/48' }
-    it { expect(subject.host_to_mask('! 2001:db8:1234::/48', :IPv6)).to eql '! 2001:db8:1234::/48' }
-    it { expect(subject.host_to_mask('0.0.0.0/0', :IPv4)).to be nil }
-    it { expect(subject.host_to_mask('!0.0.0.0/0', :IPv4)).to be nil }
-    it { expect(subject.host_to_mask('::/0', :IPv6)).to be nil }
-    it { expect(subject.host_to_mask('! ::/0', :IPv6)).to be nil }
+    it { expect(host.host_to_mask('96.126.112.51', :IPv4)).to eql '96.126.112.51/32' }
+    it { expect(host.host_to_mask('!96.126.112.51', :IPv4)).to eql '! 96.126.112.51/32' }
+    it { expect(host.host_to_mask('96.126.112.51/32', :IPv4)).to eql '96.126.112.51/32' }
+    it { expect(host.host_to_mask('! 96.126.112.51/32', :IPv4)).to eql '! 96.126.112.51/32' }
+    it { expect(host.host_to_mask('2001:db8:85a3:0:0:8a2e:370:7334', :IPv6)).to eql '2001:db8:85a3::8a2e:370:7334/128' }
+    it { expect(host.host_to_mask('!2001:db8:85a3:0:0:8a2e:370:7334', :IPv6)).to eql '! 2001:db8:85a3::8a2e:370:7334/128' }
+    it { expect(host.host_to_mask('2001:db8:1234::/48', :IPv6)).to eql '2001:db8:1234::/48' }
+    it { expect(host.host_to_mask('! 2001:db8:1234::/48', :IPv6)).to eql '! 2001:db8:1234::/48' }
+    it { expect(host.host_to_mask('0.0.0.0/0', :IPv4)).to be nil }
+    it { expect(host.host_to_mask('!0.0.0.0/0', :IPv4)).to be nil }
+    it { expect(host.host_to_mask('::/0', :IPv6)).to be nil }
+    it { expect(host.host_to_mask('! ::/0', :IPv6)).to be nil }
   end
 
   describe '#icmp_name_to_number' do
     describe 'proto unsupported' do
-      subject { resource }
+      subject(:host) { resource }
 
       %w[inet5 inet8 foo].each do |proto|
         it "should reject invalid proto #{proto}" do
-          expect { subject.icmp_name_to_number('echo-reply', proto) }
+          expect { host.icmp_name_to_number('echo-reply', proto) }
             .to raise_error(ArgumentError, "unsupported protocol family '#{proto}'")
         end
       end
@@ -65,64 +65,64 @@ describe 'Puppet::Util::Firewall' do
 
     describe 'proto IPv4' do
       proto = 'inet'
-      subject { resource }
-
-      it { expect(subject.icmp_name_to_number('echo-reply', proto)).to eql '0' }
-      it { expect(subject.icmp_name_to_number('destination-unreachable', proto)).to eql '3' }
-      it { expect(subject.icmp_name_to_number('source-quench', proto)).to eql '4' }
-      it { expect(subject.icmp_name_to_number('redirect', proto)).to eql '6' }
-      it { expect(subject.icmp_name_to_number('echo-request', proto)).to eql '8' }
-      it { expect(subject.icmp_name_to_number('router-advertisement', proto)).to eql '9' }
-      it { expect(subject.icmp_name_to_number('router-solicitation', proto)).to eql '10' }
-      it { expect(subject.icmp_name_to_number('time-exceeded', proto)).to eql '11' }
-      it { expect(subject.icmp_name_to_number('parameter-problem', proto)).to eql '12' }
-      it { expect(subject.icmp_name_to_number('timestamp-request', proto)).to eql '13' }
-      it { expect(subject.icmp_name_to_number('timestamp-reply', proto)).to eql '14' }
-      it { expect(subject.icmp_name_to_number('address-mask-request', proto)).to eql '17' }
-      it { expect(subject.icmp_name_to_number('address-mask-reply', proto)).to eql '18' }
+      subject(:host) { resource }
+
+      it { expect(host.icmp_name_to_number('echo-reply', proto)).to eql '0' }
+      it { expect(host.icmp_name_to_number('destination-unreachable', proto)).to eql '3' }
+      it { expect(host.icmp_name_to_number('source-quench', proto)).to eql '4' }
+      it { expect(host.icmp_name_to_number('redirect', proto)).to eql '6' }
+      it { expect(host.icmp_name_to_number('echo-request', proto)).to eql '8' }
+      it { expect(host.icmp_name_to_number('router-advertisement', proto)).to eql '9' }
+      it { expect(host.icmp_name_to_number('router-solicitation', proto)).to eql '10' }
+      it { expect(host.icmp_name_to_number('time-exceeded', proto)).to eql '11' }
+      it { expect(host.icmp_name_to_number('parameter-problem', proto)).to eql '12' }
+      it { expect(host.icmp_name_to_number('timestamp-request', proto)).to eql '13' }
+      it { expect(host.icmp_name_to_number('timestamp-reply', proto)).to eql '14' }
+      it { expect(host.icmp_name_to_number('address-mask-request', proto)).to eql '17' }
+      it { expect(host.icmp_name_to_number('address-mask-reply', proto)).to eql '18' }
     end
 
     describe 'proto IPv6' do
       proto = 'inet6'
-      subject { resource }
-
-      it { expect(subject.icmp_name_to_number('destination-unreachable', proto)).to eql '1' }
-      it { expect(subject.icmp_name_to_number('time-exceeded', proto)).to eql '3' }
-      it { expect(subject.icmp_name_to_number('parameter-problem', proto)).to eql '4' }
-      it { expect(subject.icmp_name_to_number('echo-request', proto)).to eql '128' }
-      it { expect(subject.icmp_name_to_number('echo-reply', proto)).to eql '129' }
-      it { expect(subject.icmp_name_to_number('router-solicitation', proto)).to eql '133' }
-      it { expect(subject.icmp_name_to_number('router-advertisement', proto)).to eql '134' }
-      it { expect(subject.icmp_name_to_number('neighbour-solicitation', proto)).to eql '135' }
-      it { expect(subject.icmp_name_to_number('neighbour-advertisement', proto)).to eql '136' }
-      it { expect(subject.icmp_name_to_number('redirect', proto)).to eql '137' }
+      subject(:host) { resource }
+
+      it { expect(host.icmp_name_to_number('destination-unreachable', proto)).to eql '1' }
+      it { expect(host.icmp_name_to_number('time-exceeded', proto)).to eql '3' }
+      it { expect(host.icmp_name_to_number('parameter-problem', proto)).to eql '4' }
+      it { expect(host.icmp_name_to_number('echo-request', proto)).to eql '128' }
+      it { expect(host.icmp_name_to_number('echo-reply', proto)).to eql '129' }
+      it { expect(host.icmp_name_to_number('router-solicitation', proto)).to eql '133' }
+      it { expect(host.icmp_name_to_number('router-advertisement', proto)).to eql '134' }
+      it { expect(host.icmp_name_to_number('neighbour-solicitation', proto)).to eql '135' }
+      it { expect(host.icmp_name_to_number('neighbour-advertisement', proto)).to eql '136' }
+      it { expect(host.icmp_name_to_number('redirect', proto)).to eql '137' }
     end
   end
 
   describe '#string_to_port' do
-    subject { resource }
+    subject(:host) { resource }
 
-    it { expect(subject.string_to_port('80', 'tcp')).to eql '80' }
-    it { expect(subject.string_to_port(80, 'tcp')).to eql '80' }
-    it { expect(subject.string_to_port('http', 'tcp')).to eql '80' }
-    it { expect(subject.string_to_port('domain', 'udp')).to eql '53' }
+    it { expect(host.string_to_port('80', 'tcp')).to eql '80' }
+    it { expect(host.string_to_port(80, 'tcp')).to eql '80' }
+    it { expect(host.string_to_port('http', 'tcp')).to eql '80' }
+    it { expect(host.string_to_port('domain', 'udp')).to eql '53' }
   end
 
   describe '#to_hex32' do
-    subject { resource }
-
-    it { expect(subject.to_hex32('0')).to eql '0x0' }
-    it { expect(subject.to_hex32('0x32')).to eql '0x32' }
-    it { expect(subject.to_hex32('42')).to eql '0x2a' }
-    it { expect(subject.to_hex32('4294967295')).to eql '0xffffffff' }
-    it { expect(subject.to_hex32('4294967296')).to be nil }
-    it { expect(subject.to_hex32('-1')).to be nil }
-    it { expect(subject.to_hex32('bananas')).to be nil }
+    subject(:host) { resource }
+
+    it { expect(host.to_hex32('0')).to eql '0x0' }
+    it { expect(host.to_hex32('0x32')).to eql '0x32' }
+    it { expect(host.to_hex32('42')).to eql '0x2a' }
+    it { expect(host.to_hex32('4294967295')).to eql '0xffffffff' }
+    it { expect(host.to_hex32('4294967296')).to be nil }
+    it { expect(host.to_hex32('-1')).to be nil }
+    it { expect(host.to_hex32('bananas')).to be nil }
   end
 
   describe '#persist_iptables' do
     before(:each) { Facter.clear }
-    subject { resource }
+    subject(:host) { resource }
 
     # rubocop:disable RSpec/SubjectStub
     describe 'when proto is IPv4' do
@@ -133,8 +133,8 @@ describe 'Puppet::Util::Firewall' do
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('RedHat')
         allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('6')
 
-        allow(subject).to receive(:execute).with(%w[/sbin/service iptables save])
-        subject.persist_iptables(proto)
+        allow(host).to receive(:execute).with(%w[/sbin/service iptables save])
+        host.persist_iptables(proto)
       end
 
       it 'is expected to exec for systemd if running RHEL 7 or greater' do
@@ -142,8 +142,8 @@ describe 'Puppet::Util::Firewall' do
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('RedHat')
         allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('7')
 
-        allow(subject).to receive(:execute).with(%w[/usr/libexec/iptables/iptables.init save])
-        subject.persist_iptables(proto)
+        allow(host).to receive(:execute).with(%w[/usr/libexec/iptables/iptables.init save])
+        host.persist_iptables(proto)
       end
 
       it 'is expected to exec for systemd if running Fedora 15 or greater' do
@@ -151,30 +151,30 @@ describe 'Puppet::Util::Firewall' do
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Fedora')
         allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('15')
 
-        allow(subject).to receive(:execute).with(%w[/usr/libexec/iptables/iptables.init save])
-        subject.persist_iptables(proto)
+        allow(host).to receive(:execute).with(%w[/usr/libexec/iptables/iptables.init save])
+        host.persist_iptables(proto)
       end
 
       it 'is expected to exec for CentOS 6 identified from operatingsystem and operatingsystemrelease' do
         allow(Facter.fact(:osfamily)).to receive(:value).and_return(nil)
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('CentOS')
         allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('6.5')
-        allow(subject).to receive(:execute).with(%w[/sbin/service iptables save])
-        subject.persist_iptables(proto)
+        allow(host).to receive(:execute).with(%w[/sbin/service iptables save])
+        host.persist_iptables(proto)
       end
 
       it 'is expected to exec for CentOS 7 identified from operatingsystem and operatingsystemrelease' do
         allow(Facter.fact(:osfamily)).to receive(:value).and_return(nil)
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('CentOS')
         allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('7.0.1406')
-        allow(subject).to receive(:execute).with(%w[/usr/libexec/iptables/iptables.init save])
-        subject.persist_iptables(proto)
+        allow(host).to receive(:execute).with(%w[/usr/libexec/iptables/iptables.init save])
+        host.persist_iptables(proto)
       end
 
       it 'is expected to exec for Archlinux identified from osfamily' do
         allow(Facter.fact(:osfamily)).to receive(:value).and_return('Archlinux')
-        allow(subject).to receive(:execute).with(['/bin/sh', '-c', '/usr/sbin/iptables-save > /etc/iptables/iptables.rules'])
-        subject.persist_iptables(proto)
+        allow(host).to receive(:execute).with(['/bin/sh', '-c', '/usr/sbin/iptables-save > /etc/iptables/iptables.rules'])
+        host.persist_iptables(proto)
       end
 
       it 'is expected to raise a warning when exec fails' do # rubocop:disable RSpec/ExampleLength
@@ -182,10 +182,9 @@ describe 'Puppet::Util::Firewall' do
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('RedHat')
         allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('6')
 
-        allow(subject).to receive(:execute).with(%w[/sbin/service iptables save])
-                                           .and_raise(Puppet::ExecutionFailure, 'some error')
-        allow(subject).to receive(:warning).with('Unable to persist firewall rules: some error')
-        subject.persist_iptables(proto)
+        allow(host).to receive(:execute).with(%w[/sbin/service iptables save]).and_raise(Puppet::ExecutionFailure, 'some error')
+        allow(host).to receive(:warning).with('Unable to persist firewall rules: some error')
+        host.persist_iptables(proto)
       end
     end
 
@@ -196,22 +195,22 @@ describe 'Puppet::Util::Firewall' do
         allow(Facter.fact(:osfamily)).to receive(:value).and_return(nil)
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Ubuntu')
         allow(Facter.fact(:iptables_persistent_version)).to receive(:value).and_return('0.5.3ubuntu2')
-        allow(subject).to receive(:execute).with(%w[/usr/sbin/service iptables-persistent save])
-        subject.persist_iptables(proto)
+        allow(host).to receive(:execute).with(%w[/usr/sbin/service iptables-persistent save])
+        host.persist_iptables(proto)
       end
 
       it 'is expected to not exec for older Ubuntu which does not support IPv6' do
         allow(Facter.fact(:osfamily)).to receive(:value).and_return(nil)
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Ubuntu')
         allow(Facter.fact(:iptables_persistent_version)).to receive(:value).and_return('0.0.20090701')
-        allow(subject).to receive(:execute).never
-        subject.persist_iptables(proto)
+        allow(host).to receive(:execute).never
+        host.persist_iptables(proto)
       end
 
       it 'is expected to not exec for Suse which is not supported' do
         allow(Facter.fact(:osfamily)).to receive(:value).and_return('Suse')
-        allow(subject).to receive(:execute).never
-        subject.persist_iptables(proto)
+        allow(host).to receive(:execute).never
+        host.persist_iptables(proto)
       end
     end
     # rubocop:enable RSpec/SubjectStub

diff --git a/spec/unit/puppet/util/ipcidr_spec.rb b/spec/unit/puppet/util/ipcidr_spec.rb
index 5b72418f2071476551a4c10646a0ce3a34feb917..01f79e4ea925268a39f360373561d07cfd6d4cb1 100644 (file)
--- a/spec/unit/puppet/util/ipcidr_spec.rb
+++ b/spec/unit/puppet/util/ipcidr_spec.rb
@@ -3,94 +3,94 @@ require 'puppet/util/ipcidr'
 
 describe 'Puppet::Util::IPCidr' do
   describe 'ipv4 address' do
-    subject { ipaddr }
+    subject(:host) { ipaddr }
 
     let(:ipaddr) { Puppet::Util::IPCidr.new('96.126.112.51') }
 
-    it { expect(subject.cidr).to eql '96.126.112.51/32' }
-    it { expect(subject.prefixlen).to be 32 }
-    it { expect(subject.netmask).to eql '255.255.255.255' }
+    it { expect(host.cidr).to eql '96.126.112.51/32' }
+    it { expect(host.prefixlen).to be 32 }
+    it { expect(host.netmask).to eql '255.255.255.255' }
   end
 
   describe 'single ipv4 address with cidr' do
-    subject { ipcidr }
+    subject(:host) { ipcidr }
 
     let(:ipcidr) { Puppet::Util::IPCidr.new('96.126.112.51/32') }
 
-    it { expect(subject.cidr).to eql '96.126.112.51/32' }
-    it { expect(subject.prefixlen).to be 32 }
-    it { expect(subject.netmask).to eql '255.255.255.255' }
+    it { expect(host.cidr).to eql '96.126.112.51/32' }
+    it { expect(host.prefixlen).to be 32 }
+    it { expect(host.netmask).to eql '255.255.255.255' }
   end
 
   describe 'ipv4 address range with cidr' do
-    subject { ipcidr }
+    subject(:host) { ipcidr }
 
     let(:ipcidr) { Puppet::Util::IPCidr.new('96.126.112.0/24') }
 
-    it { expect(subject.cidr).to eql '96.126.112.0/24' }
-    it { expect(subject.prefixlen).to be 24 }
-    it { expect(subject.netmask).to eql '255.255.255.0' }
+    it { expect(host.cidr).to eql '96.126.112.0/24' }
+    it { expect(host.prefixlen).to be 24 }
+    it { expect(host.netmask).to eql '255.255.255.0' }
   end
 
   # https://tickets.puppetlabs.com/browse/MODULES-3215
   describe 'ipv4 address range with invalid cidr' do
-    subject { ipcidr }
+    subject(:host) { ipcidr }
 
     let(:ipcidr) { Puppet::Util::IPCidr.new('96.126.112.20/24') }
 
-    specify { subject.cidr.should == '96.126.112.0/24' } # .20 is expected to
+    specify { host.cidr.should == '96.126.112.0/24' } # .20 is expected to
     # be silently dropped.
-    specify { subject.prefixlen.should == 24 }
-    specify { subject.netmask.should == '255.255.255.0' }
+    specify { host.prefixlen.should == 24 }
+    specify { host.netmask.should == '255.255.255.0' }
   end
 
   describe 'ipv4 open range with cidr' do
-    subject { ipcidr }
+    subject(:host) { ipcidr }
 
     let(:ipcidr) { Puppet::Util::IPCidr.new('0.0.0.0/0') }
 
-    it { expect(subject.cidr).to eql '0.0.0.0/0' }
-    it { expect(subject.prefixlen).to be 0 }
-    it { expect(subject.netmask).to eql '0.0.0.0' }
+    it { expect(host.cidr).to eql '0.0.0.0/0' }
+    it { expect(host.prefixlen).to be 0 }
+    it { expect(host.netmask).to eql '0.0.0.0' }
   end
 
   describe 'ipv6 address' do
-    subject { ipaddr }
+    subject(:host) { ipaddr }
 
     let(:ipaddr) { Puppet::Util::IPCidr.new('2001:db8:85a3:0:0:8a2e:370:7334') }
 
-    it { expect(subject.cidr).to eql '2001:db8:85a3::8a2e:370:7334/128' }
-    it { expect(subject.prefixlen).to be 128 }
-    it { expect(subject.netmask).to eql 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' }
+    it { expect(host.cidr).to eql '2001:db8:85a3::8a2e:370:7334/128' }
+    it { expect(host.prefixlen).to be 128 }
+    it { expect(host.netmask).to eql 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' }
   end
 
   describe 'single ipv6 addr with cidr' do
-    subject { ipaddr }
+    subject(:host) { ipaddr }
 
     let(:ipaddr) { Puppet::Util::IPCidr.new('2001:db8:85a3:0:0:8a2e:370:7334/128') }
 
-    it { expect(subject.cidr).to eql '2001:db8:85a3::8a2e:370:7334/128' }
-    it { expect(subject.prefixlen).to be 128 }
-    it { expect(subject.netmask).to eql 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' }
+    it { expect(host.cidr).to eql '2001:db8:85a3::8a2e:370:7334/128' }
+    it { expect(host.prefixlen).to be 128 }
+    it { expect(host.netmask).to eql 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' }
   end
 
   describe 'ipv6 addr range with cidr' do
-    subject { ipaddr }
+    subject(:host) { ipaddr }
 
     let(:ipaddr) { Puppet::Util::IPCidr.new('2001:db8:1234::/48') }
 
-    it { expect(subject.cidr).to eql '2001:db8:1234::/48' }
-    it { expect(subject.prefixlen).to be 48 }
-    it { expect(subject.netmask).to eql 'ffff:ffff:ffff:0000:0000:0000:0000:0000' }
+    it { expect(host.cidr).to eql '2001:db8:1234::/48' }
+    it { expect(host.prefixlen).to be 48 }
+    it { expect(host.netmask).to eql 'ffff:ffff:ffff:0000:0000:0000:0000:0000' }
   end
 
   describe 'ipv6 open range with cidr' do
-    subject { ipaddr }
+    subject(:host) { ipaddr }
 
     let(:ipaddr) { Puppet::Util::IPCidr.new('::/0') }
 
-    it { expect(subject.cidr).to eql '::/0' }
-    it { expect(subject.prefixlen).to be 0 }
-    it { expect(subject.netmask).to eql '0000:0000:0000:0000:0000:0000:0000:0000' }
+    it { expect(host.cidr).to eql '::/0' }
+    it { expect(host.prefixlen).to be 0 }
+    it { expect(host.netmask).to eql '0000:0000:0000:0000:0000:0000:0000:0000' }
   end
 end