spock module command fixes

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):
     """

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. 
 
@@ -726,7 +696,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):
@@ -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,

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. |

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.