Replace prov_method KEY_MGMT by EXTENDED_UID_KEY_MGMT

Author: Sander Ruben

docker/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 services:
     prov-service:
         container_name: wm-prov-srv

examples/provisioning_config.yml

@@ -19,7 +19,7 @@
 #     
 # node_name : (mandatory)(string) Ex: test_node
 #    method : (mandatory)(Unsecured:0, Secured:1, Extended UID:3) Ex: 0
-#    factory_key : (only for methods 1 and 3)(32 bytes string, [0:15 Auth key][16:31 Enc Key])
+#    factory_key : (for methods 1,3 and 7)(32 bytes string, [0:15 Auth key][16:31 Enc Key])
 #    node_uid : (optional)(16 bytes string) Ex: 0x7e 0x71 0xe5 0xd7 0x22 0xef 0x0f 0x4b 0xa8 0x7d 0x44 0xd4 0xe0 0xe5 0xb5 0x7d
 #    node_uid_type : (optional)(1 byte string) Ex: 0x01
 #    node_authenticator_uid_type : (optional)(1 byte string) Ex: 0x01
@@ -65,9 +65,11 @@ nodes:
     network: network_prod
     node_id: 17
     uid: 0x58 0xc8 0x12 0xad 0x37 0xe8 0x36 0x4a 0xa1 0x1f 0x1c 0xbc 0x63 0x3e 0x8e 0x34
-  test_node_key_mgmt:
+  test_node_key_extended_uid_key_mgmt:
+    authenticator_uid: 0xb3 0x43 0x33 0x00 0x93 0x81 0x08 0x4a 0x8d 0xb3 0xaa 0x9e 0x53 0xd2 0x2a 0x1e
+    authenticator_uid_type: 1
     factory_key: 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0X09 0X0A 0X0B 0X0C 0X0D 0X0E 0X0F 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0X09 0X0A 0X0B 0X0C 0X0D 0X0E 0X0F
-    method: 4
+    method: 7
     network: network_prod
     network_key_sequence: 1
     node_id: 18

wirepas_provisioning_server/data.py

@@ -152,7 +152,7 @@ def __init__(self, config: Optional[str] = None):
 
                 if "uid" in node_cfg.keys():
                     uid: str | int | bytes = node_cfg["uid"]
-                elif node_cfg["method"] == ProvisioningMethod.EXTENDED:
+                elif node_cfg["method"] == ProvisioningMethod.EXTENDED or node_cfg["method"] == ProvisioningMethod.EXTENDED_UID_KEY_MGMT:
                     try:
                         uid = _generate_extended_uid(
                             node_cfg["authenticator_uid_type"],

wirepas_provisioning_server/message.py

@@ -34,7 +34,7 @@ class ProvisioningMethod(IntEnum):
     UNSECURED = 0
     SECURED = 1
     EXTENDED = 3
-    KEY_MGMT = 5
+    EXTENDED_UID_KEY_MGMT = 7
 
 
 class ProvisioningNackReason(IntEnum):