Merge "Add boolean flag to disable the PaxOsgi appender"

[integration/packaging/puppet-opendaylight.git] / spec / spec_helper.rb

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ef092d16fb4d05dfa4d5751ab3efeef36903bb62..3318939e7725762859afd5c4877b14b47d71a469 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -221,7 +221,6 @@ end
 def karaf_feature_tests(options = {})
   # Extract params
   # NB: This default list should be the same as the one in opendaylight::params
-  # TODO: Remove this possible source of bugs^^
   default_features = options.fetch(:default_features, ['standard', 'wrap', 'ssh'])
   extra_features = options.fetch(:extra_features, [])
 
@@ -253,7 +252,6 @@ end
 def odl_rest_port_tests(options = {})
   # Extract params
   # NB: This default value should be the same as one in opendaylight::params
-  # TODO: Remove this possible source of bugs^^
   odl_rest_port = options.fetch(:odl_rest_port, 8181)
   odl_bind_ip = options.fetch(:odl_bind_ip, '0.0.0.0')
   # Confirm properties of ODL REST port config file
@@ -299,7 +297,6 @@ end
 def log_level_tests(options = {})
   # Extract params
   # NB: This default value should be the same as one in opendaylight::params
-  # TODO: Remove this possible source of bugs^^
   log_levels = options.fetch(:log_levels, {})
 
   if log_levels.empty?
@@ -394,7 +391,7 @@ end
 
 def rpm_install_tests(options = {})
   # Extract params
-  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel')
+  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-neon-epel-7-$basearch-devel')
 
 
   # Default to CentOS 7 Yum repo URL
@@ -449,7 +446,7 @@ end
 def unsupported_os_tests(options = {})
   # Extract params
   expected_msg = options.fetch(:expected_msg)
-  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel')
+  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-neon-epel-7-$basearch-devel')
 
   # Confirm that classes fail on unsupported OSs
   it { expect { should contain_class('opendaylight') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
@@ -540,7 +537,6 @@ end
 def vpp_routing_node_tests(options = {})
   # Extract params
   # NB: This default list should be the same as the one in opendaylight::params
-  # TODO: Remove this possible source of bugs^^
   routing_node = options.fetch(:routing_node, '')
 
   if routing_node.empty?
@@ -582,7 +578,6 @@ end
 def odl_websocket_address_tests(options = {})
   # Extract params
   # NB: This default value should be the same as one in opendaylight::params
-  # TODO: Remove this possible source of bugs^^
   odl_bind_ip = options.fetch(:odl_bind_ip, '0.0.0.0')
   # Confirm properties of ODL REST port config file
   # NB: These hashes don't work with Ruby 1.8.7, but we
@@ -711,7 +706,6 @@ end
 def stats_polling_enablement_tests(options = {})
   # Extract params
   # NB: This default value should be the same as one in opendaylight::params
-  # TODO: Remove this possible source of bugs^^
   stats_polling_enabled = options.fetch(:stats_polling_enabled, false)
   # Confirm properties of ODL REST port config file
   # NB: These hashes don't work with Ruby 1.8.7, but we