simp-rspec-puppet-facts 3.0.0 → 3.1.0

data/lib/simp/version.rb

@@ -1,4 +1,4 @@
 module Simp; end
 module Simp::RspecPuppetFacts
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end

data/spec/acceptance/nodesets/win_2016.yml

@@ -0,0 +1,28 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  win:
+    roles:
+      - windows
+    platform: windows-server-amd64
+    box: gusztavvargadr/windows-server
+    box_version: 1607.0.1909
+    hypervisor: <%= hypervisor %>
+    vagrant_memsize: 2048
+    vagrant_cpus: 2
+    user: vagrant
+    communicator: winrm
+    is_cygwin: false
+
+CONFIG:
+  log_level: verbose
+  type: aio
+  vagrant_memsize: 256
+<% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
+  puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
+<% end -%>

data/spec/acceptance/nodesets/win_2019.yml

@@ -0,0 +1,27 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  win:
+    roles:
+      - windows
+    platform: windows-server-amd64
+    box: gusztavvargadr/windows-server
+    hypervisor: <%= hypervisor %>
+    vagrant_memsize: 2048
+    vagrant_cpus: 2
+    user: vagrant
+    communicator: winrm
+    is_cygwin: false
+
+CONFIG:
+  log_level: verbose
+  type: aio
+  vagrant_memsize: 256
+<% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
+  puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
+<% end -%>

data/spec/acceptance/suites/default/00_default_spec.rb

@@ -22,14 +22,21 @@ describe 'look out muppets' do
         on(host, 'puppet module install simp/simp_core')
       end
 
-      it 'should collect valid fact data' do
-        # Delete NAT interface so facter does not report randomly generated ip addresses
-        if fact_on(host, 'ipaddress_eth1') != '' and fact_on(host, 'operatingsystemmajrelease') != '6'
-          on host, 'nmcli connection delete id System\ eth1'
-        end
-        if fact_on(host, 'ipaddress_enp0s8') != '' and fact_on(host, 'operatingsystemmajrelease') != '6'
-          on host, 'nmcli connection delete id System\ enp0s8'
+      it 'should disable the secondary network interface' do
+        interfaces = fact_on(host, 'interfaces').strip.split(',')
+
+        ifaces = {
+          'eth1'       => 'ip link set eth1 down',
+          'enp0s8'     => 'ip link set enp0s8 down',
+          'Ethernet 2' => 'netsh interface set interface "Ethernet 2" disable'
+        }
+
+        ifaces.keys.each do |iface|
+          on(host, ifaces[iface]) if interfaces.include?(iface)
         end
+      end
+
+      it 'should collect valid fact data' do
         # Stupid RSpec tricks
         output = on(host, 'puppet facts --render-as json').stdout
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-puppet-facts
@@ -147,7 +147,9 @@ files:
 - facts/2.5/redhat-6-x86_64.facts
 - facts/2.5/redhat-7-x86_64.facts
 - facts/2.5/redhat-8-x86_64.facts
-- facts/2.5/windows-server_2012_r2-x86_64.facts
+- facts/2.5/windows-2012-r2-x86_64.facts
+- facts/2.5/windows-2016-x86_64.facts
+- facts/2.5/windows-2019-x86_64.facts
 - facts/3.4/centos-6-x86_64.facts
 - facts/3.4/centos-7-x86_64.facts
 - facts/3.4/oraclelinux-6-x86_64.facts
@@ -188,6 +190,8 @@ files:
 - spec/acceptance/nodesets/rhel7.yml
 - spec/acceptance/nodesets/rhel8.yml
 - spec/acceptance/nodesets/win_2012r2.yml
+- spec/acceptance/nodesets/win_2016.yml
+- spec/acceptance/nodesets/win_2019.yml
 - spec/acceptance/suites/default/00_default_spec.rb
 - spec/acceptance/suites/default/nodesets
 - spec/data_normalization_spec.rb
@@ -234,8 +238,10 @@ test_files:
 - spec/acceptance/nodesets/win_2012r2.yml
 - spec/acceptance/nodesets/oel8.yml
 - spec/acceptance/nodesets/centos7.yml
+- spec/acceptance/nodesets/win_2019.yml
 - spec/acceptance/nodesets/rhel8.yml
 - spec/acceptance/nodesets/oel7.yml
+- spec/acceptance/nodesets/win_2016.yml
 - spec/acceptance/nodesets/rhel7.yml
 - spec/simp_rspec_puppet_facts_spec.rb
 - facts/Gemfile
@@ -272,9 +278,11 @@ test_files:
 - facts/2.5/oraclelinux-7-x86_64.facts
 - facts/2.5/centos-8-x86_64.facts
 - facts/2.5/centos-7-x86_64.facts
+- facts/2.5/windows-2016-x86_64.facts
 - facts/2.5/redhat-7-x86_64.facts
 - facts/2.5/redhat-6-x86_64.facts
-- facts/2.5/windows-server_2012_r2-x86_64.facts
 - facts/2.5/centos-6-x86_64.facts
+- facts/2.5/windows-2019-x86_64.facts
 - facts/2.5/oraclelinux-8-x86_64.facts
 - facts/2.5/oraclelinux-6-x86_64.facts
+- facts/2.5/windows-2012-r2-x86_64.facts