From b7ebd90b9c38c17d8db147d0ecbbe915cd77ed14 Mon Sep 17 00:00:00 2001 From: gifrerenom <lluis.gifre@cttc.es> Date: Wed, 14 Jun 2023 14:46:39 +0000 Subject: [PATCH] Device component - OpenConfig & gNMI Driver: - Moved gNMI code to new driver --- .../protocols/gnmi/Acknowledgement.txt | 25 +++++++++++++++++++ .../protocols/gnmi/__init__.py | 13 ++++++++++ .../protocols/gnmi}/gnmi.proto | 0 .../protocols/gnmi}/gnmi_ext.proto | 0 .../protocols/gnmi}/gnmi_pb2.py | 0 .../protocols/gnmi}/gnmi_pb2.py.old | 0 .../protocols/gnmi}/gnmi_pb2.pyi | 0 .../protocols/gnmi}/gnmi_pb2_grpc.py | 2 +- 8 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 src/device/service/drivers/gnmi_openconfig/protocols/gnmi/Acknowledgement.txt create mode 100644 src/device/service/drivers/gnmi_openconfig/protocols/gnmi/__init__.py rename src/device/service/drivers/{openconfig => gnmi_openconfig/protocols/gnmi}/gnmi.proto (100%) rename src/device/service/drivers/{openconfig => gnmi_openconfig/protocols/gnmi}/gnmi_ext.proto (100%) rename src/device/service/drivers/{openconfig => gnmi_openconfig/protocols/gnmi}/gnmi_pb2.py (100%) rename src/device/service/drivers/{openconfig => gnmi_openconfig/protocols/gnmi}/gnmi_pb2.py.old (100%) rename src/device/service/drivers/{openconfig => gnmi_openconfig/protocols/gnmi}/gnmi_pb2.pyi (100%) rename src/device/service/drivers/{openconfig => gnmi_openconfig/protocols/gnmi}/gnmi_pb2_grpc.py (99%) diff --git a/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/Acknowledgement.txt b/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/Acknowledgement.txt new file mode 100644 index 000000000..a004e1f58 --- /dev/null +++ b/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/Acknowledgement.txt @@ -0,0 +1,25 @@ +This code is partially based on: +https://github.com/nokia/pygnmi/blob/master/gNMI_Subscribe.py + + +MIT License + +Copyright (c) 2017 Nokia + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/__init__.py b/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/__init__.py new file mode 100644 index 000000000..38d04994f --- /dev/null +++ b/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/__init__.py @@ -0,0 +1,13 @@ +# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/src/device/service/drivers/openconfig/gnmi.proto b/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi.proto similarity index 100% rename from src/device/service/drivers/openconfig/gnmi.proto rename to src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi.proto diff --git a/src/device/service/drivers/openconfig/gnmi_ext.proto b/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi_ext.proto similarity index 100% rename from src/device/service/drivers/openconfig/gnmi_ext.proto rename to src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi_ext.proto diff --git a/src/device/service/drivers/openconfig/gnmi_pb2.py b/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi_pb2.py similarity index 100% rename from src/device/service/drivers/openconfig/gnmi_pb2.py rename to src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi_pb2.py diff --git a/src/device/service/drivers/openconfig/gnmi_pb2.py.old b/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi_pb2.py.old similarity index 100% rename from src/device/service/drivers/openconfig/gnmi_pb2.py.old rename to src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi_pb2.py.old diff --git a/src/device/service/drivers/openconfig/gnmi_pb2.pyi b/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi_pb2.pyi similarity index 100% rename from src/device/service/drivers/openconfig/gnmi_pb2.pyi rename to src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi_pb2.pyi diff --git a/src/device/service/drivers/openconfig/gnmi_pb2_grpc.py b/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi_pb2_grpc.py similarity index 99% rename from src/device/service/drivers/openconfig/gnmi_pb2_grpc.py rename to src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi_pb2_grpc.py index 43fb01413..517d3d9eb 100644 --- a/src/device/service/drivers/openconfig/gnmi_pb2_grpc.py +++ b/src/device/service/drivers/gnmi_openconfig/protocols/gnmi/gnmi_pb2_grpc.py @@ -2,7 +2,7 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -import gnmi_pb2 as gnmi__pb2 +from . import gnmi_pb2 as gnmi__pb2 class gNMIStub(object): -- GitLab