E2E: Add normal field to Service (#8465)

* e2e: Add normal field to Service

CHANGES.md

@@ -37,6 +37,7 @@ Release Notes.
 * Add `normal` to V9 service meta query.
 * Support `scope=ALL` catalog for metrics.
 * Bump up H2 to 2.1.210 to fix CVE-2022-23221.
+* E2e: Add `normal` field to Service.
 
 #### UI
 

test/e2e-v2/cases/alarm/expected/service.yml

@@ -18,6 +18,7 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/browser/expected/service.yml

@@ -17,5 +17,6 @@
   name: test-ui
   group: ""
   shortname: test-ui
+  normal: true
   layers:
     - BROWSER

test/e2e-v2/cases/cluster/expected/service.yml

@@ -18,12 +18,14 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "e2e-service-consumer" }}.1
   name: e2e-service-consumer
   group: ""
   shortname: e2e-service-consumer
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/gateway/expected/service.yml

@@ -18,12 +18,14 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "e2e-service-consumer" }}.1
   name: e2e-service-consumer
   group: ""
   shortname: e2e-service-consumer
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/go/expected/service.yml

@@ -18,18 +18,21 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "e2e-service-consumer" }}.1
   name: e2e-service-consumer
   group: ""
   shortname: e2e-service-consumer
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "go2sky" }}.1
   name: go2sky
   group: ""
   shortname: go2sky
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/istio/metrics/expected/service.yml

@@ -18,36 +18,42 @@
   name: istio-dp::e2e::istio-egressgateway
   group: "istio-dp"
   shortname: e2e::istio-egressgateway
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "istio-dp::e2e::istio-ingressgateway" }}.1
   name: istio-dp::e2e::istio-ingressgateway
   group: "istio-dp"
   shortname: e2e::istio-ingressgateway
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "istio-dp::e2e::reviews" }}.1
   name: istio-dp::e2e::reviews
   group: "istio-dp"
   shortname: e2e::reviews
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "istio-dp::e2e::productpage" }}.1
   name: istio-dp::e2e::productpage
   group: "istio-dp"
   shortname: e2e::productpage
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "istio-dp::e2e::details" }}.1
   name: istio-dp::e2e::details
   group: "istio-dp"
   shortname: e2e::details
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "istio-dp::e2e::ratings" }}.1
   name: istio-dp::e2e::ratings
   group: "istio-dp"
   shortname: e2e::ratings
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/kafka/meter/expected/service.yml

@@ -18,6 +18,7 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/log/expected/service.yml

@@ -18,6 +18,7 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/lua/expected/service.yml

@@ -18,18 +18,21 @@
   name: e2e-service-entry-provider
   group: ""
   shortname: e2e-service-entry-provider
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "User_Service_Name" }}.1
   name: User_Service_Name
   group: ""
   shortname: User_Service_Name
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "e2e-service-end-provider" }}.1
   name: e2e-service-end-provider
   group: ""
   shortname: e2e-service-end-provider
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/meter/expected/service.yml

@@ -18,6 +18,7 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/nodejs/expected/service.yml

@@ -18,18 +18,21 @@
   name: consumer
   group: ""
   shortname: consumer
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "provider" }}.1
   name: provider
   group: ""
   shortname: provider
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "e2e-service-consumer" }}.1
   name: e2e-service-consumer
   group: ""
   shortname: e2e-service-consumer
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/php/expected/service.yml

@@ -18,12 +18,14 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "php" }}.1
   name: php
   group: ""
   shortname: php
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/profile/expected/service.yml

@@ -18,6 +18,7 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/python/expected/service.yml

@@ -18,24 +18,28 @@
   name: provider-py
   group: ""
   shortname: provider-py
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "e2e-service-consumer" }}.1
   name: e2e-service-consumer
   group: ""
   shortname: e2e-service-consumer
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "consumer-py" }}.1
   name: consumer-py
   group: ""
   shortname: consumer-py
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "provider-py-kafka" }}.1
   name: provider-py-kafka
   group: ""
   shortname: provider-py-kafka
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/satellite/native-protocols/expected/service.yml

@@ -18,12 +18,14 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "e2e-service-consumer" }}.1
   name: e2e-service-consumer
   group: ""
   shortname: e2e-service-consumer
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/simple/expected/service.yml

@@ -18,18 +18,21 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "e2e-service-consumer" }}.1
   name: e2e-service-consumer
   group: ""
   shortname: e2e-service-consumer
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "localhost:-1" }}.0
   name: localhost:-1
   group: ""
   shortname: localhost:-1
+  normal: false
   layers:
     - VIRTUAL_DATABASE
 {{- end }}

test/e2e-v2/cases/so11y/expected/satellite-service.yml

@@ -18,6 +18,7 @@
   name: satellite::satellite-service
   group: satellite
   shortname: satellite-service
+  normal: true
   layers:
     - SO11Y_SATELLITE
 {{- end }}

test/e2e-v2/cases/so11y/expected/service.yml

@@ -18,24 +18,28 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "e2e-service-consumer" }}.1
   name: e2e-service-consumer
   group: ""
   shortname: e2e-service-consumer
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "localhost:-1" }}.0
   name: localhost:-1
   group: ""
   shortname: localhost:-1
+  normal: false
   layers:
     - VIRTUAL_DATABASE
 - id: {{ b64enc "oap::oap-server" }}.1
   name: oap::oap-server
   group: oap
   shortname: oap-server
+  normal: true
   layers:
     - SO11Y_OAP
 {{- end }}

test/e2e-v2/cases/storage/expected/service.yml

@@ -18,12 +18,14 @@
   name: e2e-service-provider
   group: ""
   shortname: e2e-service-provider
+  normal: true
   layers:
     - GENERAL
 - id: {{ b64enc "e2e-service-consumer" }}.1
   name: e2e-service-consumer
   group: ""
   shortname: e2e-service-consumer
+  normal: true
   layers:
     - GENERAL
 {{- end }}

test/e2e-v2/cases/vm/expected/service.yml

@@ -18,6 +18,7 @@
   name: vm::vm-service
   shortname: vm-service
   group: vm
+  normal: true
   layers:
     - OS_LINUX
 {{- end }}

test/e2e-v2/script/env

@@ -23,4 +23,4 @@ SW_AGENT_CLIENT_JS_COMMIT=af0565a67d382b683c1dbd94c379b7080db61449
 SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
 SW_KUBERNETES_COMMIT_SHA=0f3ec68e5a7e1608cec8688716b848ed15e971e5
 
-SW_CTL_COMMIT=3278a47ab49e672f4ef7eb2ab5c806faf3c48dd5
+SW_CTL_COMMIT=ac30896a87343e9d936b80f86bf96e3985dd7298