# The order of this list concat matters
features = default_features + extra_features
+ features_csv = features.join(',')
# Confirm properties of Karaf features config file
# NB: These hashes don't work with Ruby 1.8.7, but we
'path' => '/opt/opendaylight/etc/org.apache.karaf.features.cfg',
'owner' => 'odl',
'group' => 'odl',
- 'content' => /^featuresBoot=#{features.join(",")}/
+ )
+ }
+ it {
+ should contain_file_line('featuresBoot').with(
+ 'path' => '/opt/opendaylight/etc/org.apache.karaf.features.cfg',
+ 'line' => "featuresBoot=#{features_csv}",
+ 'match' => '^featuresBoot=.*$',
)
}
end
# NB: These hashes don't work with Ruby 1.8.7, but we
# don't support 1.8.7 so that's okay. See issue #36.
it {
- should contain_file('tomcat-server.xml').with(
+ should contain_file('jetty.xml').with(
'ensure' => 'file',
- 'path' => '/opt/opendaylight/configuration/tomcat-server.xml',
+ 'path' => '/opt/opendaylight/etc/jetty.xml',
'owner' => 'odl',
'group' => 'odl',
- 'content' => /Connector port="#{odl_rest_port}"/
+ 'content' => /Property name="jetty.port" default="#{odl_rest_port}"/
)
}
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?
+ # Should contain log level config file
+ it {
+ should contain_file('org.ops4j.pax.logging.cfg').with(
+ 'ensure' => 'file',
+ 'path' => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
+ 'owner' => 'odl',
+ 'group' => 'odl',
+ )
+ }
+ # Should not contain custom log level config
+ it {
+ should_not contain_file('org.ops4j.pax.logging.cfg').with(
+ 'ensure' => 'file',
+ 'path' => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
+ 'owner' => 'odl',
+ 'group' => 'odl',
+ 'content' => /# Log level config added by puppet-opendaylight/
+ )
+ }
+ else
+ # Should contain log level config file
+ it {
+ should contain_file('org.ops4j.pax.logging.cfg').with(
+ 'ensure' => 'file',
+ 'path' => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
+ 'owner' => 'odl',
+ 'group' => 'odl',
+ )
+ }
+ # Should contain custom log level config
+ it {
+ should contain_file('org.ops4j.pax.logging.cfg').with(
+ 'ensure' => 'file',
+ 'path' => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
+ 'owner' => 'odl',
+ 'group' => 'odl',
+ 'content' => /# Log level config added by puppet-opendaylight/
+ )
+ }
+ # Verify each custom log level config entry
+ log_levels.each_pair do |logger, level|
+ it {
+ should contain_file('org.ops4j.pax.logging.cfg').with(
+ 'ensure' => 'file',
+ 'path' => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
+ 'owner' => 'odl',
+ 'group' => 'odl',
+ 'content' => /^log4j.logger.#{logger} = #{level}/
+ )
+ }
+ end
+ end
+end
+
+# Shared tests that specialize in testing enabling L3 via ODL OVSDB
+def enable_l3_tests(options = {})
+ # Extract params
+ # NB: This default value should be the same as one in opendaylight::params
+ # TODO: Remove this possible source of bugs^^
+ enable_l3 = options.fetch(:enable_l3, 'no')
+
+ if [true, 'yes'].include? enable_l3
+ # Confirm ODL OVSDB L3 is enabled
+ it {
+ should contain_file('custom.properties').with(
+ 'ensure' => 'file',
+ 'path' => '/opt/opendaylight/etc/custom.properties',
+ 'owner' => 'odl',
+ 'group' => 'odl',
+ 'content' => /^ovsdb.l3.fwd.enabled=yes/
+ )
+ }
+ elsif [false, 'no'].include? enable_l3
+ # Confirm ODL OVSDB L3 is disabled
+ it {
+ should contain_file('custom.properties').with(
+ 'ensure' => 'file',
+ 'path' => '/opt/opendaylight/etc/custom.properties',
+ 'owner' => 'odl',
+ 'group' => 'odl',
+ 'content' => /^ovsdb.l3.fwd.enabled=no/
+ )
+ }
+ end
+end
+
def tarball_install_tests(options = {})
# Extract params
# NB: These default values should be the same as ones in opendaylight::params
# TODO: Remove this possible source of bugs^^
- tarball_url = options.fetch(:tarball_url, 'https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.3-Helium-SR3/distribution-karaf-0.2.3-Helium-SR3.tar.gz')
+ tarball_url = options.fetch(:tarball_url, 'https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2.2/distribution-karaf-0.4.0-Beryllium-RC2.2.tar.gz')
unitfile_url = options.fetch(:unitfile_url, 'https://github.com/dfarrell07/opendaylight-systemd/archive/master/opendaylight-unitfile.tar.gz')
osfamily = options.fetch(:osfamily, 'RedHat')
end
# Verify that there are no unexpected resources from RPM-type installs
- it { should_not contain_yumrepo('opendaylight') }
+ it { should_not contain_yumrepo('opendaylight-4-testing') }
it { should_not contain_package('opendaylight') }
end
def rpm_install_tests(options = {})
# Extract params
# Choose Yum URL based on OS (CentOS vs Fedora)
+ # NB: Currently using the CentOS CBS for both Fedora and CentOS
operatingsystem = options.fetch(:operatingsystem, 'CentOS')
case operatingsystem
when 'CentOS'
- yum_repo = 'https://copr-be.cloud.fedoraproject.org/results/dfarrell07/OpenDaylight/epel-7-$basearch/'
+ yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/$basearch/os/'
when 'Fedora'
- yum_repo = 'https://copr-be.cloud.fedoraproject.org/results/dfarrell07/OpenDaylight/fedora-$releasever-$basearch/'
+ yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/$basearch/os/'
else
fail("Unknown operatingsystem: #{operatingsystem}")
end
# Default to CentOS 7 Yum repo URL
# Confirm presence of RPM-related resources
- it { should contain_yumrepo('opendaylight') }
+ it { should contain_yumrepo('opendaylight-4-testing') }
it { should contain_package('opendaylight') }
# Confirm relationships between RPM-related resources
- it { should contain_package('opendaylight').that_requires('Yumrepo[opendaylight]') }
- it { should contain_yumrepo('opendaylight').that_comes_before('Package[opendaylight]') }
+ it { should contain_package('opendaylight').that_requires('Yumrepo[opendaylight-4-testing]') }
+ it { should contain_yumrepo('opendaylight-4-testing').that_comes_before('Package[opendaylight]') }
# Confirm properties of RPM-related resources
# NB: These hashes don't work with Ruby 1.8.7, but we
# don't support 1.8.7 so that's okay. See issue #36.
it {
- should contain_yumrepo('opendaylight').with(
+ should contain_yumrepo('opendaylight-4-testing').with(
'enabled' => '1',
'gpgcheck' => '0',
- 'descr' => 'OpenDaylight SDN controller',
+ 'descr' => 'CentOS CBS OpenDaylight Berillium testing repository',
'baseurl' => yum_repo,
)
}
it { expect { should contain_class('opendaylight::service') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
# Confirm that other resources fail on unsupported OSs
- it { expect { should contain_yumrepo('opendaylight') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
+ it { expect { should contain_yumrepo('opendaylight-4-testing') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
it { expect { should contain_package('opendaylight') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
it { expect { should contain_service('opendaylight') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
it { expect { should contain_file('org.apache.karaf.features.cfg') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
Code Review / integration / packaging / puppet-opendaylight.git / blobdiff