-From 89aa41f52d5946796ad8dea587cd848aef71c8c0 Mon Sep 17 00:00:00 2001
+From acb2bbff3de6e9f0bafb8b96a339820a9ddfadca Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Mon, 27 Nov 2023 15:31:02 -0500
Subject: [PATCH 1/2] kuksa-client: Update cmd2 completer usage
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/kuksa-client/kuksa_client/__main__.py b/kuksa-client/kuksa_client/__main__.py
-index 032410b..1d2d1fc 100755
+index 2b29623..7061ec1 100755
--- a/kuksa-client/kuksa_client/__main__.py
+++ b/kuksa-client/kuksa_client/__main__.py
@@ -36,7 +36,6 @@ from cmd2 import CompletionItem
-from cmd2.utils import basic_complete
from urllib.parse import urlparse
- from kuksa_client import kuksa_server_certificates
-@@ -156,7 +155,7 @@ class TestClient(Cmd):
+ from kuksa_client import KuksaClientThread
+@@ -151,7 +150,7 @@ class TestClient(Cmd):
self.pathCompletionItems = []
for sub_id in self.subscribeIds:
self.pathCompletionItems.append(CompletionItem(sub_id))
+ return Cmd.basic_complete(self, text, line, begidx, endidx, self.pathCompletionItems)
COMM_SETUP_COMMANDS = "Communication Set-up Commands"
- VSS_COMMANDS = "Kuksa Interaction Commands"
-@@ -171,19 +170,19 @@ class TestClient(Cmd):
+ VSS_COMMANDS = "Kuksa Interaction Commands (Supported by both KUKSA Databroker and KUKSA Server)"
+@@ -167,19 +166,19 @@ class TestClient(Cmd):
ap_disconnect = argparse.ArgumentParser()
ap_authorize = argparse.ArgumentParser()
)
ap_setValue.add_argument("Value", nargs="+", help="Value to be set")
ap_setValue.add_argument(
-@@ -203,7 +202,7 @@ class TestClient(Cmd):
+@@ -199,7 +198,7 @@ class TestClient(Cmd):
ap_getValue = argparse.ArgumentParser()
ap_getValue.add_argument(
)
ap_getValue.add_argument(
"-a", "--attribute", help="Attribute to be get", default="value"
-@@ -214,7 +213,7 @@ class TestClient(Cmd):
+@@ -210,7 +209,7 @@ class TestClient(Cmd):
"Path",
help="Path whose value is to be read",
nargs="+",
)
ap_getValues.add_argument(
"-a", "--attribute", help="Attribute to be get", default="value"
-@@ -224,7 +223,7 @@ class TestClient(Cmd):
+@@ -220,7 +219,7 @@ class TestClient(Cmd):
ap_setTargetValue.add_argument(
"Path",
help="Path whose target value to be set",
)
ap_setTargetValue.add_argument("Value", help="Value to be set")
-@@ -240,7 +239,7 @@ class TestClient(Cmd):
+@@ -236,7 +235,7 @@ class TestClient(Cmd):
ap_getTargetValue.add_argument(
"Path",
help="Path whose target value is to be read",
)
ap_getTargetValues = argparse.ArgumentParser()
-@@ -248,12 +247,12 @@ class TestClient(Cmd):
+@@ -244,12 +243,12 @@ class TestClient(Cmd):
"Path",
help="Path whose target value is to be read",
nargs="+",
)
ap_subscribe.add_argument(
"-a", "--attribute", help="Attribute to subscribe to", default="value"
-@@ -268,7 +267,7 @@ class TestClient(Cmd):
+@@ -264,7 +263,7 @@ class TestClient(Cmd):
ap_subscribeMultiple = argparse.ArgumentParser()
ap_subscribeMultiple.add_argument(
)
ap_subscribeMultiple.add_argument(
"-a", "--attribute", help="Attribute to subscribe to", default="value"
-@@ -284,18 +283,18 @@ class TestClient(Cmd):
+@@ -280,18 +279,18 @@ class TestClient(Cmd):
ap_unsubscribe.add_argument(
"SubscribeId",
help="Corresponding subscription Id",
)
ap_updateMetaData.add_argument(
"Json",
-@@ -304,14 +303,14 @@ class TestClient(Cmd):
+@@ -300,14 +299,14 @@ class TestClient(Cmd):
)
ap_updateVSSTree = argparse.ArgumentParser()
# Constructor, request names after protocol to avoid errors
--
-2.42.0
+2.44.0