mctpd: use .DRAFT suffix on BusOwner1 interface

We'll be modifying this for the new Role-based interfaces which exist on the link/interface objects, so use a temporary name for now. Signed-off-by: Jeremy Kerr <[email protected]>
CodeConstruct · Jun 4, 2024 · 72bc8e9 · 72bc8e9
1 parent 886e86a
commit 72bc8e9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/docs/endpoint-recovery.md b/docs/endpoint-recovery.md
@@ -361,7 +361,7 @@ The general strategy for tracking endpoint lifecycles is [as follows]
    registered as an MCTP endpoint.
 
 2. The FRU data is decoded and `SetupEndpoint` on the
-   `au.com.codeconstruct.MCTP.BusOwner1` interface of the
+   `au.com.codeconstruct.MCTP.BusOwner1.DRAFT` interface of the
    `/au/com/codeconstruct/mctp1`
    object hosted by `mctpd` is invoked.
 
@@ -402,7 +402,7 @@ The general strategy for tracking endpoint lifecycles is [as follows]
    poll the drive CTEMP.
 
 9. `mctpd` [emits a `PropertiesChanged` signal][dbus-spec-standard-interfaces-properties]
-   from `/au/com/codeconstruct/mctp/networks/1/enpoints/9` with the following
+   from `/au/com/codeconstruct/mctp/networks/1/endpoints/9` with the following
    contents:
 
    ```

diff --git a/docs/mctpd.md b/docs/mctpd.md
@@ -13,7 +13,7 @@ As well as those standard interfaces, `mctpd` provides methods to add and
 configure MCTP endpoints. These are provided by the `au.com.codeconstruct.MCTP1`
 D-Bus interface.
 
-## Bus-owner methods: `au.com.codeconstruct.MCTP.BusOwner1` interface
+## Bus-owner methods: `au.com.codeconstruct.MCTP.BusOwner1.DRAFT` interface
 
 This interface exposes bus-owner level functions.
 

diff --git a/src/mctpd.c b/src/mctpd.c
@@ -41,7 +41,7 @@
 #define min(a, b) ((a) < (b) ? (a) : (b))
 
 #define MCTP_DBUS_PATH "/au/com/codeconstruct/mctp1"
-#define CC_MCTP_DBUS_IFACE_BUSOWNER "au.com.codeconstruct.MCTP.BusOwner1"
+#define CC_MCTP_DBUS_IFACE_BUSOWNER "au.com.codeconstruct.MCTP.BusOwner1.DRAFT"
 #define CC_MCTP_DBUS_IFACE_ENDPOINT "au.com.codeconstruct.MCTP.Endpoint1"
 #define CC_MCTP_DBUS_IFACE_TESTING "au.com.codeconstruct.MCTPTesting"
 #define MCTP_DBUS_NAME "au.com.codeconstruct.MCTP1"

diff --git a/tests/mctp_test_utils.py b/tests/mctp_test_utils.py
@@ -4,7 +4,7 @@ async def mctpd_mctp_obj(dbus):
             'au.com.codeconstruct.MCTP1',
             '/au/com/codeconstruct/mctp1'
         )
-    return await obj.get_interface('au.com.codeconstruct.MCTP.BusOwner1')
+    return await obj.get_interface('au.com.codeconstruct.MCTP.BusOwner1.DRAFT')
 
 async def mctpd_mctp_endpoint_obj(dbus, path):
     obj = await dbus.get_proxy_object(

diff --git a/tests/test_mctpd.py b/tests/test_mctpd.py
@@ -13,7 +13,7 @@
 # - I: Interface
 MCTPD_C = 'au.com.codeconstruct.MCTP1'
 MCTPD_MCTP_P = '/au/com/codeconstruct/mctp1'
-MCTPD_MCTP_I = 'au.com.codeconstruct.MCTP.BusOwner1'
+MCTPD_MCTP_I = 'au.com.codeconstruct.MCTP.BusOwner1.DRAFT'
 MCTPD_ENDPOINT_I = 'au.com.codeconstruct.MCTP.Endpoint1'
 DBUS_OBJECT_MANAGER_I = 'org.freedesktop.DBus.ObjectManager'
 DBUS_PROPERTIES_I = 'org.freedesktop.DBus.Properties'