Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Network state integration test test=True #34618

Merged
merged 3 commits into from
Jul 13, 2016
Merged

Network state integration test test=True #34618

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed59113
Change network state integration test to use test=True
Jul 7, 2016
b261683
Some small changes
Jul 11, 2016
34bcf9c
Changed network state test to use test=True
Jul 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 8 additions & 29 deletions tests/integration/states/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,55 +27,34 @@ def setUp(self):
if os_family not in ('RedHat', 'Debian'):
self.skipTest('Network state only supported on RedHat and Debian based systems')

self.run_function('cmd.run', ['ip link add name dummy0 type dummy'])

def tearDown(self):
self.run_function('cmd.run', ['ip link delete dev dummy0'])

def test_managed(self):
'''
network.managed
'''
if_name = 'dummy0'
ipaddr = '10.1.0.1'
netmask = '255.255.255.0'
broadcast = '10.1.0.255'

expected_if_ret = [{
"broadcast": broadcast,
"netmask": netmask,
"label": if_name,
"address": ipaddr
}]
state_key = 'network_|-dummy0_|-dummy0_|-managed'

ret = self.run_function('state.sls', mods='network.managed')
self.assertSaltTrueReturn(ret)

interface = self.run_function('network.interface', [if_name])
self.assertEqual(interface, expected_if_ret)
ret = self.run_function('state.sls', mods='network.managed', test=True)
self.assertEqual('Interface dummy0 is set to be added.', ret[state_key]['comment'])

def test_routes(self):
'''
network.routes
'''
state_key = 'network_|-routes_|-dummy0_|-routes'
expected_changes = {'network_routes': 'Added interface dummy0 routes.'}
expected_changes = 'Interface dummy0 routes are set to be added.'

ret = self.run_function('state.sls', mods='network.routes')
ret = self.run_function('state.sls', mods='network.routes', test=True)

self.assertSaltTrueReturn(ret)
self.assertEqual(ret[state_key]['changes'], expected_changes)
self.assertEqual(ret[state_key]['comment'], 'Interface dummy0 routes are set to be added.')

def test_system(self):
'''
network.system
'''
state_key = 'network_|-system_|-system_|-system'

ret = self.run_function('state.sls', mods='network.system')

self.assertSaltTrueReturn(ret)
self.assertIn('network_settings', ret[state_key]['changes'])
ret = self.run_function('state.sls', mods='network.system', test=True)
self.assertIn('Global network settings are set to be updated:', ret[state_key]['comment'])


if __name__ == '__main__':
Expand Down