Resolve several problems after conflicts
This commit is contained in:
parent
244c98a021
commit
97e3f95fdb
@ -13,8 +13,8 @@ input:
|
||||
schema: str!
|
||||
value:
|
||||
hosts_names:
|
||||
schema: [{value: str!}]
|
||||
schema: [str!]
|
||||
value: []
|
||||
hosts_ips:
|
||||
schema: [{value: str!}]
|
||||
schema: [str!]
|
||||
value: []
|
||||
|
@ -350,7 +350,6 @@ def run():
|
||||
init_actions()
|
||||
init_cli_connect()
|
||||
init_cli_connections()
|
||||
init_cli_deployment_config()
|
||||
init_cli_resource()
|
||||
|
||||
main.add_command(orchestration)
|
||||
|
@ -19,7 +19,7 @@ import networkx as nx
|
||||
|
||||
from solar.core.log import log
|
||||
from solar.interfaces.db import get_db
|
||||
from solar.events.controls import Dep, React
|
||||
from solar.events.controls import Dep, React, StateChange
|
||||
|
||||
db = get_db()
|
||||
|
||||
|
@ -43,10 +43,10 @@ def save_graph(name, graph):
|
||||
def get_graph(uid):
|
||||
dg = nx.MultiDiGraph()
|
||||
collection = db.COLLECTIONS.plan_node.name + ':' + uid
|
||||
type_ = db.RELATION_TYPES.plan_edge.name + ': ' + uid
|
||||
db.graph = db.get(uid, collection=db.COLLECTIONS.plan_graph).properties
|
||||
db.add_nodes_from([(n.uid, n.properties) for n in db.all(collection=collection)])
|
||||
db.add_edges_from([(i['source'], i['dest'], i['properties'])
|
||||
type_ = db.RELATION_TYPES.plan_edge.name + ':' + uid
|
||||
dg.graph = db.get(uid, collection=db.COLLECTIONS.plan_graph).properties
|
||||
dg.add_nodes_from([(n.uid, n.properties) for n in db.all(collection=collection)])
|
||||
dg.add_edges_from([(i['source'], i['dest'], i['properties'])
|
||||
for i in db.all_relations(type_=type_, db_convert=False)])
|
||||
return dg
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user