lib: fix usage of operational data in CLI

CLI must never use operational data, because this won't work in
transactional mode. Rework search for prefix-list/access-list entries
using only candidate config.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/filter.h b/lib/filter.h
index 28f5202022..ade68a4567 100644
--- a/lib/filter.h
+++ b/lib/filter.h
@@ -151,10 +151,6 @@ void access_list_filter_add(struct access_list *access,
 void access_list_filter_delete(struct access_list *access,
 			       struct filter *filter);
 int64_t filter_new_seq_get(struct access_list *access);
-struct filter *filter_lookup_cisco(struct access_list *access,
-				   struct filter *mnew);
-struct filter *filter_lookup_zebra(struct access_list *access,
-				   struct filter *mnew);
 
 extern const struct frr_yang_module_info frr_filter_info;
 
@@ -194,6 +190,9 @@ struct acl_dup_args {
 	/** Duplicated entry found in list? */
 	bool ada_found;
 
+	/** Sequence number of the found entry */
+	int64_t ada_seq;
+
 	/** (Optional) Already existing `dnode`. */
 	const struct lyd_node *ada_entry_dnode;
 };
@@ -224,6 +223,9 @@ struct plist_dup_args {
 	/** Duplicated entry found in list? */
 	bool pda_found;
 
+	/** Sequence number of the found entry */
+	int64_t pda_seq;
+
 	/** (Optional) Already existing `dnode`. */
 	const struct lyd_node *pda_entry_dnode;
 };