tls: report the identity columns instead of calling them unknown

'db_add a.example.org type=client' reported "unknown tls_mgm column
'type'", which is not true: the column exists, it just identifies the
row and is passed as an argument.  Name the three identity columns and
say so.

Parse the columns before resolving the domain as well, so that such a
command is rejected right away rather than after asking for the domain
and its type.

Author: dariusstefan

opensipscli/modules/tls.py

@@ -48,6 +48,9 @@
 # columns holding PEM content, which is read from the file they point to
 TLS_PEM_COLUMNS = [TLS_CERT_COL, TLS_PK_COL, TLS_CALIST_COL, TLS_DH_COL]
 
+# columns identifying a row, which are not provisioned as 'column=value'
+TLS_ID_COLUMNS = ["id", TLS_DOMAIN_COL, TLS_TYPE_COL]
+
 # as defined by CLIENT_DOMAIN_TYPE/SERVER_DOMAIN_TYPE in tls_mgm/tls_domain.h
 TLS_DOMAIN_TYPES = {"client": 1, "server": 2}
 TLS_TYPE_NAMES = {v: k for k, v in TLS_DOMAIN_TYPES.items()}
@@ -449,18 +452,20 @@ def tls_db_reload(self):
 
     def tls_db_params(self, params, require_type=False):
         """
-        splits the params into the (domain, type) pair identifying the row and
-        the 'column=value' assignments; the value of a PEM column is the path
-        of the file holding it
+        splits the params into the 'column=value' assignments and the
+        (domain, type) pair identifying the row; the value of a PEM column is
+        the path of the file holding it.  The columns are parsed first, so that
+        a bad one is reported without asking for the domain beforehand
         """
-        domain, dtype = self.tls_db_domain(
-                [p for p in params if '=' not in p], require_type)
-        if not domain:
-            return None, None, None
-
         cols = {}
         for param in [p for p in params if '=' in p]:
             col, val = param.split('=', 1)
+            if col in TLS_ID_COLUMNS:
+                logger.error("column '%s' identifies the row and cannot be "
+                        "provisioned; the domain and its type are passed as "
+                        "arguments", col)
+                return None, None, None
+
             if col not in TLS_MGM_COLUMNS:
                 logger.error("unknown %s column '%s'", TLS_MGM_TABLE, col)
                 return None, None, None
@@ -481,6 +486,11 @@ def tls_db_params(self, params, require_type=False):
 
             cols[col] = val
 
+        domain, dtype = self.tls_db_domain(
+                [p for p in params if '=' not in p], require_type)
+        if not domain:
+            return None, None, None
+
         return domain, dtype, cols
 
     def do_db_add(self, params=None, modifiers=None):