Upgrade KUKSA.val components to 0.4.0 releases

[AGL/meta-agl-demo.git] / recipes-connectivity / kuksa-val / kuksa-client / 0001-kuksa-client-Update-cmd2-completer-usage.patch

diff --git a/recipes-connectivity/kuksa-val/kuksa-client/0001-kuksa-client-Update-cmd2-completer-usage.patch b/recipes-connectivity/kuksa-val/kuksa-client/0001-kuksa-client-Update-cmd2-completer-usage.patch
index 55e9cc2..d43a343 100644 (file)
--- a/recipes-connectivity/kuksa-val/kuksa-client/0001-kuksa-client-Update-cmd2-completer-usage.patch
+++ b/recipes-connectivity/kuksa-val/kuksa-client/0001-kuksa-client-Update-cmd2-completer-usage.patch
@@ -1,7 +1,7 @@
-From ea0b48b9a900e9ce6d898fc5d17ae3238aadb289 Mon Sep 17 00:00:00 2001
+From cc4da8b14896739ac2966ecad0a5c82ab1de025c Mon Sep 17 00:00:00 2001
 From: Scott Murray <scott.murray@konsulko.com>
-Date: Tue, 2 May 2023 16:20:40 -0400
-Subject: [PATCH 2/2] kuksa_viss_client: Update cmd2 completer usage
+Date: Sat, 5 Aug 2023 13:26:55 -0400
+Subject: [PATCH 1/2] kuksa_viss_client: Update cmd2 completer usage
 
 Update cmd2 usage to avoid using internal methods and fix breakage
 with newer versions of the cmd2 module.
@@ -14,10 +14,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
  1 file changed, 15 insertions(+), 16 deletions(-)
 
 diff --git a/kuksa-client/kuksa_client/__main__.py b/kuksa-client/kuksa_client/__main__.py
-index c34f335..d386708 100755
+index 948cf56..fceca41 100755
 --- a/kuksa-client/kuksa_client/__main__.py
 +++ b/kuksa-client/kuksa_client/__main__.py
-@@ -34,7 +34,6 @@ from cmd2 import Cmd
+@@ -35,7 +35,6 @@ from cmd2 import Cmd
  from cmd2 import CompletionItem
  from cmd2 import with_argparser
  from cmd2 import with_category
@@ -25,7 +25,7 @@ index c34f335..d386708 100755
  
  import kuksa_certificates
  from kuksa_client import KuksaClientThread
-@@ -122,7 +121,7 @@ class TestClient(Cmd):
+@@ -126,7 +125,7 @@ class TestClient(Cmd):
                                         "Children of branch "+prefix+key),
                      )
  
@@ -34,7 +34,7 @@ index c34f335..d386708 100755
  
      def subscribeCallback(self, logPath, resp):
          with logPath.open('a', encoding='utf-8') as logFile:
-@@ -132,7 +131,7 @@ class TestClient(Cmd):
+@@ -136,7 +135,7 @@ class TestClient(Cmd):
          self.pathCompletionItems = []
          for sub_id in self.subscribeIds:
              self.pathCompletionItems.append(CompletionItem(sub_id))
@@ -43,7 +43,7 @@ index c34f335..d386708 100755
  
      COMM_SETUP_COMMANDS = "Communication Set-up Commands"
      VSS_COMMANDS = "Kuksa Interaction Commands"
-@@ -149,7 +148,7 @@ class TestClient(Cmd):
+@@ -153,7 +152,7 @@ class TestClient(Cmd):
      ap_authorize.add_argument(
          'token_or_tokenfile',
          help='JWT(or the file storing the token) for authorizing the client.',
@@ -52,16 +52,16 @@ index c34f335..d386708 100755
      ap_setServerAddr = argparse.ArgumentParser()
      ap_setServerAddr.add_argument(
          'IP', help='VISS/gRPC Server IP Address', default=DEFAULT_SERVER_ADDR)
-@@ -164,7 +163,7 @@ class TestClient(Cmd):
+@@ -168,7 +167,7 @@ class TestClient(Cmd):
  
      ap_setValue = argparse.ArgumentParser()
      ap_setValue.add_argument(
 -        "Path", help="Path to be set", completer_method=path_completer)
 +        "Path", help="Path to be set", completer=path_completer)
-     ap_setValue.add_argument("Value", help="Value to be set")
+     ap_setValue.add_argument("Value", nargs='+', help="Value to be set")
      ap_setValue.add_argument(
          "-a", "--attribute", help="Attribute to be set", default="value")
-@@ -181,19 +180,19 @@ class TestClient(Cmd):
+@@ -185,19 +184,19 @@ class TestClient(Cmd):
  
      ap_getValue = argparse.ArgumentParser()
      ap_getValue.add_argument(
@@ -84,7 +84,7 @@ index c34f335..d386708 100755
      ap_setTargetValue.add_argument("Value", help="Value to be set")
  
      ap_setTargetValues = argparse.ArgumentParser()
-@@ -206,35 +205,35 @@ class TestClient(Cmd):
+@@ -210,35 +209,35 @@ class TestClient(Cmd):
  
      ap_getTargetValue = argparse.ArgumentParser()
      ap_getTargetValue.add_argument(
@@ -127,15 +127,15 @@ index c34f335..d386708 100755
      ap_updateMetaData.add_argument(
          "Json",
          help="MetaData to update. Note, only attributes can be update, if update children or the whole vss tree, use"
-@@ -245,7 +244,7 @@ class TestClient(Cmd):
+@@ -249,7 +248,7 @@ class TestClient(Cmd):
      jsonfile_completer_method = functools.partial(Cmd.path_complete,
                                                    path_filter=lambda path: (os.path.isdir(path) or path.endswith(".json")))
      ap_updateVSSTree.add_argument(
 -        "Json", help="Json tree to update VSS", completer_method=jsonfile_completer_method)
 +        "Json", help="Json tree to update VSS", completer=jsonfile_completer_method)
  
-     # Constructor
-     def __init__(self, server_ip=None, server_port=None, server_protocol=None, insecure=False, token_or_tokenfile=None):
+     # Constructor, request names after protocol to avoid errors
+     def __init__(self, server_ip=None, server_port=None, server_protocol=None, *, insecure=False, token_or_tokenfile=None,
 -- 
-2.39.2
+2.41.0