From 8b987b8e43463b76e455f3562ffa23ce31a91a42 Mon Sep 17 00:00:00 2001 From: gifrerenom Date: Thu, 4 Jul 2024 14:21:33 +0000 Subject: [PATCH] Pre-merge cosmetic cleanup --- .../service/drivers/openconfig/templates/acl/acl_adapter.py | 2 -- .../templates/acl/acl_adapter_ipinfusion_proprietary.py | 2 -- src/nbi/requirements.in | 2 +- .../service/rest_server/nbi_plugins/ietf_acl/ietf_acl_parser.py | 2 +- src/nbi/tests/data/ietf_acl.json | 2 +- .../service/service_handlers/l3nm_openconfig/ConfigRules.py | 1 + 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/device/service/drivers/openconfig/templates/acl/acl_adapter.py b/src/device/service/drivers/openconfig/templates/acl/acl_adapter.py index e36d25366..15e723680 100644 --- a/src/device/service/drivers/openconfig/templates/acl/acl_adapter.py +++ b/src/device/service/drivers/openconfig/templates/acl/acl_adapter.py @@ -71,5 +71,3 @@ def acl_cr_to_dict(acl_cr_dict: Dict, subinterface:int = 0) -> Dict: source_port=22, destination_port=80 ) - - \ No newline at end of file diff --git a/src/device/service/drivers/openconfig/templates/acl/acl_adapter_ipinfusion_proprietary.py b/src/device/service/drivers/openconfig/templates/acl/acl_adapter_ipinfusion_proprietary.py index 9d496e26f..52213c2ab 100644 --- a/src/device/service/drivers/openconfig/templates/acl/acl_adapter_ipinfusion_proprietary.py +++ b/src/device/service/drivers/openconfig/templates/acl/acl_adapter_ipinfusion_proprietary.py @@ -61,5 +61,3 @@ def acl_cr_to_dict_ipinfusion_proprietary(acl_cr_dict: Dict, delete: bool = Fals source_port=rule_set_entry_match['src_port'], destination_port=rule_set_entry_match['dst_port'] ) - - \ No newline at end of file diff --git a/src/nbi/requirements.in b/src/nbi/requirements.in index 0757ae0b9..4c5460a8e 100644 --- a/src/nbi/requirements.in +++ b/src/nbi/requirements.in @@ -22,6 +22,6 @@ libyang==2.8.0 netaddr==0.9.0 pyang==2.6.0 git+https://github.com/robshakir/pyangbind.git +pydantic==2.6.3 requests==2.27.1 werkzeug==2.3.7 -pydantic==2.6.3 diff --git a/src/nbi/service/rest_server/nbi_plugins/ietf_acl/ietf_acl_parser.py b/src/nbi/service/rest_server/nbi_plugins/ietf_acl/ietf_acl_parser.py index 38f2d9d40..1e29a9365 100644 --- a/src/nbi/service/rest_server/nbi_plugins/ietf_acl/ietf_acl_parser.py +++ b/src/nbi/service/rest_server/nbi_plugins/ietf_acl/ietf_acl_parser.py @@ -161,4 +161,4 @@ def ietf_acl_from_config_rule_resource_value(config_rule_rv: Dict) -> Dict: acls = Acls(acl=[acl], attachment_points=AttachmentPoints(attachment_points=interfaces)) ietf_acl = IETF_ACL(acls=acls) - return ietf_acl.model_dump(by_alias=True) \ No newline at end of file + return ietf_acl.model_dump(by_alias=True) diff --git a/src/nbi/tests/data/ietf_acl.json b/src/nbi/tests/data/ietf_acl.json index 4fd5e6c13..072df6d01 100644 --- a/src/nbi/tests/data/ietf_acl.json +++ b/src/nbi/tests/data/ietf_acl.json @@ -53,4 +53,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py b/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py index ef48002f3..752793287 100644 --- a/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py +++ b/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py @@ -195,6 +195,7 @@ def setup_config_rules( }), ] + for res_key, res_value in endpoint_acls: json_config_rules.append( {'action': 1, 'acl': res_value} -- GitLab