x/solar
Code Issues Proposed changes

Resolve several problems after conflicts

Browse Source
This commit is contained in:
Dmitry Shulyak 2015-09-15 10:30:25 +03:00
parent 244c98a021
commit 97e3f95fdb
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/hosts_file/meta.yaml
View File

@ -13,8 +13,8 @@ input:
schema: str! schema: str!
value: value:
hosts_names: hosts_names:
schema: [{value: str!}] schema: [str!]
value: [] value: []
hosts_ips: hosts_ips:
schema: [{value: str!}] schema: [str!]
value: [] value: []

1
solar/solar/cli/main.py
View File

@ -350,7 +350,6 @@ def run():
init_actions() init_actions()
init_cli_connect() init_cli_connect()
init_cli_connections() init_cli_connections()
init_cli_deployment_config()
init_cli_resource() init_cli_resource()
main.add_command(orchestration) main.add_command(orchestration)

2
solar/solar/events/api.py
View File

@ -19,7 +19,7 @@ import networkx as nx
from solar.core.log import log from solar.core.log import log
from solar.interfaces.db import get_db 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() db = get_db()

8
solar/solar/orchestration/graph.py
View File

@ -43,10 +43,10 @@ def save_graph(name, graph):
def get_graph(uid): def get_graph(uid):
dg = nx.MultiDiGraph() dg = nx.MultiDiGraph()
collection = db.COLLECTIONS.plan_node.name + ':' + uid collection = db.COLLECTIONS.plan_node.name + ':' + uid
type_ = db.RELATION_TYPES.plan_edge.name + ': ' + uid type_ = db.RELATION_TYPES.plan_edge.name + ':' + uid
db.graph = db.get(uid, collection=db.COLLECTIONS.plan_graph).properties dg.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)]) dg.add_nodes_from([(n.uid, n.properties) for n in db.all(collection=collection)])
db.add_edges_from([(i['source'], i['dest'], i['properties']) dg.add_edges_from([(i['source'], i['dest'], i['properties'])
for i in db.all_relations(type_=type_, db_convert=False)]) for i in db.all_relations(type_=type_, db_convert=False)])
return dg return dg