Revert "network: nmstate bridge options - test w/ multicast-router"

This reverts commit 494e4c4. The revert is temporary until a fix for [1] is created. [1] https://bugzilla.redhat.com/2108974 Change-Id: I9bbf2848d96d773a5ae4a239f3042d29fa1d8dea Signed-off-by: Eitan Raviv <[email protected]>
oVirt · Jul 27, 2022 · 037c9c1 · 037c9c1
1 parent b4db298
commit 037c9c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/tests/network/functional/bridge_test.py b/tests/network/functional/bridge_test.py
@@ -70,9 +70,7 @@ def test_add_bridge_with_custom_opts(self, adapter, switch, nic0):
         NET_ATTRS = {
             'nic': nic0,
             'switch': switch,
-            'custom': {
-                'bridge_opts': 'multicast_snooping=0 multicast_router=0'
-            },
+            'custom': {'bridge_opts': 'multicast_snooping=0'},
         }
         NETCREATE = {NETWORK_NAME: NET_ATTRS}
         with adapter.setupNetworks(NETCREATE, {}, nftestlib.NOCHK):

diff --git a/tests/network/functional/netrestore_test.py b/tests/network/functional/netrestore_test.py
@@ -45,12 +45,8 @@ def nic1():
 @pytest.mark.legacy_switch
 class TestRestoreLegacyBridge(object):
     def test_restore_bridge_with_custom_opts(self, adapter, nic0):
-        CUSTOM_OPTS1 = {
-            'bridge_opts': 'multicast_router=0 multicast_snooping=0'
-        }
-        CUSTOM_OPTS2 = {
-            'bridge_opts': 'multicast_router=0 multicast_snooping=1'
-        }
+        CUSTOM_OPTS1 = {'bridge_opts': 'multicast_snooping=0'}
+        CUSTOM_OPTS2 = {'bridge_opts': 'multicast_snooping=1'}
         NETCREATE = {
             NETWORK_NAME: {
                 'nic': nic0,