diff options
| author | Alon Levy <alon@pobox.com> | 2015-01-06 20:20:09 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-01-06 20:25:11 +0200 |
| commit | a7d4e65fa944e2174f6f20a20c3ad0b37c2c0304 (patch) | |
| tree | bc12ce21fba76b5c4f2f41202be2326fbf4b1508 | |
| parent | 2cb2853e3f31799fff4c97526f8dda4aa00f2143 (diff) | |
server: fix Topo_Diff_Result usage
The reason json failed was that we were using a class instead of an
instance, i.e.
clazz = namedtuple('bla', ['field1', 'field2'])
instance = clazz(field1='foo', field2='bar')
| -rw-r--r-- | src/server/db_op.py | 18 | ||||
| -rw-r--r-- | src/server/rz_api_rest.py | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/server/db_op.py b/src/server/db_op.py index 54d2dfd5..cb438fc3 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -239,6 +239,11 @@ class DBO_cypher_query(DB_op): super(DBO_cypher_query, self).__init__() self.add_statement(q, q_params) +Topo_Diff_Result = namedtuple('Topo_Diff_Result', ['node_id_set_add', + 'link_id_set_add', + 'node_id_set_rm', + 'link_id_set_rm']) + class DBO_diff_commit__topo(DB_composed_op): """ commit a Topo_Diff @@ -312,14 +317,11 @@ class DBO_diff_commit__topo(DB_composed_op): for n_id in row_set: ret_nid_set_rm.extend(n_id) - ret = namedtuple('Topo_Diff_Result', ['node_id_set_add', - 'link_id_set_add', - 'node_id_set_rm', - 'link_id_set_rm']) - ret.node_id_set_add = ret_nid_set_add - ret.link_id_set_add = ret_lid_set_add - ret.node_id_set_rm = ret_nid_set_rm - ret.link_id_set_rm = ret_lid_set_rm + ret = Topo_Diff_Result( + node_id_set_add=ret_nid_set_add, + link_id_set_add=ret_lid_set_add, + node_id_set_rm=ret_nid_set_rm, + link_id_set_rm=ret_lid_set_rm) return ret diff --git a/src/server/rz_api_rest.py b/src/server/rz_api_rest.py index 30f07635..4d0cbdc1 100644 --- a/src/server/rz_api_rest.py +++ b/src/server/rz_api_rest.py @@ -77,8 +77,7 @@ def diff_commit__topo(): try: kernel = flask.current_app.kernel topo_diff = kernel.diff_commit__topo(topo_diff) - topo_diff_json = topo_diff.to_json_dict() - return __common_resp_handle(data=topo_diff_json) + return __common_resp_handle(data=topo_diff) except Exception as e: log.error(e.message) log.error(traceback.print_exc()) |