diff options
Diffstat (limited to 'recipes-connectivity/kuksa-val/kuksa-viss-client')
2 files changed, 0 insertions, 214 deletions
diff --git a/recipes-connectivity/kuksa-val/kuksa-viss-client/0001-kuksa_viss_client-Update-cmd2-completer-usage.patch b/recipes-connectivity/kuksa-val/kuksa-viss-client/0001-kuksa_viss_client-Update-cmd2-completer-usage.patch deleted file mode 100644 index acd41691..00000000 --- a/recipes-connectivity/kuksa-val/kuksa-viss-client/0001-kuksa_viss_client-Update-cmd2-completer-usage.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 1da7b980d05706c8d4e9bcb0d12965258a4fc709 Mon Sep 17 00:00:00 2001 -From: Scott Murray <scott.murray@konsulko.com> -Date: Thu, 6 Oct 2022 16:07:00 -0400 -Subject: [PATCH] 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. - -Upstream-Status: pending - -Signed-off-by: Scott Murray <scott.murray@konsulko.com> ---- - kuksa_viss_client/__main__.py | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/kuksa_viss_client/__main__.py b/kuksa_viss_client/__main__.py -index 5e595f8..e5798b8 100755 ---- a/kuksa_viss_client/__main__.py -+++ b/kuksa_viss_client/__main__.py -@@ -23,7 +23,7 @@ from typing import Dict, List - import queue, time, os, threading - from pygments import highlight, lexers, formatters - from cmd2 import Cmd, with_argparser, with_category, Cmd2ArgumentParser, CompletionItem --from cmd2.utils import CompletionError, basic_complete -+from cmd2.exceptions import CompletionError - import functools, subprocess - DEFAULT_SERVER_ADDR = "127.0.0.1" - DEFAULT_SERVER_PORT = 8090 -@@ -103,7 +103,7 @@ class TestClient(Cmd): - if 'children' in child: - self.pathCompletionItems.append(CompletionItem(prefix + key+seperator, "Children of branch "+prefix+key)) - -- return basic_complete(text, line, begidx, endidx, self.pathCompletionItems) -+ return Cmd.basic_complete(self, text, line, begidx, endidx, self.pathCompletionItems) - - def subscribeCallback(self, path, attr, resp): - self.subscribeFileDesc[(path,attr)].write(resp + "\n") -@@ -113,7 +113,7 @@ class TestClient(Cmd): - self.pathCompletionItems = [] - for id in self.subscribeIdToPath.keys(): - self.pathCompletionItems.append(CompletionItem(id)) -- return basic_complete(text, line, begidx, endidx, self.pathCompletionItems) -+ return Cmd.basic_complete(self, text, line, begidx, endidx, self.pathCompletionItems) - - COMM_SETUP_COMMANDS = "Communication Set-up Commands" - VISS_COMMANDS = "Kuksa Interaction Commands" -@@ -126,45 +126,45 @@ class TestClient(Cmd): - ap_authorize = argparse.ArgumentParser() - tokenfile_completer_method = functools.partial(Cmd.path_complete, - path_filter=lambda path: (os.path.isdir(path) or path.endswith(".token"))) -- ap_authorize.add_argument('Token', help='JWT(or the file storing the token) for authorizing the client.', completer_method=tokenfile_completer_method) -+ ap_authorize.add_argument('Token', help='JWT(or the file storing the token) for authorizing the client.', completer=tokenfile_completer_method) - ap_setServerAddr = argparse.ArgumentParser() - ap_setServerAddr.add_argument('IP', help='VISS Server IP Address', default=DEFAULT_SERVER_ADDR) - ap_setServerAddr.add_argument('Port', type=int, help='VISS Server Port', default=DEFAULT_SERVER_PORT) - ap_setServerAddr.add_argument('-p', "--protocol", help='VISS Server Communication Protocol (ws or grpc)', default=DEFAULT_SERVER_PROTOCOL) - - ap_setValue = argparse.ArgumentParser() -- ap_setValue.add_argument("Path", help="Path to be set", completer_method=path_completer) -+ ap_setValue.add_argument("Path", help="Path to be set", completer=path_completer) - ap_setValue.add_argument("Value", help="Value to be set") - ap_setValue.add_argument("-a", "--attribute", help="Attribute to be set", default="value") - - ap_getValue = argparse.ArgumentParser() -- ap_getValue.add_argument("Path", help="Path to be read", completer_method=path_completer) -+ ap_getValue.add_argument("Path", help="Path to be read", completer=path_completer) - ap_getValue.add_argument("-a", "--attribute", help="Attribute to be get", default="value") - - ap_setTargetValue = argparse.ArgumentParser() -- ap_setTargetValue.add_argument("Path", help="Path whose target value to be set", completer_method=path_completer) -+ ap_setTargetValue.add_argument("Path", help="Path whose target value to be set", completer=path_completer) - ap_setTargetValue.add_argument("Value", help="Value to be set") - - ap_getTargetValue = argparse.ArgumentParser() -- ap_getTargetValue.add_argument("Path", help="Path whose target value to be read", completer_method=path_completer) -+ ap_getTargetValue.add_argument("Path", help="Path whose target value to be read", completer=path_completer) - - ap_subscribe = argparse.ArgumentParser() -- ap_subscribe.add_argument("Path", help="Path to be subscribed", completer_method=path_completer) -+ ap_subscribe.add_argument("Path", help="Path to be subscribed", completer=path_completer) - ap_subscribe.add_argument("-a", "--attribute", help="Attribute to be subscribed", default="value") - - ap_unsubscribe = argparse.ArgumentParser() -- ap_unsubscribe.add_argument("SubscribeId", help="Corresponding subscription Id", completer_method=subscriptionIdCompleter) -+ ap_unsubscribe.add_argument("SubscribeId", help="Corresponding subscription Id", completer=subscriptionIdCompleter) - - ap_getMetaData = argparse.ArgumentParser() -- ap_getMetaData.add_argument("Path", help="Path whose metadata is to be read", completer_method=path_completer) -+ ap_getMetaData.add_argument("Path", help="Path whose metadata is to be read", completer=path_completer) - ap_updateMetaData = argparse.ArgumentParser() -- ap_updateMetaData.add_argument("Path", help="Path whose MetaData is to update", completer_method=path_completer) -+ ap_updateMetaData.add_argument("Path", help="Path whose MetaData is to update", completer=path_completer) - ap_updateMetaData.add_argument("Json", help="MetaData to update. Note, only attributes can be update, if update children or the whole vss tree, use `updateVSSTree` instead.") - - ap_updateVSSTree = argparse.ArgumentParser() - 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) -+ ap_updateVSSTree.add_argument("Json", help="Json tree to update VSS", completer=jsonfile_completer_method) - - # Constructor - def __init__(self): --- -2.37.3 - diff --git a/recipes-connectivity/kuksa-val/kuksa-viss-client/0002-kuksa_viss_client-Add-external-certificates-support.patch b/recipes-connectivity/kuksa-val/kuksa-viss-client/0002-kuksa_viss_client-Add-external-certificates-support.patch deleted file mode 100644 index 7ad5ac18..00000000 --- a/recipes-connectivity/kuksa-val/kuksa-viss-client/0002-kuksa_viss_client-Add-external-certificates-support.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 101550383386f465e689aa846826b58aa72cf793 Mon Sep 17 00:00:00 2001 -From: Scott Murray <scott.murray@konsulko.com> -Date: Mon, 24 Apr 2023 15:49:32 -0400 -Subject: [PATCH] kuksa_viss_client: Add external certificates support - -Tweak the definition of __certificate_dir__ in the kuksa_certificates -package, and certificate location logic in the client library to allow -picking up alternative certificates from /etc/kuksa-certificates or -/etc/kuksa-val before falling back to the shipped defaults. The -intent is to allow packagers to more straighhtforwardly use their own -certificates with both the server and clients. - -Upstream-Status: pending - -Signed-off-by: Scott Murray <scott.murray@konsulko.com> ---- - kuksa_certificates/__init__.py | 7 ++++++- - kuksa_viss_client/KuksaGrpcComm.py | 10 +++++----- - kuksa_viss_client/KuksaWsComm.py | 10 +++++----- - 3 files changed, 16 insertions(+), 11 deletions(-) - -diff --git a/kuksa_certificates/__init__.py b/kuksa_certificates/__init__.py -index 5f05b75..ac60bc3 100644 ---- a/kuksa_certificates/__init__.py -+++ b/kuksa_certificates/__init__.py -@@ -2,4 +2,9 @@ import os - - from kuksa_viss_client._metadata import * - --__certificate_dir__= os.path.dirname(os.path.realpath(__file__)) -+if os.path.isdir("/etc/kuksa-certificates"): -+ __certificate_dir__= "/etc/kuksa-certificates" -+elif os.path.isdir("/etc/kuksa-val"): -+ __certificate_dir__= "/etc/kuksa-val" -+else: -+ __certificate_dir__= os.path.dirname(os.path.realpath(__file__)) -diff --git a/kuksa_viss_client/KuksaGrpcComm.py b/kuksa_viss_client/KuksaGrpcComm.py -index 1f55754..e425e7e 100644 ---- a/kuksa_viss_client/KuksaGrpcComm.py -+++ b/kuksa_viss_client/KuksaGrpcComm.py -@@ -28,22 +28,22 @@ import uuid, time, threading - - from . import kuksa_pb2 - from . import kuksa_pb2_grpc -+from kuksa_certificates import __certificate_dir__ - - class KuksaGrpcComm: - - # Constructor - def __init__(self, config): -- scriptDir= os.path.dirname(os.path.realpath(__file__)) - self.serverIP = config.get('ip', "127.0.0.1") - self.serverPort = config.get('port', 8090) - try: - self.insecure = config.getboolean('insecure', False) - except AttributeError: - self.insecure = config.get('insecure', False) -- self.cacertificate = config.get('cacertificate', os.path.join(scriptDir, "../kuksa_certificates/CA.pem")) -- self.certificate = config.get('certificate', os.path.join(scriptDir, "../kuksa_certificates/Client.pem")) -- self.keyfile = config.get('key', os.path.join(scriptDir, "../kuksa_certificates/Client.key")) -- self.tokenfile = config.get('token', os.path.join(scriptDir, "../kuksa_certificates/jwt/all-read-write.json.token")) -+ self.cacertificate = config.get('cacertificate', os.path.join(__certificate_dir__, "CA.pem")) -+ self.certificate = config.get('certificate', os.path.join(__certificate_dir__, "Client.pem")) -+ self.keyfile = config.get('key', os.path.join(__certificate_dir__, "Client.key")) -+ self.tokenfile = config.get('token', os.path.join(__certificate_dir__, "jwt/all-read-write.json.token")) - self.grpcConnected = False - - self.subscriptionCallbacks = {} -diff --git a/kuksa_viss_client/KuksaWsComm.py b/kuksa_viss_client/KuksaWsComm.py -index b0d4cc1..b85b573 100644 ---- a/kuksa_viss_client/KuksaWsComm.py -+++ b/kuksa_viss_client/KuksaWsComm.py -@@ -20,22 +20,22 @@ - - import json, queue, time, uuid, os, ssl - import asyncio, websockets -+from kuksa_certificates import __certificate_dir__ - - class KuksaWsComm: - - # Constructor - def __init__(self, config): - -- scriptDir= os.path.dirname(os.path.realpath(__file__)) - self.serverIP = config.get('ip', "127.0.0.1") - self.serverPort = config.get('port', 8090) - try: - self.insecure = config.getboolean('insecure', False) - except AttributeError: - self.insecure = config.get('insecure', False) -- self.cacertificate = config.get('cacertificate', os.path.join(scriptDir, "../kuksa_certificates/CA.pem")) -- self.certificate = config.get('certificate', os.path.join(scriptDir, "../kuksa_certificates/Client.pem")) -- self.keyfile = config.get('key', os.path.join(scriptDir, "../kuksa_certificates/Client.key")) -+ self.cacertificate = config.get('cacertificate', os.path.join(__certificate_dir__, "CA.pem")) -+ self.certificate = config.get('certificate', os.path.join(__certificate_dir__, "Client.pem")) -+ self.keyfile = config.get('key', os.path.join(__certificate_dir__, "Client.key")) - self.wsConnected = False - - self.subscriptionCallbacks = {} -@@ -254,4 +254,4 @@ class KuksaWsComm: - await self._msgHandler(ws) - except OSError as e: - print("Disconnected!! " + str(e)) -- pass -\ No newline at end of file -+ pass --- -2.39.2 - |