openstack/vitrage
Code Issues Proposed changes

networkx node attribute is deprecated

Browse Source 
'node' was changed to 'nodes'

Change-Id: I4add1c99466409171e238d09585a58a4bc9af596
This commit is contained in:
Eyal 2019-11-12 18:34:49 +02:00
parent 1aac4646f8
commit b2e03404aa
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vitrage/graph/algo_driver/networkx_algorithm.py
View File

@ -49,7 +49,7 @@ class NXAlgorithm(GraphAlgorithm):
edge_query_dict=None): edge_query_dict=None):
graph = self._create_new_graph('graph') graph = self._create_new_graph('graph')
root_data = self.graph._g.node[root_id] root_data = self.graph._g.nodes[root_id]
match_func = create_predicate(query_dict) if query_dict else None match_func = create_predicate(query_dict) if query_dict else None
edge_match_func = create_predicate(edge_query_dict) \ edge_match_func = create_predicate(edge_query_dict) \

14
vitrage/graph/driver/networkx_graph.py
View File

@ -112,7 +112,7 @@ class NXGraph(Graph):
:rtype: Vertex :rtype: Vertex
""" """
properties = self._g.node.get(v_id, None) properties = self._g.nodes.get(v_id, None)
if properties is not None: if properties is not None:
return vertex_copy(v_id, properties) return vertex_copy(v_id, properties)
LOG.debug("get_vertex item not found. v_id=%s", v_id) LOG.debug("get_vertex item not found. v_id=%s", v_id)
@ -184,18 +184,18 @@ class NXGraph(Graph):
:param overwrite: whether to overwrite existing properties :param overwrite: whether to overwrite existing properties
:type overwrite: Boolean :type overwrite: Boolean
""" """
orig_prop = self._g.node.get(v.vertex_id, None) orig_prop = self._g.nodes.get(v.vertex_id, None)
if not orig_prop: if not orig_prop:
self._add_vertex(v) self._add_vertex(v)
return return
merged_props = \ merged_props = \
self._merged_properties(orig_prop, v.properties, overwrite) self._merged_properties(orig_prop, v.properties, overwrite)
self._g.node[v.vertex_id].update(merged_props) self._g.nodes[v.vertex_id].update(merged_props)
for prop, value in v.properties.items(): for prop, value in v.properties.items():
if value is None: if value is None:
del self._g.node[v.vertex_id][prop] del self._g.nodes[v.vertex_id][prop]
@Notifier.update_notify @Notifier.update_notify
def update_edge(self, e): def update_edge(self, e):
@ -318,7 +318,7 @@ class NXGraph(Graph):
for source_id, target_id, label, data in edges_filtered1: for source_id, target_id, label, data in edges_filtered1:
node_id_to_test = source_id if target_id == v_id else target_id node_id_to_test = source_id if target_id == v_id else target_id
node_data = self._g.node[node_id_to_test] node_data = self._g.nodes[node_id_to_test]
if not vertex_predicate or vertex_predicate(node_data): if not vertex_predicate or vertex_predicate(node_data):
edges_filtered2.append((source_id, target_id, label, data)) edges_filtered2.append((source_id, target_id, label, data))
nodes.append((node_id_to_test, node_data)) nodes.append((node_id_to_test, node_data))
@ -341,8 +341,8 @@ class NXGraph(Graph):
for index, node in enumerate(node_link_data['nodes']): for index, node in enumerate(node_link_data['nodes']):
vitrage_id_to_index[node[VProps.VITRAGE_ID]] = index vitrage_id_to_index[node[VProps.VITRAGE_ID]] = index
if VProps.ID in self._g.node[node[VProps.ID]]: if VProps.ID in self._g.nodes[node[VProps.ID]]:
node[VProps.ID] = self._g.node[node[VProps.ID]][VProps.ID] node[VProps.ID] = self._g.nodes[node[VProps.ID]][VProps.ID]
node[VProps.GRAPH_INDEX] = index node[VProps.GRAPH_INDEX] = index
vers = nx.__version__ vers = nx.__version__

4
vitrage/tests/base.py
View File

@ -104,9 +104,9 @@ class BaseTest(base.BaseTestCase):
This relies on assert_dict_equal when comparing the nodes and the This relies on assert_dict_equal when comparing the nodes and the
edges of each graph. edges of each graph.
""" """
g1_nodes = g1._g.node g1_nodes = g1._g.nodes
g1_edges = g1._g.adj g1_edges = g1._g.adj
g2_nodes = g2._g.node g2_nodes = g2._g.nodes
g2_edges = g2._g.adj g2_edges = g2._g.adj
self.assertEqual(g1.num_vertices(), g2.num_vertices(), self.assertEqual(g1.num_vertices(), g2.num_vertices(),
"Two graphs have different amount of nodes") "Two graphs have different amount of nodes")