From 80bfb4daa20c3f5ec01fe1a1fcf58b049ac903e0 Mon Sep 17 00:00:00 2001 From: Matthew Mols Date: Fri, 18 Jul 2025 15:01:50 -0500 Subject: [PATCH 1/3] resolve error with spock set-readonly --- cli/scripts/spock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/scripts/spock.py b/cli/scripts/spock.py index 3376b66c..00511c87 100644 --- a/cli/scripts/spock.py +++ b/cli/scripts/spock.py @@ -726,7 +726,7 @@ def set_readonly(readonly="off"): util.message("spock.set_readonly() deprecated, use db.set_readonly() instead", "warning") - return(db.set_readonly(readonly, pg)) + return(db.set_readonly(readonly)) def get_pii_cols(db, schema=None): From 0ffe2d0c730e0a2c7b92a9be34d55f06a0a98f35 Mon Sep 17 00:00:00 2001 From: Matthew Mols Date: Fri, 18 Jul 2025 15:02:25 -0500 Subject: [PATCH 2/3] remove spock node-alter-location --- cli/scripts/spock.py | 31 --------------------- docs/cli_functions.md | 1 - docs/functions/spock-node-alter-location.md | 11 -------- docs/functions/spock.md | 1 - 4 files changed, 44 deletions(-) delete mode 100644 docs/functions/spock-node-alter-location.md diff --git a/cli/scripts/spock.py b/cli/scripts/spock.py index 00511c87..3bec2756 100644 --- a/cli/scripts/spock.py +++ b/cli/scripts/spock.py @@ -198,36 +198,6 @@ def node_drop(node_name, db): sys.exit(0) -def node_alter_location(node_name, location, db): - """Set location details for spock node.""" - pg_v,spock_v = get_spock_ver() - - [location_nm, country, state, lattitude, longitude] = util.get_location_dtls( - location - ) - - sql = """ -UPDATE spock.node - SET location_nm = ?, country = ?, state = ?, lattitude = ?, longitude = ? - WHERE location = ? -""" - - con = util.get_pg_connection(pg_v, db, util.get_user()) - - rc = 0 - try: - con = util.get_pg_connection(pg_v, "postgres", util.get_user()) - cur = con.cursor(row_factory=psycopg.rows.dict_row) - cur.execute(sql, [location_nm, country, state, lattitude, longitude]) - con.commit() - except Exception as e: - util.print_exception(e) - con.rollback() - rc = 1 - - sys.exit(rc) - - def node_list(db): """Display node table. @@ -1017,7 +987,6 @@ def metrics_check(db): { "node-create": node_create, "node-drop": node_drop, - "node-alter-location": node_alter_location, "node-list": node_list, "node-add-interface": node_add_interface, "node-drop-interface": node_drop_interface, diff --git a/docs/cli_functions.md b/docs/cli_functions.md index 99162704..f7f5abdc 100644 --- a/docs/cli_functions.md +++ b/docs/cli_functions.md @@ -96,7 +96,6 @@ Use commands in this section to invoke spock extension functionality with the CL |---------|-------------| | [spock node-create](functions/spock-node-create.md) | Define a node for spock. | | [spock node-drop](functions/spock-node-drop.md) | Remove a spock node. | -| [spock node-alter-location](functions/spock-node-alter-location.md) | Set location details for spock node. | | [spock node-list](functions/spock-node-list.md) | Display node table. | | [spock node-add-interface](functions/spock-node-add-interface.md) | Add a new node interface. | | [spock node-drop-interface](functions/spock-node-drop-interface.md) | Delete a node interface. | diff --git a/docs/functions/spock-node-alter-location.md b/docs/functions/spock-node-alter-location.md deleted file mode 100644 index 9d39297b..00000000 --- a/docs/functions/spock-node-alter-location.md +++ /dev/null @@ -1,11 +0,0 @@ - -## SYNOPSIS - ./pgedge spock node-alter-location NODE_NAME LOCATION DB - -## DESCRIPTION - Set location details for spock node. - -## POSITIONAL ARGUMENTS - NODE_NAME - LOCATION - DB diff --git a/docs/functions/spock.md b/docs/functions/spock.md index d1f26fdc..5ed3198c 100644 --- a/docs/functions/spock.md +++ b/docs/functions/spock.md @@ -6,7 +6,6 @@ COMMAND is one of the following: node-create # Define a node for spock. node-drop # Remove a spock node. - node-alter-location # Set location details for spock node. node-list # Display node table. node-add-interface # Add a new node interface. node-drop-interface # Delete a node interface. From 6cad8eb3b5d44502fbf7454bd15a1190ebb992cc Mon Sep 17 00:00:00 2001 From: Matthew Mols Date: Fri, 18 Jul 2025 15:09:19 -0500 Subject: [PATCH 3/3] add missing dependency --- cli/scripts/db.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cli/scripts/db.py b/cli/scripts/db.py index ae1e57d2..9f9bf0f5 100755 --- a/cli/scripts/db.py +++ b/cli/scripts/db.py @@ -9,6 +9,7 @@ import util import fire import re +import psycopg def create(db=None, User=None, Passwd=None, pg=None, spock=None, help=False): """