Fix "cname" generation with non-reversed graph as source

Signed-off-by: Tobias Wolf <[email protected]>

Author: NotTheEvilOne

src/gardenlinux/features/__main__.py

@@ -108,8 +108,7 @@ def main():
     elif args.type in ( "cname_base", "cname", "graph" ):
         graph = Parser(gardenlinux_root, feature_dir_name).filter(cname_base, additional_filter_func = additional_filter_func)
 
-        sorted_features = Parser.sort_reversed_graph_nodes(graph)
-
+        sorted_features = Parser.sort_graph_nodes(graph)
         minimal_feature_set = get_minimal_feature_set(graph)
 
         sorted_minimal_features = sort_subset(

src/gardenlinux/features/cname_main.py

@@ -67,8 +67,7 @@ def main():
 
     graph = Parser(gardenlinux_root, feature_dir_name).filter(cname_base)
 
-    sorted_features = Parser.sort_reversed_graph_nodes(graph)
-
+    sorted_features = Parser.sort_graph_nodes(graph)
     minimal_feature_set = get_minimal_feature_set(graph)
 
     sorted_minimal_features = sort_subset(

src/gardenlinux/features/parser.py

@@ -215,12 +215,16 @@ def _get_graph_node_type(node):
         return node.get("content", {}).get("type")
 
     @staticmethod
-    def sort_reversed_graph_nodes(graph):
+    def sort_graph_nodes(graph):
         def key_function(node):
             prefix_map = {"platform": "0", "element": "1", "flag": "2"}
             node_type = Parser._get_graph_node_type(graph.nodes.get(node, {}))
             prefix = prefix_map[node_type]
 
             return f"{prefix}-{node}"
 
-        return list(networkx.lexicographical_topological_sort(graph.reverse(), key = key_function))
+        return list(networkx.lexicographical_topological_sort(graph, key = key_function))
+
+    @staticmethod
+    def sort_reversed_graph_nodes(graph):
+        return Parser.sort_graph_nodes(graph.reverse())