mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #34618 from jtand/network_integration_fix
Network state integration test test=True
This commit is contained in:
commit
3e612c3794
1 changed files with 8 additions and 29 deletions
|
@ -27,44 +27,25 @@ class NetworkTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
|
|||
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'
|
||||
state_key = 'network_|-dummy0_|-dummy0_|-managed'
|
||||
|
||||
expected_if_ret = [{
|
||||
"broadcast": broadcast,
|
||||
"netmask": netmask,
|
||||
"label": if_name,
|
||||
"address": ipaddr
|
||||
}]
|
||||
|
||||
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):
|
||||
'''
|
||||
|
@ -72,10 +53,8 @@ class NetworkTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
|
|||
'''
|
||||
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__':
|
||||
|
|
Loading…
Add table
Reference in a new issue