fix(smf): UPF graph UL CL scenario selection

Signed-off-by: Stefan Spettel <stefan.spettel@eurecom.fr>

src/smf_app/smf_pfcp_association.cpp

@@ -1306,8 +1306,9 @@ std::shared_ptr<upf_graph> upf_graph::select_upf_nodes(
               dnais, flow_description, precedence, snssai, dnn);
 
           create_subgraph_dfs(sub_graph_ptr, node.first, visited);
+          // Verify the merged graph with all DNAIs so far
           sub_graph_ptr->set_dfs_selection_criteria(
-              dnais, flow_description, precedence, snssai, dnn);
+              dnais_from_all_rules, flow_description, precedence, snssai, dnn);
 
           if (!sub_graph_ptr->verify()) {
             // in case copy is null, new subgraph_ptr is also null, and we

src/smf_app/smf_pfcp_association.hpp

@@ -288,9 +288,9 @@ struct edge {
       const std::string& dnai) const;
 
   bool operator==(const edge& other) const {
-    return dnai == other.dnai && flow_description == other.flow_description &&
-           nw_instance == other.nw_instance && type == other.type &&
-           uplink == other.uplink && association == other.association;
+    return dnai == other.dnai && nw_instance == other.nw_instance &&
+           type == other.type && uplink == other.uplink &&
+           association == other.association;
   }
 
   [[nodiscard]] std::string to_string() const {