matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CLI: minor changes to python binding code

Browse Source
This commit is contained in:
Srivats P. 2014-06-16 19:53:03 +05:30
parent a6bfb0d393
commit 0d3b36b943
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binding/__init__.py
View File

@ -25,4 +25,4 @@ with open(dirname(__file__) + '/pkg_info.json') as f:
__version__ = _info['version'] __version__ = _info['version']
__revision__ = _info['revision'] __revision__ = _info['revision']
__log__ = logging.getLogger('ostinato') __log__ = logging.getLogger(__name__)

11
binding/example.py
View File

@ -91,9 +91,10 @@ try:
stream_cfg.port_id.CopyFrom(tx_port.port_id[0]) stream_cfg.port_id.CopyFrom(tx_port.port_id[0])
s = stream_cfg.stream.add() s = stream_cfg.stream.add()
s.stream_id.id = stream_id.stream_id[0].id s.stream_id.id = stream_id.stream_id[0].id
s.core.is_enabled = 1 s.core.is_enabled = True
s.control.num_packets = 5 s.control.num_packets = 5
# setup stream protocols as mac:eth2:ip4:udp:payload
p = s.protocol.add() p = s.protocol.add()
p.protocol_id.id = ost_pb.Protocol.kMacFieldNumber p.protocol_id.id = ost_pb.Protocol.kMacFieldNumber
p.Extensions[mac].dst_mac = 0x001122334455 p.Extensions[mac].dst_mac = 0x001122334455
@ -104,9 +105,11 @@ try:
p = s.protocol.add() p = s.protocol.add()
p.protocol_id.id = ost_pb.Protocol.kIp4FieldNumber p.protocol_id.id = ost_pb.Protocol.kIp4FieldNumber
p.Extensions[ip4].src_ip = 0x01020304 # reduce typing by creating a shorter reference to p.Extensions[ip4]
p.Extensions[ip4].dst_ip = 0x05060708 ip = p.Extensions[ip4]
p.Extensions[ip4].dst_ip_mode = Ip4.e_im_inc_host ip.src_ip = 0x01020304
ip.dst_ip = 0x05060708
ip.dst_ip_mode = Ip4.e_im_inc_host
s.protocol.add().protocol_id.id = ost_pb.Protocol.kUdpFieldNumber s.protocol.add().protocol_id.id = ost_pb.Protocol.kUdpFieldNumber
s.protocol.add().protocol_id.id = ost_pb.Protocol.kPayloadFieldNumber s.protocol.add().protocol_id.id = ost_pb.Protocol.kPayloadFieldNumber

4
binding/rpc.py
View File

@ -50,7 +50,7 @@ class OstinatoRpcController(RpcController):
class OstinatoRpcChannel(RpcChannel): class OstinatoRpcChannel(RpcChannel):
def __init__(self): def __init__(self):
self.log = logging.getLogger('ostinato.rpc') self.log = logging.getLogger(__name__)
self.log.debug('opening socket') self.log.debug('opening socket')
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@ -77,7 +77,7 @@ class OstinatoRpcChannel(RpcChannel):
error = '' error = ''
try: try:
self.log.debug('invoking RPC %s(%s): %s', method.name, self.log.info('invoking RPC %s(%s): %s', method.name,
type(request).__name__, response_class.__name__) type(request).__name__, response_class.__name__)
self.log.debug('serializing request arg %s', request) self.log.debug('serializing request arg %s', request)
req = request.SerializeToString() req = request.SerializeToString()