From ef681d06dc2cb51f058cb92f4decb49c1cc45763 Mon Sep 17 00:00:00 2001 From: wenincode Date: Wed, 12 Oct 2022 15:21:49 -0600 Subject: [PATCH] Add changelog --- .changelog/14970.txt | 3 +++ .../tests/acceptance/dc/list.feature | 5 ++++- .../acceptance/dc/nodes/empty-ids.feature | 10 +++++++++ .../acceptance/dc/nodes/navigation.feature | 22 ++++++++++++++++++- .../acceptance/dc/nodes/no-leader.feature | 22 ++++++++++++++++++- .../tests/acceptance/dc/nodes/sorting.feature | 12 ++++++++++ 6 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 .changelog/14970.txt diff --git a/.changelog/14970.txt b/.changelog/14970.txt new file mode 100644 index 000000000..cbe075406 --- /dev/null +++ b/.changelog/14970.txt @@ -0,0 +1,3 @@ +```release-note:feature +ui: Filter agentless (synthetic) nodes from the nodes list page. +``` diff --git a/ui/packages/consul-ui/tests/acceptance/dc/list.feature b/ui/packages/consul-ui/tests/acceptance/dc/list.feature index 7a67f4cdd..ed7fa7e97 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/list.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/list.feature @@ -1,4 +1,7 @@ @setupApplicationTest +# Nodes have been removed from this list because they randomly get +# assigned the synthetic-node property which filters them out of the list page. +# We are already testing the nodes being listed in the nodes index feature test. Feature: dc / list: List Models Scenario: Listing [Model] Given 1 datacenter model with the value "dc-1" @@ -13,7 +16,7 @@ Feature: dc / list: List Models Where: ------------------------------------------------- | Model | Page | Url | - | node | nodes | /dc-1/nodes | + # | node | nodes | /dc-1/nodes | | kv | kvs | /dc-1/kv | # | acl | acls | /dc-1/acls | | token | tokens | /dc-1/acls/tokens | diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/empty-ids.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/empty-ids.feature index b0f1429ae..58380713f 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/empty-ids.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/empty-ids.feature @@ -6,22 +6,32 @@ Feature: dc / nodes / empty-ids: Hedge for if nodes come in over the API with no --- - ID: id-1 Node: name-1 + Meta: + synthetic-node: false Checks: - Status: passing - ID: "" Node: name-2 + Meta: + synthetic-node: false Checks: - Status: passing - ID: "" Node: name-3 + Meta: + synthetic-node: false Checks: - Status: passing - ID: "" Node: name-4 + Meta: + synthetic-node: false Checks: - Status: passing - ID: "" Node: name-5 + Meta: + synthetic-node: false Checks: - Status: passing --- diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/navigation.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/navigation.feature index 116e26ff8..91c5114ae 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/navigation.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/navigation.feature @@ -2,7 +2,27 @@ Feature: dc / nodes / navigation Scenario: Clicking a node in the listing and back again Given 1 datacenter model with the value "dc-1" - And 3 node models + And 3 node models from yaml + --- + - Node: Node-A + Meta: + synthetic-node: "false" + Checks: + - Status: critical + ServiceID: "" + - Node: Node-B + Meta: + synthetic-node: "false" + Checks: + - Status: passing + ServiceID: "" + - Node: Node-C + Meta: + synthetic-node: "false" + Checks: + - Status: warning + ServiceID: "" + --- When I visit the nodes page for yaml --- dc: dc-1 diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/no-leader.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/no-leader.feature index 84f6036cf..8f642d394 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/no-leader.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/no-leader.feature @@ -2,7 +2,27 @@ Feature: dc / nodes / no-leader Scenario: Leader hasn't been elected Given 1 datacenter model with the value "dc-1" - And 3 node models + And 3 node models from yaml + --- + - Node: Node-A + Meta: + synthetic-node: "false" + Checks: + - Status: critical + ServiceID: "" + - Node: Node-B + Meta: + synthetic-node: "false" + Checks: + - Status: passing + ServiceID: "" + - Node: Node-C + Meta: + synthetic-node: "false" + Checks: + - Status: warning + ServiceID: "" + --- And the url "/v1/status/leader" responds with from yaml --- body: | diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/sorting.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/sorting.feature index 452a2eeea..3482e5d62 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/sorting.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/sorting.feature @@ -5,26 +5,38 @@ Feature: dc / nodes / sorting And 6 node models from yaml --- - Node: Node-A + Meta: + synthetic-node: "false" Checks: - Status: critical ServiceID: "" - Node: Node-B + Meta: + synthetic-node: "false" Checks: - Status: passing ServiceID: "" - Node: Node-C + Meta: + synthetic-node: "false" Checks: - Status: warning ServiceID: "" - Node: Node-D + Meta: + synthetic-node: "false" Checks: - Status: critical ServiceID: "" - Node: Node-E + Meta: + synthetic-node: "false" Checks: - Status: critical ServiceID: "" - Node: Node-F + Meta: + synthetic-node: "false" Checks: - Status: warning ServiceID: ""