Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions utils/p4runtime_lib/bmv2.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down
6 changes: 3 additions & 3 deletions utils/p4runtime_lib/switch.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand All @@ -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:
Expand Down
Loading