From c9a159a0b36480bec64fe42165081f77840b2cdc Mon Sep 17 00:00:00 2001
From: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
Date: Wed, 21 Jun 2023 13:38:02 +0200
Subject: [PATCH] mesh: Add virtual address before using it

Virtual address behavior has been changed in this PR:
https://github.com/zephyrproject-rtos/zephyr/pull/57878

Now it requires label uuid to be added before any message can be sent
and desired uuid should be passed to message context structure before
sending a message to a virtual address.

This change should fix MESH/NODE/NET/BV-02-C and MESH/NODE/TNPT/BV-05-C
failing tests.

For MESH/NODE/NET/BV-02-C the virtual address is added on hdl_wid_21 as
PTS asks the stack to provide known virtual address.

For MESH/NODE/TNPT/BV-05-C PTS gives the label uuid in the message,
therefore we need to add this address first before sending a message to
it.

Corresponding PR to zephyrproject-rtos:
https://github.com/zephyrproject-rtos/zephyr/pull/59486

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
---
 autopts/pybtp/btp/mesh.py | 39 +++++++++++++++++++++++++++++++++++++++
 autopts/pybtp/defs.py     |  2 ++
 autopts/wid/mesh.py       | 19 ++++++++++++++++++-
 doc/btp_mesh_node.txt     | 22 ++++++++++++++++++++++
 4 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/autopts/pybtp/btp/mesh.py b/autopts/pybtp/btp/mesh.py
index 2e28241647..6ef1b4a9b2 100644
--- a/autopts/pybtp/btp/mesh.py
+++ b/autopts/pybtp/btp/mesh.py
@@ -253,6 +253,12 @@
     "proxy_connect": (defs.BTP_SERVICE_ID_MESH,
                       defs.MESH_PROXY_CONNECT,
                       CONTROLLER_INDEX),
+    "va_add": (defs.BTP_SERVICE_ID_MESH,
+               defs.MESH_VA_ADD,
+               CONTROLLER_INDEX),
+    "va_del": (defs.BTP_SERVICE_ID_MESH,
+               defs.MESH_VA_DEL,
+               CONTROLLER_INDEX),
 }
 
 
@@ -429,6 +435,39 @@ def mesh_net_send(ttl, src, dst, payload):
     iutctl.btp_socket.send_wait_rsp(*MESH['net_send'], data=data)
 
 
+def mesh_va_add(label):
+    logging.debug("%s %r", mesh_va_add.__name__, label)
+
+    label = binascii.unhexlify(label)
+
+    if len(label) != 16:
+        raise BTPError("Label UUID length is invalid")
+
+    data = bytearray(struct.pack("<"))
+    data.extend(label)
+
+    iutctl = get_iut()
+    (rsp,) = iutctl.btp_socket.send_wait_rsp(*MESH['va_add'], data=data)
+
+    (virtual_addr,) = struct.unpack_from('<H', rsp)
+    return int(virtual_addr)
+
+
+def mesh_va_del(label):
+    logging.debug("%s %r", mesh_va_del.__name__, label)
+
+    label = binascii.unhexlify(label)
+
+    if len(label) != 16:
+        raise BTPError("Label UUID length is invalid")
+
+    data = bytearray(struct.pack("<"))
+    data.extend(label)
+
+    iutctl = get_iut()
+    iutctl.btp_socket.send_wait_rsp(*MESH['va_del'], data=data)
+
+
 def mesh_health_generate_faults():
     logging.debug("%s", mesh_health_generate_faults.__name__)
 
diff --git a/autopts/pybtp/defs.py b/autopts/pybtp/defs.py
index 4af8b7228a..802c2129b9 100644
--- a/autopts/pybtp/defs.py
+++ b/autopts/pybtp/defs.py
@@ -308,6 +308,8 @@
 MESH_PROVISION_ADV = 0x4A
 MESH_CFG_KRP_GET = 0x4B
 MESH_CFG_KRP_SET = 0x4C
+MESH_VA_ADD = 0x4D
+MESH_VA_DEL = 0x4E
 MESH_PROXY_CONNECT = 0x77
 MESH_EV_OUT_NUMBER_ACTION = 0x80
 MESH_EV_OUT_STRING_ACTION = 0x81
diff --git a/autopts/wid/mesh.py b/autopts/wid/mesh.py
index c9fea41bf8..10a7e9feda 100644
--- a/autopts/wid/mesh.py
+++ b/autopts/wid/mesh.py
@@ -248,7 +248,12 @@ def hdl_wid_21(_: WIDParams):
     Implements: ENTER_VIRTUAL_ADDRESS
     description: Please enter a valid virtual address the IUT knows
     """
-    return '8000'
+
+    # Should generate virtual address 0x8000
+    addr = btp.mesh_va_add('f5f4ca5e1d710dc6f9fa1bd4c32ca61e')
+
+    logging.debug("Virtual address = %r", addr)
+    return f'{addr:x}'
 
 
 def hdl_wid_22(params: WIDParams):
@@ -573,9 +578,21 @@ def hdl_wid_44(params: WIDParams):
 
     params = dict(params)
 
+    # Add virtual address before sending a message. If it was added before, reference will be
+    # incremented.
+    addr = btp.mesh_va_add(value)
+    if (addr != int(params.get('(address'), 16)):
+        logging.error("%s Generated virtual address (%s) doesn't match the provided one (%s)",
+                      hdl_wid_44.__name__, addr, int(params.get('(address'), 16))
+        return False
+
     btp.mesh_model_send(int(params.get('source address'), 16),
                         int(params.get('(address'), 16),
                         value)
+
+    # Remove virtual address after sending a message. If it was added before, reference will be
+    # decremented.
+    btp.mesh_va_del(value)
     return True
 
 
diff --git a/doc/btp_mesh_node.txt b/doc/btp_mesh_node.txt
index 5b54bcf49c..b465d977cd 100644
--- a/doc/btp_mesh_node.txt
+++ b/doc/btp_mesh_node.txt
@@ -919,6 +919,28 @@ Commands and responses:
 
 		In case of an error, the error response will be returned.
 
+    Opcode 0x4D - Virtual Address Add
+
+		Controller Index:       <controller id>
+		Command parameters:     Label UUID (16 octets)
+
+		This command is used to add a Label UUID to the stack. If
+		the Label UUID is already added, the reference will be
+		incremented.
+
+		In case of an error, the error response will be returned.
+
+    Opcode 0x4E - Virtual Address Delete
+
+		Controller Index:       <controller id>
+		Command parameters:     Label UUID (16 octets)
+
+		This command is used to delete a Label UUID from the stack.
+		If the Label UUID was added before, the reference will be
+		decremented.
+
+		In case of an error, the error response will be returned.
+
     Opcode 0x48 - Config Key Refesh Phase Get
 
 		Controller Index:       <controller id>