Api in networkx 1.11 changed, updating

For more details see https://github.com/networkx/networkx/issues/1984

Change-Id: I51f7c9d44e4c6283de0db8cf69baacc0bace9325

requirements.txt

@@ -19,7 +19,7 @@ ansible
 mock
 multipledispatch==0.4.8
 pbr
-pydot
+pydotplus
 bunch
 wrapt
 

solar/cli/events.py

@@ -66,7 +66,7 @@ def rem(etype, parent_node, parent_action, state, depend_node, depend_action):
 @click.argument('resource')
 def trav(resource):
     dg = evapi.bft_events_graph(resource)
-    nx.write_dot(dg, '{name}.dot'.format(name='events'))
+    nx.nx_pydot.write_dot(dg, '{name}.dot'.format(name='events'))
     subprocess.call(
         'dot -Tpng {name}.dot -o {name}.png'.format(name='events'),
         shell=True)

solar/cli/main.py

@@ -154,7 +154,7 @@ def init_cli_connections():
                                               end_with=end_with,
                                               details=details)
 
-        nx.write_dot(g, 'graph.dot')
+        nx.nx_pydot.write_dot(g, 'graph.dot')
         fabric_api.local('dot -Tsvg graph.dot -o graph.svg')
 
 

solar/orchestration/utils.py

@@ -34,7 +34,7 @@ def write_graph(plan):
         color = colors[plan.node[n]['status']]
         plan.node[n]['color'] = color
 
-    nx.write_dot(plan, '{name}.dot'.format(name=plan.graph['name']))
+    nx.nx_pydot.write_dot(plan, '{name}.dot'.format(name=plan.graph['name']))
     subprocess.call(
         'tred {name}.dot | dot -Tsvg -o {name}.svg'.format(
             name=plan.graph['name']),