Include the port number in the listener name, so that Envoy will allo…

…w switching port numbers.

Fixes #1100.

ambassador/ambassador/envoy/v2/v2listener.py

@@ -235,8 +235,8 @@ def __init__(self, config: 'V2Config', listener: IRListener) -> None:
         if listener.redirect_listener:
             self.http_filters = [{'name': 'envoy.router'}]
         else:
-            # Use the actual listener name
-            self.name = listener.name
+            # Use the actual listener name & port number
+            self.name = "ambassador-listener-%s" % listener.service_port
 
             # Use a sane access log spec
             self.access_log = [ {
@@ -247,14 +247,6 @@ def __init__(self, config: 'V2Config', listener: IRListener) -> None:
                 }
             } ]
 
-            # # If we have a server context here, use it.
-            # envoy_ctx = V2TLSContext()
-            # for name, ctx in config.ir.envoy_tls.items():
-            #     config.ir.logger.info("envoy_ctx adding %s" % ctx.as_json())
-            #     envoy_ctx.add_context(ctx)
-            #
-            # config.ir.logger.info("envoy_ctx final %s" % envoy_ctx)
-
             # Assemble filters
             for f in config.ir.filters:
                 v2f: dict = v2filter(f)