internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for vlan update on ovs bridges (#57168)

Browse Source 
This commit adds support for vlan update on openvswitch_bridge module.
This commit is contained in:
Daniel Mellado Area
2019-06-05 16:32:15 +02:00
committed by Sam Doran
parent 72f2d05b6f
commit 091bebcbf7
3 changed files with 61 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test/units/modules/network/ovs/test_openvswitch_bridge.py
View File

@@ -20,11 +20,24 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
from units.compat.mock import patch
from ansible.modules.network.ovs import openvswitch_bridge
from units.compat.mock import patch, MagicMock
from units.modules.utils import set_module_args
from .ovs_module import TestOpenVSwitchModule, load_fixture
import pytest
@pytest.fixture
def patched_openvswitch_bridge(monkeypatch):
mocked_bridge = MagicMock()
mocked_bridge.return_value = {'bridge': 'test-br2', 'parent': 'test-br',
'vlan': 200, 'fail_mode': None,
'external_ids': None, 'set': None}
monkeypatch.setattr(openvswitch_bridge, 'map_config_to_obj', mocked_bridge)
return openvswitch_bridge
test_name_side_effect_matrix = {
'test_openvswitch_bridge_absent_idempotent': [
(0, '', '')],
@@ -51,6 +64,11 @@ test_name_side_effect_matrix = {
(0, '', ''),
(0, '', ''),
(0, '', '')],
'test_openvswitch_bridge_updates_vlan': [
(0, '', ''),
(0, '', ''),
(0, '', ''),
(0, '', '')],
'test_openvswitch_bridge_present_adds_external_id': [
(0, 'list_br_test_br.cfg', ''),
(0, 'br_to_parent_test_br.cfg', ''),
@@ -155,6 +173,16 @@ class TestOpenVSwitchBridgeModule(TestOpenVSwitchModule):
self.execute_module(changed=True, commands=commands,
test_name='test_openvswitch_bridge_present_creates_fake_bridge')
@pytest.mark.usefixtures('patched_openvswitch_bridge')
def test_openvswitch_bridge_updates_vlan(self):
set_module_args({'state': 'present', 'bridge': 'test-br2', 'parent':
'test-br', 'vlan': 300})
commands = [
'/usr/bin/ovs-vsctl -t 5 set port test-br2 tag=300'
]
self.execute_module(changed=True, commands=commands,
test_name='test_openvswitch_bridge_updates_vlan')
def test_openvswitch_bridge_present_adds_external_id(self):
set_module_args(dict(state='present',
bridge='test-br',