From 70c87dfe60c7faa94ecbd8cc461d1775f64b34e9 Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Tue, 25 Aug 2026 00:18:08 +0000 Subject: [PATCH] Remove use of obsolete Python package p4.tmp Signed-off-by: Andy Fingerhut --- utils/p4runtime_lib/bmv2.py | 5 +---- utils/p4runtime_lib/switch.py | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/utils/p4runtime_lib/bmv2.py b/utils/p4runtime_lib/bmv2.py index ae6767ef..4ddf1f5f 100644 --- a/utils/p4runtime_lib/bmv2.py +++ b/utils/p4runtime_lib/bmv2.py @@ -1,17 +1,14 @@ # SPDX-FileCopyrightText: 2017 Open Networking Foundation # # SPDX-License-Identifier: Apache-2.0 -from p4.tmp import p4config_pb2 from .switch import SwitchConnection def buildDeviceConfig(bmv2_json_file_path=None): "Builds the device config for BMv2" - device_config = p4config_pb2.P4DeviceConfig() - device_config.reassign = True with open(bmv2_json_file_path) as f: - device_config.device_data = f.read().encode('utf-8') + device_config = f.read().encode('utf-8') return device_config diff --git a/utils/p4runtime_lib/switch.py b/utils/p4runtime_lib/switch.py index df0675d6..50f021f8 100644 --- a/utils/p4runtime_lib/switch.py +++ b/utils/p4runtime_lib/switch.py @@ -7,7 +7,6 @@ import threading import grpc -from p4.tmp import p4config_pb2 from p4.v1 import p4runtime_pb2, p4runtime_pb2_grpc MSG_LOG_MAX_LEN = 1024 @@ -71,7 +70,8 @@ def __init__(self, name=None, address='127.0.0.1:50051', device_id=0, @abstractmethod def buildDeviceConfig(self, **kwargs): - return p4config_pb2.P4DeviceConfig() + print("switch.py:SwitchConnection:buildDeviceConfig() should be overridden, but never called (?)", flush=True) + assert False def shutdown(self): self.requests_stream.close() @@ -97,7 +97,7 @@ def SetForwardingPipelineConfig(self, p4info, dry_run=False, **kwargs): config = request.config config.p4info.CopyFrom(p4info) - config.p4_device_config = device_config.SerializeToString() + config.p4_device_config = device_config request.action = p4runtime_pb2.SetForwardingPipelineConfigRequest.VERIFY_AND_COMMIT if dry_run: