python: Use pythonic casing for variable names (#15479)

Partial fix for #15403

Signed-off-by: Ryan Northey <ryan@synca.io>

Mirrored from https://github.com/envoyproxy/envoy @ ca1455ccf81ca4cd742903361d7c2a94f37f5be0
pull/624/head
data-plane-api(Azure Pipelines) 4 years ago
parent b16099423f
commit 65179843af
  1. 10
      tools/generate_listeners.py
  2. 2
      tools/generate_listeners_test.py
  3. 10
      tools/tap2pcap.py
  4. 2
      tools/tap2pcap_test.py

@ -21,7 +21,7 @@ from envoy.config.filter.network.http_connection_manager.v2 import http_connecti
# Convert an arbitrary proto object to its Struct proto representation.
def ProtoToStruct(proto):
def proto_to_struct(proto):
json_rep = json_format.MessageToJson(proto)
parsed_msg = struct_pb2.Struct()
json_format.Parse(json_rep, parsed_msg)
@ -29,7 +29,7 @@ def ProtoToStruct(proto):
# Parse a proto from the filesystem.
def ParseProto(path, filter_name):
def parse_proto(path, filter_name):
# We only know about some filter config protos ahead of time.
KNOWN_FILTERS = {
'http_connection_manager': lambda: http_connection_manager_pb2.HttpConnectionManager()
@ -40,14 +40,14 @@ def ParseProto(path, filter_name):
return filter_config
def GenerateListeners(listeners_pb_path, output_pb_path, output_json_path, fragments):
def generate_listeners(listeners_pb_path, output_pb_path, output_json_path, fragments):
listener = lds_pb2.Listener()
with open(listeners_pb_path, 'r') as f:
text_format.Merge(f.read(), listener)
for filter_chain in listener.filter_chains:
for f in filter_chain.filters:
f.config.CopyFrom(ProtoToStruct(ParseProto(next(fragments), f.name)))
f.config.CopyFrom(proto_to_struct(parse_proto(next(fragments), f.name)))
with open(output_pb_path, 'w') as f:
f.write(str(listener))
@ -62,4 +62,4 @@ if __name__ == '__main__':
'listeners.json> <filter config fragment paths>') % sys.argv[0]
sys.exit(1)
GenerateListeners(sys.argv[1], sys.argv[2], sys.argv[3], iter(sys.argv[4:]))
generate_listeners(sys.argv[1], sys.argv[2], sys.argv[3], iter(sys.argv[4:]))

@ -6,6 +6,6 @@ import generate_listeners
if __name__ == "__main__":
srcdir = os.path.join(os.getenv("TEST_SRCDIR"), 'envoy_api_canonical')
generate_listeners.GenerateListeners(
generate_listeners.generate_listeners(
os.path.join(srcdir, "examples/service_envoy/listeners.pb"), "/dev/stdout", "/dev/stdout",
iter([os.path.join(srcdir, "examples/service_envoy/http_connection_manager.pb")]))

@ -31,7 +31,7 @@ from google.protobuf import text_format
from envoy.data.tap.v2alpha import wrapper_pb2
def DumpEvent(direction, timestamp, data):
def dump_event(direction, timestamp, data):
dump = io.StringIO()
dump.write('%s\n' % direction)
# Adjust to local timezone
@ -43,7 +43,7 @@ def DumpEvent(direction, timestamp, data):
return dump.getvalue()
def Tap2Pcap(tap_path, pcap_path):
def tap2pcap(tap_path, pcap_path):
wrapper = wrapper_pb2.TraceWrapper()
if tap_path.endswith('.pb_text'):
with open(tap_path, 'r') as f:
@ -61,9 +61,9 @@ def Tap2Pcap(tap_path, pcap_path):
dumps = []
for event in trace.events:
if event.HasField('read'):
dumps.append(DumpEvent('I', event.timestamp, event.read.data.as_bytes))
dumps.append(dump_event('I', event.timestamp, event.read.data.as_bytes))
elif event.HasField('write'):
dumps.append(DumpEvent('O', event.timestamp, event.write.data.as_bytes))
dumps.append(dump_event('O', event.timestamp, event.write.data.as_bytes))
ipv6 = False
try:
@ -85,4 +85,4 @@ if __name__ == '__main__':
if len(sys.argv) != 3:
print('Usage: %s <tap .pb/.pb_text> <pcap path>' % sys.argv[0])
sys.exit(1)
Tap2Pcap(sys.argv[1], sys.argv[2])
tap2pcap(sys.argv[1], sys.argv[2])

@ -16,7 +16,7 @@ if __name__ == '__main__':
expected_path = os.path.join(srcdir, 'tools/data/tap2pcap_h2_ipv4.txt')
pcap_path = os.path.join(os.getenv('TEST_TMPDIR'), 'generated.pcap')
tap2pcap.Tap2Pcap(tap_path, pcap_path)
tap2pcap.tap2pcap(tap_path, pcap_path)
actual_output = sp.check_output(['tshark', '-r', pcap_path, '-d', 'tcp.port==10000,http2', '-P'])
with open(expected_path, 'rb') as f:
expected_output = f.read()

Loading…
Cancel
Save