http: api: devices: generate device name if not provided

Author: rnovatorov

src/enapter/cli/http/api/device_create_lua_command.py

@@ -11,20 +11,22 @@ def register(parent: cli.Subparsers) -> None:
         parser = parent.add_parser(
             "create-lua", formatter_class=argparse.ArgumentDefaultsHelpFormatter
         )
-        parser.add_argument("-r", "--runtime-id", help="Runtime ID of the Lua device")
         parser.add_argument(
-            "-b", "--blueprint-id", help="Blueprint ID of the Lua device"
+            "-r", "--runtime-id", required=True, help="Runtime ID of the Lua device"
+        )
+        parser.add_argument(
+            "-b", "--blueprint-id", required=True, help="Blueprint ID of the Lua device"
         )
         parser.add_argument("-s", "--slug", help="Slug of the Lua device")
-        parser.add_argument("name", help="Name of the Lua device to create")
+        parser.add_argument("-n", "--name", help="Name of the Lua device to create")
 
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
             device = await client.devices.create_lua(
-                name=args.name,
                 runtime_id=args.runtime_id,
                 blueprint_id=args.blueprint_id,
+                name=args.name,
                 slug=args.slug,
             )
             print(json.dumps(device.to_dto()))

src/enapter/cli/http/api/device_create_standalone_command.py

@@ -11,15 +11,16 @@ def register(parent: cli.Subparsers) -> None:
         parser = parent.add_parser(
             "create-standalone", formatter_class=argparse.ArgumentDefaultsHelpFormatter
         )
-        parser.add_argument("name", help="Name of the standalone device to create")
         parser.add_argument(
-            "-s", "--site-id", help="Site ID to create device in", default=None
+            "-n", "--name", help="Name of the standalone device to create"
         )
+        parser.add_argument("--slug", help="Slug of the standalone device to create")
+        parser.add_argument("-s", "--site-id", help="Site ID to create device in")
 
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
             device = await client.devices.create_standalone(
-                args.name, site_id=args.site_id
+                name=args.name, site_id=args.site_id, slug=args.slug
             )
             print(json.dumps(device.to_dto()))

src/enapter/cli/http/api/device_create_vucm_command.py

@@ -13,7 +13,7 @@ def register(parent: cli.Subparsers) -> None:
         )
         parser.add_argument("-s", "--site-id", help="Site ID to create device in")
         parser.add_argument("--hardware-id", help="Hardware ID of the VUCM device")
-        parser.add_argument("name", help="Name of the VUCM device to create")
+        parser.add_argument("-n", "--name", help="Name of the VUCM device to create")
 
     @staticmethod
     async def run(args: argparse.Namespace) -> None:

src/enapter/http/api/devices/client.py

@@ -1,4 +1,5 @@
 import random
+import time
 from typing import AsyncGenerator
 
 import httpx
@@ -8,6 +9,7 @@
 
 from .communication_config import CommunicationConfig
 from .device import Device
+from .device_type import DeviceType
 from .mqtt_protocol import MQTTProtocol
 
 
@@ -17,8 +19,13 @@ def __init__(self, client: httpx.AsyncClient) -> None:
         self._client = client
 
     async def create_standalone(
-        self, name: str, site_id: str | None = None, slug: str | None = None
+        self,
+        name: str | None = None,
+        site_id: str | None = None,
+        slug: str | None = None,
     ) -> Device:
+        if name is None:
+            name = random_device_name(DeviceType.STANDALONE)
         url = "v3/provisioning/standalone"
         response = await self._client.post(
             url, json={"name": name, "site_id": site_id, "slug": slug}
@@ -27,8 +34,13 @@ async def create_standalone(
         return await self.get(device_id=response.json()["device_id"])
 
     async def create_vucm(
-        self, name: str, hardware_id: str | None = None, site_id: str | None = None
+        self,
+        name: str | None = None,
+        hardware_id: str | None = None,
+        site_id: str | None = None,
     ) -> Device:
+        if name is None:
+            name = random_device_name(DeviceType.VIRTUAL_UCM)
         if hardware_id is None:
             hardware_id = random_hardware_id()
         url = "v3/provisioning/vucm"
@@ -41,8 +53,14 @@ async def create_vucm(
         )
 
     async def create_lua(
-        self, name: str, runtime_id: str, blueprint_id: str, slug: str | None = None
+        self,
+        runtime_id: str,
+        blueprint_id: str,
+        name: str | None = None,
+        slug: str | None = None,
     ) -> Device:
+        if name is None:
+            name = random_device_name(DeviceType.LUA)
         url = "v3/provisioning/lua_device"
         response = await self._client.post(
             url,
@@ -136,5 +154,9 @@ async def generate_communication_config(
         return CommunicationConfig.from_dto(response.json()["config"])
 
 
+def random_device_name(device_type: DeviceType) -> str:
+    return f"{device_type.value} ({time.time()})"
+
+
 def random_hardware_id() -> str:
     return "V" + "".join(f"{b:02X}" for b in random.randbytes(16))