diff options
| author | Ruslan Volodin <45913745+inetman28@users.noreply.github.com> | 2026-04-15 13:38:11 +0300 |
|---|---|---|
| committer | Ruslan Volodin <ntwman93@gmail.com> | 2026-04-20 13:23:50 +0300 |
| commit | 63fdb5e8e988775131b3c9fe0afb5d9401026c91 (patch) | |
| tree | 1709443ebda0e5b6dd34e311288d4ebc13f558dc | |
| parent | dce09ba36b36cb745e09570839513be568ae1c1c (diff) | |
| download | vyos-1x-63fdb5e8e988775131b3c9fe0afb5d9401026c91.tar.gz vyos-1x-63fdb5e8e988775131b3c9fe0afb5d9401026c91.zip | |
VPP: T8495: Apply suggestions from code review
| -rw-r--r-- | data/config-mode-dependencies/vyos-vpp.json | 3 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_vpp.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces_ethernet.py | 11 |
3 files changed, 2 insertions, 14 deletions
diff --git a/data/config-mode-dependencies/vyos-vpp.json b/data/config-mode-dependencies/vyos-vpp.json index edf941c77..a94fa82a6 100644 --- a/data/config-mode-dependencies/vyos-vpp.json +++ b/data/config-mode-dependencies/vyos-vpp.json @@ -15,9 +15,6 @@ "vpp_sflow": ["vpp_sflow"], "pppoe_server": ["service_pppoe-server"] }, - "interfaces_ethernet": { - "vpp_acl": ["vpp_acl"] - }, "vpp_interfaces_bonding": { "vpp_interfaces_xconnect": ["vpp_interfaces_xconnect"], "vpp_interfaces_bridge": ["vpp_interfaces_bridge"], diff --git a/smoketest/scripts/cli/test_vpp.py b/smoketest/scripts/cli/test_vpp.py index ac93a14a6..64b4c467a 100755 --- a/smoketest/scripts/cli/test_vpp.py +++ b/smoketest/scripts/cli/test_vpp.py @@ -1392,7 +1392,7 @@ class TestVPP(VyOSUnitTestSHIM.TestCase): _, out = rc_cmd('sudo vppctl show flowprobe feature') self.assertIn(required_str, out) - def test_20_3_vpp_acl_subinterface(self): + def test_23_vpp_acl_subinterface(self): base_acl = base_path + ['acl', 'ip'] vlan = '200' subif = f'{interface}.{vlan}' diff --git a/src/conf_mode/interfaces_ethernet.py b/src/conf_mode/interfaces_ethernet.py index 8d40e4d1f..886f9b7b7 100755 --- a/src/conf_mode/interfaces_ethernet.py +++ b/src/conf_mode/interfaces_ethernet.py @@ -175,8 +175,6 @@ def get_config(config=None): if tmp: ethernet.update({'frr_dict' : get_frrender_dict(conf)}) ethernet['flowtable_interfaces'] = get_flowtable_interfaces(conf) - vif_changed = is_node_changed(conf, base + [ifname, 'vif']) - vif_s_changed = is_node_changed(conf, base + [ifname, 'vif-s']) vpp_config = conf.get_config_dict( ['vpp'], @@ -192,13 +190,6 @@ def get_config(config=None): get_first_key=True, no_tag_node_value_mangle=True, ) - if ( - 'acl' in vpp_config - and (vif_changed or vif_s_changed) - and dict_search(f'settings.interface.{ifname}', vpp_config) is not None - ): - ethernet['vpp_acl_dependent'] = True - set_dependents('vpp_acl', conf) # Protocols static arp dependency if 'static_arp' in ethernet: @@ -450,7 +441,7 @@ def apply(ethernet): e.remove() else: e.update(ethernet) - if 'static_arp' in ethernet or 'vpp_acl_dependent' in ethernet: + if 'static_arp' in ethernet: call_dependents() vpp_iface_config = dict_search(f'vpp.settings.interface.{ifname}', ethernet) |