chore(gateway): listener filter

Author: jianxiaoguo

rootfs/api/models/gateway.py

@@ -64,7 +64,7 @@ def addresses(self):
     def listeners(self):
         auto_tls = self.app.tls_set.latest().certs_auto_enabled
         listeners = []
-        domains = list(self._get_tls_domain(auto_tls))
+        domains = list(self.app.domain_set.all())
         for item in self.ports:
             port, protocol = item["port"], item["protocol"]
             if item["protocol"] in HOSTNAME_PROTOCOLS:
@@ -146,12 +146,6 @@ def _check_port(self, port, protocol):
                     return False
         return True
 
-    def _get_tls_domain(self, auto_tls):
-        domains = self.app.domain_set.all()
-        if not auto_tls:
-            domains = domains.exclude(certificate=None)
-        return domains
-
     def _get_listener_name(self, port, protocol, index):
         if protocol in ("TCP", "TLS", "HTTP"):
             protocol = "TCP"

rootfs/api/tests/test_gateway.py

@@ -328,14 +328,24 @@ def test_change_tls(self):
         app_id = self.create_app_with_domain_and_deploy()
         response = self.client.get('/v2/apps/{}/gateways/'.format(app_id))
         expect = [{
-            'allowedRoutes': {
-                'namespaces': {
-                    'from': 'All'
+            "allowedRoutes": {
+                "namespaces": {
+                    "from": "All"
                 }
             },
-            'name': 'tcp-80-0',
-            'port': 80,
-            'protocol': 'HTTP'
+            "name": "tcp-80-1",
+            "port": 80,
+            "hostname": "test-domain.example.com",
+            "protocol": "HTTP"
+        }, {
+            "allowedRoutes": {
+                "namespaces": {
+                    "from": "All"
+                }
+            },
+            "name": "tcp-80-0",
+            "port": 80,
+            "protocol": "HTTP"
         }]
         self.assertEqual(response.data["count"], 1, response.data)
         self.assertEqual(response.data["results"][0]["listeners"], expect, response.data)
@@ -377,14 +387,24 @@ def test_change_tls(self):
         self.change_certs_auto(app_id, False)
         response = self.client.get('/v2/apps/{}/gateways/'.format(app_id))
         expect = [{
-            'allowedRoutes': {
-                'namespaces': {
-                    'from': 'All'
+            "allowedRoutes": {
+                "namespaces": {
+                    "from": "All"
+                }
+            },
+            "name": "tcp-80-1",
+            "port": 80,
+            "hostname": "test-domain.example.com",
+            "protocol": "HTTP"
+        }, {
+            "allowedRoutes": {
+                "namespaces": {
+                    "from": "All"
                 }
             },
-            'name': 'tcp-80-0',
-            'port': 80,
-            'protocol': 'HTTP'
+            "name": "tcp-80-0",
+            "port": 80,
+            "protocol": "HTTP"
         }]
         self.assertEqual(response.data["count"], 1, response.data)
         self.assertEqual(response.json()["results"][0]["listeners"], expect, response.data)