Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Unified Diff: telemetry/telemetry/core/local_server.py

Issue 2267613002: Revert "[telemetry] Wire TsProxy through telemetry's network stack." (Closed) Base URL: https://github.com/catapult-project/catapult.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | telemetry/telemetry/core/network_controller.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: telemetry/telemetry/core/local_server.py
diff --git a/telemetry/telemetry/core/local_server.py b/telemetry/telemetry/core/local_server.py
index c8557d969afa1245ddaaefb3168be61fde3065ab..5c20c455f425a3fec67bd9aeacb2dbc9d992e8c4 100644
--- a/telemetry/telemetry/core/local_server.py
+++ b/telemetry/telemetry/core/local_server.py
@@ -82,15 +82,13 @@ class LocalServer(object):
stdout=subprocess.PIPE)
named_ports = self._GetNamedPortsFromBackend()
- http_port = None
- for p in named_ports:
- if p.name == 'http':
- http_port = p.port
- assert http_port and len(named_ports) == 1, (
- 'Only http port is supported: %s' % named_ports)
+ named_port_pair_map = {'http': None, 'https': None, 'dns': None}
+ for name, port in named_ports:
+ assert name in named_port_pair_map, '%s forwarding is unsupported' % name
+ named_port_pair_map[name] = (forwarders.PortPair(
+ port, local_server_controller.GetRemotePort(port)))
self.forwarder = local_server_controller.CreateForwarder(
- forwarders.PortPair(http_port,
- local_server_controller.GetRemotePort(http_port)))
+ forwarders.PortPairs(**named_port_pair_map))
def _GetNamedPortsFromBackend(self):
named_ports_json = None
@@ -180,8 +178,8 @@ class LocalServerController(object):
import traceback
traceback.print_exc()
- def CreateForwarder(self, port_pair):
- return self._platform_backend.forwarder_factory.Create(port_pair)
+ def CreateForwarder(self, port_pairs):
+ return self._platform_backend.forwarder_factory.Create(port_pairs)
def GetRemotePort(self, port):
return self._platform_backend.GetRemotePort(port)
« no previous file with comments | « no previous file | telemetry/telemetry/core/network_controller.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698